Replace all herds with appropriate projects (GLEP 67)

Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.

14621 files changed, 56800 insertions, 15362 deletions

diff --git a/app-accessibility/SphinxTrain/metadata.xml b/app-accessibility/SphinxTrain/metadata.xml
index acc417de6d38..622ab8fec4da 100644
--- a/app-accessibility/SphinxTrain/metadata.xml
+++ b/app-accessibility/SphinxTrain/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 	SphinxTrain is CMU Sphinx's training package.
 </longdescription>
diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
index de03c27559db..76a30c4ad8c0 100644
--- a/app-accessibility/accerciser/metadata.xml
+++ b/app-accessibility/accerciser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-accessibility</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">
 Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.
 
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index e8e32d543cd3..832067c5c062 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
  <use>
   <flag name="api">build brltty's application program interface</flag>
   <flag name="beeper">support the console tone generator</flag>
diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml
index 4d1f3599c74e..84091f1929f2 100644
--- a/app-accessibility/caribou/metadata.xml
+++ b/app-accessibility/caribou/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 Caribou is a text entry and UI navigation application being developed as an
 alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou
diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml
index 234d31d93975..2d52db259ba7 100644
--- a/app-accessibility/edbrowse/metadata.xml
+++ b/app-accessibility/edbrowse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription>
 	edbrowse is a line editor, web browser and email client using the /bin/ed
 	user interface.
diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml
index c4c56fa229f6..ad0b5979d14d 100644
--- a/app-accessibility/eflite/metadata.xml
+++ b/app-accessibility/eflite/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
 	<maintainer>
 		<email>williamh@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="16k_voice">Use a higher-quality voice.</flag>
 	</use>
diff --git a/app-accessibility/emacspeak-ss/metadata.xml b/app-accessibility/emacspeak-ss/metadata.xml
index 5e5b1e56d563..09e10cd547cc 100644
--- a/app-accessibility/emacspeak-ss/metadata.xml
+++ b/app-accessibility/emacspeak-ss/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
  <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>accessibility@gentoo.org</email>
+ <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription lang="en">
 	Emacspeak speech servers for DoubleTalk PC and AT, 
 	Braille 'n Speak, Type 'n Speak, Braille Lite from Blazie,
diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
index 32fcb5c8d58d..d7723b20e852 100644
--- a/app-accessibility/emacspeak/metadata.xml
+++ b/app-accessibility/emacspeak/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>emacs</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>emacs@gentoo.org</email>
+		<name>Gentoo Emacs project</name>
+	</maintainer>
 	<longdescription lang="en">Emacspeak is a speech interface that allows visually impaired 
 	users to interact independently and efficiently with the computer.</longdescription>
 	<longdescription lang="ja">Emacspeakで視覚障害者が単独と手際良くでコンピュータを
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
index e85edf9eb1de..b6c4dd78eb02 100644
--- a/app-accessibility/epos/metadata.xml
+++ b/app-accessibility/epos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">epos</remote-id>
 	</upstream>
diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
index c07bb6b946aa..220002885e5a 100644
--- a/app-accessibility/espeak/metadata.xml
+++ b/app-accessibility/espeak/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
 	<maintainer>
 		<email>williamh@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">espeak</remote-id>
 	</upstream>
diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml
index 484f3c3991ed..0cc2fd050dac 100644
--- a/app-accessibility/espeakup/metadata.xml
+++ b/app-accessibility/espeakup/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription>
 Espeakup is a small lightweight connector which makes it possible for
 speakup to use espeak as its synthesizer.
diff --git a/app-accessibility/festival-fi/metadata.xml b/app-accessibility/festival-fi/metadata.xml
index f66d895ca4e2..f805383328b1 100644
--- a/app-accessibility/festival-fi/metadata.xml
+++ b/app-accessibility/festival-fi/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-freebsoft-utils/metadata.xml b/app-accessibility/festival-freebsoft-utils/metadata.xml
index f7b66d2f7a9d..604a87838abf 100644
--- a/app-accessibility/festival-freebsoft-utils/metadata.xml
+++ b/app-accessibility/festival-freebsoft-utils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-hts/metadata.xml b/app-accessibility/festival-hts/metadata.xml
index be48b593dcc8..2950ca41bcea 100644
--- a/app-accessibility/festival-hts/metadata.xml
+++ b/app-accessibility/festival-hts/metadata.xml
@@ -4,6 +4,12 @@
 <maintainer>
 	<email>neurogeek@gentoo.org</email>
 </maintainer>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-it/metadata.xml b/app-accessibility/festival-it/metadata.xml
index 9776e2a6b646..7cc0aa051e9f 100644
--- a/app-accessibility/festival-it/metadata.xml
+++ b/app-accessibility/festival-it/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="mbrola">Adds support for mbrola voices</flag>
 	</use>
diff --git a/app-accessibility/festival-ru/metadata.xml b/app-accessibility/festival-ru/metadata.xml
index 95bb8e9a11ac..3e167df6271c 100644
--- a/app-accessibility/festival-ru/metadata.xml
+++ b/app-accessibility/festival-ru/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">festlang.berlios</remote-id>
 	</upstream>
diff --git a/app-accessibility/festival/metadata.xml b/app-accessibility/festival/metadata.xml
index 0c64cf5a25f9..cb8802bb30e0 100644
--- a/app-accessibility/festival/metadata.xml
+++ b/app-accessibility/festival/metadata.xml
@@ -5,6 +5,12 @@
 	<email>neurogeek@gentoo.org</email>
 	<name>Jesus Rivero</name>
 </maintainer>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/flite/metadata.xml b/app-accessibility/flite/metadata.xml
index 523097ffe305..e5fe8f4fb36f 100644
--- a/app-accessibility/flite/metadata.xml
+++ b/app-accessibility/flite/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml
index 654f205d7a0c..7c89c2812893 100644
--- a/app-accessibility/freetts/metadata.xml
+++ b/app-accessibility/freetts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="jsapi">build Java Speech API (JSAPI)</flag>
 		<flag name="mbrola">Adds support for mbrola voices</flag>
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
index cbed4e8e981f..4209b79715e5 100644
--- a/app-accessibility/julius/metadata.xml
+++ b/app-accessibility/julius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">julius</remote-id>
 	</upstream>
diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
index 523097ffe305..e5fe8f4fb36f 100644
--- a/app-accessibility/mbrola/metadata.xml
+++ b/app-accessibility/mbrola/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml
index f7b66d2f7a9d..604a87838abf 100644
--- a/app-accessibility/nfbtrans/metadata.xml
+++ b/app-accessibility/nfbtrans/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
index c42f2333252f..8cd20d366cef 100644
--- a/app-accessibility/orca/metadata.xml
+++ b/app-accessibility/orca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="braille">Enable braille support</flag>
 </use>
diff --git a/app-accessibility/pidgin-festival/metadata.xml b/app-accessibility/pidgin-festival/metadata.xml
index 84a3de50495e..d2214516090b 100644
--- a/app-accessibility/pidgin-festival/metadata.xml
+++ b/app-accessibility/pidgin-festival/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pidgin-festival</remote-id>
 	</upstream>
diff --git a/app-accessibility/pocketsphinx/metadata.xml b/app-accessibility/pocketsphinx/metadata.xml
index 831e814f0766..ab14d0be3a25 100644
--- a/app-accessibility/pocketsphinx/metadata.xml
+++ b/app-accessibility/pocketsphinx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml
index 42fd1198f93a..2a3292b0bfbc 100644
--- a/app-accessibility/powiedz/metadata.xml
+++ b/app-accessibility/powiedz/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
index a90cc8f7cf3b..48943f50452a 100644
--- a/app-accessibility/simon/metadata.xml
+++ b/app-accessibility/simon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<use>
 		<flag name="kdepim">Use <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
diff --git a/app-accessibility/sound-icons/metadata.xml b/app-accessibility/sound-icons/metadata.xml
index 04c0d89a3a64..61a051c9ffae 100644
--- a/app-accessibility/sound-icons/metadata.xml
+++ b/app-accessibility/sound-icons/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription lang="en">
 This is a collection of sound icons which can be used by speech dispatcher.
 </longdescription>
diff --git a/app-accessibility/speakup/metadata.xml b/app-accessibility/speakup/metadata.xml
index f7b66d2f7a9d..604a87838abf 100644
--- a/app-accessibility/speakup/metadata.xml
+++ b/app-accessibility/speakup/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 9c608d4058b8..eea9663abe1e 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
-  <herd>sound</herd>
   <maintainer>
     <email>williamh@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="espeak">Adds support for espeak speech engine</flag>
     <flag name="flite">Adds support for flite speech engine</flag>
diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml
index 3378625aa9f9..2950ca41bcea 100644
--- a/app-accessibility/speech-tools/metadata.xml
+++ b/app-accessibility/speech-tools/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
 <maintainer>
 	<email>neurogeek@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index dc145bb72d02..44a271bf7acf 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>emacs</herd>
 <maintainer>
 <email>williamh@gentoo.org</email>
 </maintainer>
+ <maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer>
+  <email>emacs@gentoo.org</email>
+  <name>Gentoo Emacs project</name>
+ </maintainer>
  <use>
   <flag name="brltty">brltty support</flag>
 </use>
diff --git a/app-accessibility/speechd-up/metadata.xml b/app-accessibility/speechd-up/metadata.xml
index 1212c466038a..b17ff1f6b940 100644
--- a/app-accessibility/speechd-up/metadata.xml
+++ b/app-accessibility/speechd-up/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
 <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>accessibility@gentoo.org</email>
+<name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml
index a5e5fcc49020..59bc308e0a79 100644
--- a/app-accessibility/sphinx2/metadata.xml
+++ b/app-accessibility/sphinx2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
index 831e814f0766..ab14d0be3a25 100644
--- a/app-accessibility/sphinx3/metadata.xml
+++ b/app-accessibility/sphinx3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml
index d72ef0fd2aae..6a8e883ad6ed 100644
--- a/app-accessibility/sphinxbase/metadata.xml
+++ b/app-accessibility/sphinxbase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
+  <maintainer>
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cmusphinx</remote-id>
   </upstream>
diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml
index 6e084ef16675..cf7c49d55742 100644
--- a/app-accessibility/yasr/metadata.xml
+++ b/app-accessibility/yasr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yasr</remote-id>
 	</upstream>
diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-admin-console/metadata.xml
+++ b/app-admin/389-admin-console/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-console/metadata.xml
+++ b/app-admin/389-console/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/389-ds-console/metadata.xml b/app-admin/389-ds-console/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-ds-console/metadata.xml
+++ b/app-admin/389-ds-console/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/app-admin/abrt/metadata.xml
+++ b/app-admin/abrt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 9cf9bbc84c78..66a2081f4d91 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>DuPol@gmx.de</email>
 	<name>Dustin Polke</name>
 	<description>Proxy Maintainer. CC him on bugs.</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>Another Password Generator. Generates random, pronouncable passwords with a variety of algorithms</longdescription>
 </pkgmetadata>
diff --git a/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-as-tools/metadata.xml
+++ b/app-admin/aws-as-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
   </maintainer>
@@ -10,4 +9,8 @@
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-cw-tools/metadata.xml
+++ b/app-admin/aws-cw-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
   </maintainer>
@@ -10,4 +9,8 @@
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-iam-tools/metadata.xml
+++ b/app-admin/aws-iam-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
   </maintainer>
@@ -10,4 +9,8 @@
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-rds-tools/metadata.xml
+++ b/app-admin/aws-rds-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
   </maintainer>
@@ -10,4 +9,8 @@
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
index c60ce0ba2450..a837415c65ad 100644
--- a/app-admin/bastille/metadata.xml
+++ b/app-admin/bastille/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bastille-linux</remote-id>
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index 5647529c2f0b..1c2bf9fdfc8f 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>xmw@gentoo.org</email>
   <name>Michael Weber</name>
@@ -11,6 +10,10 @@
 	<email>mjinks@uchicago.edu</email>
 	<name>Michael Jinks</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <use>
   <flag name="cheetah">Include dev-python/cheetah support</flag>
   <flag name="genshi">Include dev-python/genshi support</flag>
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
index 688513dd0ab0..71c62e967233 100644
--- a/app-admin/cdist/metadata.xml
+++ b/app-admin/cdist/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nerve@ipwar.ch</email>
     <name>Daniel Heule</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cdist</remote-id>
   </upstream>
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
index 66cf774185dd..d76976705498 100644
--- a/app-admin/chrpath/metadata.xml
+++ b/app-admin/chrpath/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 5b48ac87d7e3..8e894a896dc8 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<longdescription>Collectd gathers statistics about the system it is running on and stores this information. Those statistics can then be used to find current performance bottlenecks (i.e. performance analysis) and predict future system load (i.e. capacity planning). Or if you just want pretty graphs of your private server and are fed up with some homegrown solution you're at the right place.</longdescription>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="collectd_plugins_aggregation">Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
 		<flag name="collectd_plugins_apache">Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index c3a63c8f01d2..721bd857f02d 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dan@danweeks.net</email>
 		<name>Dan Weeks</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Conserver is an application that allows multiple users to watch a serial
 		console at the same time. It can log the data, allows users to take
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/app-admin/consolehm/metadata.xml
+++ b/app-admin/consolehm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 67cb71579bde..c07d60ec1ee0 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>donaldbmcintosh@yahoo.co.uk</email>
     <name>Donald McIntosh</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">donaldmcintosh/dio</remote-id>
   </upstream>
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index 0a5d54b123ef..71ab4419cfb2 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index dc5dc4fc2cc8..c7b22287dea6 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>eselect</herd>
+<maintainer>
+	<email>eselect@gentoo.org</email>
+	<name>eselect configuration and management tool</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/filebeat-bin/metadata.xml b/app-admin/filebeat-bin/metadata.xml
index fe6f9ccf1a7e..e782c4f79125 100644
--- a/app-admin/filebeat-bin/metadata.xml
+++ b/app-admin/filebeat-bin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/app-admin/gam-server/metadata.xml
+++ b/app-admin/gam-server/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/app-admin/gamin/metadata.xml
+++ b/app-admin/gamin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index 2a2586cc30ca..51811d92688c 100644
--- a/app-admin/gentoo-rsync-mirror/metadata.xml
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>rgkmg25@gmail.com</email>
 	<name>Robert Kowalski</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/geolizer/metadata.xml b/app-admin/geolizer/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/app-admin/geolizer/metadata.xml
+++ b/app-admin/geolizer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 8a2f86d9436d..d91e30b8a561 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-dock</herd>
   <use>
     <flag name="hddtemp">Enable monitoring harddrive temperatures via
 			<pkg>app-admin/hddtemp</pkg></flag>
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
index 0dc3e103ba37..befcb5266d14 100644
--- a/app-admin/glance/metadata.xml
+++ b/app-admin/glance/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Provides services for discovering, registering, and retrieving virtual 
     machine images. Glance has a RESTful API that allows querying of VM image 
diff --git a/app-admin/gnome-system-log/metadata.xml b/app-admin/gnome-system-log/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-admin/gnome-system-log/metadata.xml
+++ b/app-admin/gnome-system-log/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-admin/grubconfig/metadata.xml
+++ b/app-admin/grubconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 878ec1961863..a8981d663fac 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
 		<name>Samuel Bauer</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 	</longdescription>
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
index ddb2b453cd1f..320f819da1e3 100644
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index f22d1250efc5..74a1c23145da 100644
--- a/app-admin/integrit/metadata.xml
+++ b/app-admin/integrit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">integrit</remote-id>
 	</upstream>
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index b9e748b54d3c..87a1f1f7f512 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -9,7 +9,10 @@
 		<email>kensington@gentoo.org</email>
 		<description>Proxy maintainer. CC him on bugs.</description>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="aot">Generate native code at build time, rather than runtime.</flag>
 	</use>
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index 87d50c975d7e..46fe35375dfe 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">kpcli</remote-id>
   </upstream>
diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml
index e13c9ed137f5..d4665ae0b87f 100644
--- a/app-admin/lastpass-cli/metadata.xml
+++ b/app-admin/lastpass-cli/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gokturk@binghamton.edu</email>
 		<name>Gokturk 'gokturk' Yuksek</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="X">
 			Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
diff --git a/app-admin/lastpass/metadata.xml b/app-admin/lastpass/metadata.xml
index b92bb91bd8fa..5777da872c44 100644
--- a/app-admin/lastpass/metadata.xml
+++ b/app-admin/lastpass/metadata.xml
@@ -5,12 +5,15 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gokturk@binghamton.edu</email>
     <name>Gokturk Yuksek</name>
     <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Lastpass is an online password manager, password generator, form
     filler and secure notes service.
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
index 2d52d39e1dca..3e755f763438 100644
--- a/app-admin/localepurge/metadata.xml
+++ b/app-admin/localepurge/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>wimmuskee@gmail.com</email>
   <name>Wim Muskee</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 Just a simple tool to erase all uneeded locale and man files usually generated for USE="nls"
 </longdescription>
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index a853f25a4654..577c553231bf 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="standard">standard distribution package</flag>
 		<flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
diff --git a/app-admin/mate-system-tools/metadata.xml b/app-admin/mate-system-tools/metadata.xml
index a4054046af53..64acb15db30d 100644
--- a/app-admin/mate-system-tools/metadata.xml
+++ b/app-admin/mate-system-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <longdescription>
 		Formerly known as the Ximian Setup Tools, the GST are a fully
 		integrated set of tools aimed to make easy the job that means the
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index df75688b46dc..baff5b083a1c 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
 		<name>Ben Kohler</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Starting with version 2.6.4, the Linux kernel for x86-64 no longer
 		decodes and logs recoverable Machine Check Exception events to the
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index c0a75cd058dd..e9f4563386cc 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">metalog</remote-id>
 	</upstream>
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index fbeacea0e583..af732331eb4d 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -11,6 +10,10 @@
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	MongoDB MMS agents collection.
 	</longdescription>
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 0f961a2a1f9b..9a3cb144c23e 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -11,6 +10,10 @@
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
 	</longdescription>
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index cb6c8006990a..59b4427196e3 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -5,7 +5,10 @@
 	<email>tetromino@gentoo.org</email>
 	<name>Alexandre Rostovtsev</name>
 </maintainer>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="systemd">Use the versions of dbus and polkit files provided by
 		<pkg>sys-apps/systemd</pkg></flag>
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index 04475d3958f3..5ece4cfbb70c 100644
--- a/app-admin/paxtest/metadata.xml
+++ b/app-admin/paxtest/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>Test suite for the PaX kernel patch
 		PaX is a Linux kernel patch which adds much stricter control on how memory
 		is being used by applications. A normal Linux kernel leaves the control to the
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 1c73b29270ef..68e036fb4760 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>fuzzyray@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/phpsyslogng/metadata.xml b/app-admin/phpsyslogng/metadata.xml
index afbbc8783d41..bfe273b3f162 100644
--- a/app-admin/phpsyslogng/metadata.xml
+++ b/app-admin/phpsyslogng/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>matthias@dsx.at</email>
 		<name>Matthias Schöffmann</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">php-syslog-ng</remote-id>
 	</upstream>
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index dd44e0cf820c..bc58f4d2bc5e 100644
--- a/app-admin/procinfo-ng/metadata.xml
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">procinfo-ng</remote-id>
   </upstream>
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index 428baa80ceb8..b3e50e1ac0b1 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -3,7 +3,13 @@
 <!--
 $Id$
 --><pkgmetadata>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+<maintainer>
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
 </pkgmetadata>
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 8ce3d934457c..afa7d6134445 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -4,8 +4,14 @@
 	<maintainer>
 	<email>prometheanfire@gentoo.org</email>
 	</maintainer>
-	<herd>sysadmin</herd>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Centralised configuration management for networks
 		Puppet lets you centrally manage every important aspect of your system
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index f11927632afb..a3ec5e3b39a5 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>livecd</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>julian@simioni.org</email>
 		<name>Julian Simioni</name>
@@ -12,6 +10,14 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
+	<maintainer>
+		<email>livecd@gentoo.org</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="livecd">Install init script for root password scrambling on boot</flag>
 	</use>
diff --git a/app-admin/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/app-admin/python-updater/metadata.xml
+++ b/app-admin/python-updater/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index 20196e781a7b..bb520aad7cdd 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 QtPass is a multi-platform GUI for pass, the standard unix password manager.
 	</longdescription>
diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index f60aedb32c1c..8cf82d0de50f 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -5,7 +5,10 @@
     <email>vikraman@gentoo.org</email>
     <name>Vikraman Choudhury</name>
   </maintainer>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription lang="en">
 			r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
   </longdescription>
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
index c5692ac1bf6c..a611cc095e59 100644
--- a/app-admin/radmind/metadata.xml
+++ b/app-admin/radmind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>A suite of Unix command-line tools and a server designed to remotely administer
 the file systems of multiple Unix machines.</longdescription>
 	<upstream>
diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
index 06ed5d761a90..4198e0c9c3d3 100644
--- a/app-admin/ranpwd/metadata.xml
+++ b/app-admin/ranpwd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription/>
 </pkgmetadata>
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index 636bea348b32..6beb73a8ad04 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
@@ -10,4 +9,8 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index 7d27bc09fbd5..864354577d85 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
   <email>maksbotan@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
 </use>
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index c980dc4295fb..36cefe2b733c 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -14,6 +13,10 @@
 		<email>qnikst@gentoo.org</email>
 		<name>Alexander Vershilov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
 		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
diff --git a/app-admin/showconsole/metadata.xml b/app-admin/showconsole/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-admin/showconsole/metadata.xml
+++ b/app-admin/showconsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/socklog/metadata.xml b/app-admin/socklog/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-admin/socklog/metadata.xml
+++ b/app-admin/socklog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index 6ba8e796f6b5..8ce9a8f243bc 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <use>
     <flag name="ipfilter">Enable ipfilter firewall support (only for *bsd)</flag>
   </use>
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index fe6e121f44e2..ad09ed6ce10b 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ewfalor@gmail.com</email>
 		<name>Erik Falor</name>
@@ -10,4 +9,8 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/sud/metadata.xml b/app-admin/sud/metadata.xml
index 27c217d9a05d..2d8a9d901e20 100644
--- a/app-admin/sud/metadata.xml
+++ b/app-admin/sud/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <longdescription>
 sud (superuser daemon) permits a user to switch to root privileges and to use a suid program in a nosuid environment. It is based on a client/server model and on the ability to pass file descriptors between processes. sud permits you to choose your authentication method, and your effective credentials will be checked by using a Unix domain socket.
 </longdescription>
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 535e864c6bed..080e5d018cae 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription lang="en">
     Sudo (superuser do) allows a system administrator to give certain
     users (or groups of users) the ability to run some (or all)
diff --git a/app-admin/superadduser/metadata.xml b/app-admin/superadduser/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-admin/superadduser/metadata.xml
+++ b/app-admin/superadduser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
index 0d8452b949e9..697f4cb91b9a 100644
--- a/app-admin/supervisor/metadata.xml
+++ b/app-admin/supervisor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">supervisor</remote-id>
 	</upstream>
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 5a2dd624378e..5d455eb770ce 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
 	</use>
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index aac0bbb8af46..574ef83a6ad5 100644
--- a/app-admin/system-config-printer/metadata.xml
+++ b/app-admin/system-config-printer/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>kde</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
index a5be798c5082..2576b36202d8 100644
--- a/app-admin/system-tools-backends/metadata.xml
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lxqt</herd>
+<maintainer>
+	<email>lxqt@gentoo.org</email>
+	<name>LXQt</name>
+</maintainer>
 <longdescription lang="en">
 The System Tools Backends are a set of cross-platform modules for Linux,
 FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
index a0fb5e875c40..1117781f6d80 100644
--- a/app-admin/tenshi/metadata.xml
+++ b/app-admin/tenshi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>bldewolf@cpp.edu</email>
   <name>Brian De Wolf</name>
@@ -10,4 +9,8 @@
   <email>atj@pulsewidth.org.uk</email>
   <name>Adam James</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 1cb2f3841556..890e06741eb3 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>forensics</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 		<description>Primary maintainer</description>
     </maintainer>
+	<maintainer>
+        <email>forensics@gentoo.org</email>
+        <name>Gentoo Forensics Project</name>
+    </maintainer>
 	<use>
 		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
 		<flag name="reiserfs">Include reiserfs reading ability</flag>
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 800262ca17b7..87260d8c6491 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="json">Build JSON output plugin to save packets in JSON file format.</flag>
 		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format.</flag>
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/app-admin/usbview/metadata.xml
+++ b/app-admin/usbview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
index 8b8468ce778d..11bfbef8f3f1 100644
--- a/app-admin/webalizer/metadata.xml
+++ b/app-admin/webalizer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="xtended">Include the 404 extension</flag>
 	</use>
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index 173f01fa5443..032965b0cd60 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>twitch153@gentoo.org</email>
 		<name>Devan Franchini</name>
@@ -10,6 +9,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="portage">Propagete python_targets dependencies to sys-apps/portage</flag>
 	</use>
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index f1dbb51ddeb3..2b4337cc3469 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>phobosk@fastmail.fm</email>
 		<name>PhobosK</name>
 		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">webadmin</remote-id>
 	</upstream>
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index fd48bdee4f61..9a416ffe117b 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ewfalor@gmail.com</email>
 		<name>Erik Falor</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>A program that manages the installation of software packages.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xstow</remote-id>
diff --git a/app-admin/xtail/metadata.xml b/app-admin/xtail/metadata.xml
index b4c2c658bbaf..b1f61e9b3aef 100644
--- a/app-admin/xtail/metadata.xml
+++ b/app-admin/xtail/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gentoo.power@gmail.com</email>
 	<name>Iván</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 7d2b0e47b1e8..b78298d318a9 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
-  <herd>antivirus</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <maintainer>
+    <email>antivirus@gentoo.org</email>
+    <name>Gentoo Antivirus Project</name>
+  </maintainer>
   <use>
     <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
     <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
index 46e607c4a6ec..4c739e9b90c9 100644
--- a/app-arch/bloscpack/metadata.xml
+++ b/app-arch/bloscpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Command line interface to and serialization format for Blosc, a high
   performance, multi-threaded, blocking and shuffling compressor. Uses
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 80408f474306..bf4b8e657d02 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id>
 </upstream>
diff --git a/app-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
index 78a6f5f7ea4a..bcb7f0d0ee2d 100644
--- a/app-arch/cabextract/metadata.xml
+++ b/app-arch/cabextract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="extras">Install experimental extra tools: wince_info and
       wince_rename for examining and processing Windows CE installation cabinet
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/defluff/metadata.xml b/app-arch/defluff/metadata.xml
index a09204230606..d66da541cd75 100644
--- a/app-arch/defluff/metadata.xml
+++ b/app-arch/defluff/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">j-o.users</remote-id>
 	</upstream>
diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml
index 2d74819279d9..42826e4d8c57 100644
--- a/app-arch/dpkg/metadata.xml
+++ b/app-arch/dpkg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>deb-tools</herd>
+<maintainer>
+<email>deb-tools@gentoo.org</email>
+<name>Gentoo Debian Tools Project</name>
+</maintainer>
 <use>
 <flag name="update-alternatives">Install update-alternatives</flag>
 </use>
diff --git a/app-arch/dump/metadata.xml b/app-arch/dump/metadata.xml
index 1d2ab7dac1e1..a5bb7eb45dfd 100644
--- a/app-arch/dump/metadata.xml
+++ b/app-arch/dump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription>
 		A utility to help backup and restore files on a harddrive.
 	</longdescription>
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index b583ec5eee56..ad3d890fe078 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
diff --git a/app-arch/fastjar/metadata.xml b/app-arch/fastjar/metadata.xml
index 2b065fd7b06f..35323c72d2da 100644
--- a/app-arch/fastjar/metadata.xml
+++ b/app-arch/fastjar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Fastjar is a version of Sun's 'jar' utility, written entirely in C,
 		and therefore quite a bit faster. Fastjar can be up to 100x faster
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index 20790298d888..a7d2bed3ef41 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="nautilus">Enable file-roller to integrate with
 			<pkg>gnome-base/nautilus</pkg> by providing entries in its context
diff --git a/app-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-arch/gcab/metadata.xml
+++ b/app-arch/gcab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
index 0e6ff895e162..2303c0e6fc3e 100644
--- a/app-arch/gzip/metadata.xml
+++ b/app-arch/gzip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
 <upstream>
  <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
 </upstream>
diff --git a/app-arch/hardlink/metadata.xml b/app-arch/hardlink/metadata.xml
index 44539ce699c1..d9d819757cde 100644
--- a/app-arch/hardlink/metadata.xml
+++ b/app-arch/hardlink/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
index b1dfdc59d3e4..89ca65064a74 100644
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Tools for working with the ipkg format.
 	</longdescription>
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
index 8eb52056a1e2..13d8924bd878 100644
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nitro@legroom.net</email>
 		<name>Jared B.</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		A utility for creating and opening lzh archives.
 	</longdescription>
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 194c620455e6..ffdea916c351 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <longdescription lang="en">
     The bsdtar program creates and manipulates streaming archive files.
     It has a number of advantages over previous tar implementations.
diff --git a/app-arch/lzip/metadata.xml b/app-arch/lzip/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-arch/lzip/metadata.xml
+++ b/app-arch/lzip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/ncompress/metadata.xml b/app-arch/ncompress/metadata.xml
index 5ab5d334a23a..b1e86a22c272 100644
--- a/app-arch/ncompress/metadata.xml
+++ b/app-arch/ncompress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ncompress</remote-id>
 		<remote-id type="github">vapier/ncompress</remote-id>
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index a85d323588c3..07049b1e130b 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jdhore@gentoo.org</email>
 		<name>Jeff Horelick</name>
@@ -11,6 +10,10 @@
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="all_sfx">
 			Install all SFX (Self-Extracting) files rather than just the native
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 8ae5ff0b2291..4bf257548fb5 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -5,5 +5,8 @@
 	<email>sochotnicky@gentoo.org</email>
 	<name>Stanislav Ochotnicky</name>
 </maintainer>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-arch/rpm2targz/metadata.xml
+++ b/app-arch/rpm2targz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
index 801bcd0759e5..88f875a020b4 100644
--- a/app-arch/sharutils/metadata.xml
+++ b/app-arch/sharutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:gnu:sharutils</remote-id>
 </upstream>
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index 6418fc0074b7..6f51b18fd3e0 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
 		maximum compression, or compatibility with any other compression
 		library; instead, it aims for very high speeds and reasonable
diff --git a/app-arch/star/metadata.xml b/app-arch/star/metadata.xml
index 486d2934ff92..17d8a589f717 100644
--- a/app-arch/star/metadata.xml
+++ b/app-arch/star/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">s-tar</remote-id>
   </upstream>
diff --git a/app-arch/tapeutils/metadata.xml b/app-arch/tapeutils/metadata.xml
index f3ebc821556b..a732fd8b2f03 100644
--- a/app-arch/tapeutils/metadata.xml
+++ b/app-arch/tapeutils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>app-backup</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index 5b38aadf068f..2c5ef31c04cc 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="minimal">just install `tar`</flag>
 </use>
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index 207b29f7ce14..611c8fccad84 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<longdescription>
 		TorrentZip is a replacement for MameZip. The goal of the program is to 
 		use standard values when creating zips to create identical files over 
diff --git a/app-arch/unace/metadata.xml b/app-arch/unace/metadata.xml
index 39289d9ba1c7..59d0590f95ec 100644
--- a/app-arch/unace/metadata.xml
+++ b/app-arch/unace/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription>Unace is a archive opener for the Ace format.</longdescription>
 </pkgmetadata>
diff --git a/app-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
index d4771b00896e..6c62171fb4e8 100644
--- a/app-arch/unarj/metadata.xml
+++ b/app-arch/unarj/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>nitro@legroom.net</email>
   <name>Jared B.</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>A utility that is designed to open arj archives.</longdescription>
 </pkgmetadata>
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 0ae854f6c4bc..da8e1f188d0d 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
 </upstream>
diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
index 336952676af5..c904e10fbd93 100644
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pda</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index a186eb633331..4a28de141ab3 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 87a70240b179..18949809bb85 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription>Application that supports the Info Zip series of encryption.</longdescription>
 	<use>
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
diff --git a/app-arch/zopfli/metadata.xml b/app-arch/zopfli/metadata.xml
index 3a504ace717a..9844e46647a8 100644
--- a/app-arch/zopfli/metadata.xml
+++ b/app-arch/zopfli/metadata.xml
@@ -6,7 +6,10 @@
     <name>Alex Xu</name>
     <description>Proxied maintainer</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>Compression library programmed in C to perform very good, but slow, deflate or zlib compression.</longdescription>
   <upstream>
     <remote-id type="github">Hello71/zopfli</remote-id>
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 694128c76da0..9138b855e775 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<description>Primary maintainer</description>
@@ -18,6 +16,10 @@
 		<description>Upstream. Please CC on bugs.</description>
 		<name>Dustin J. Mitchell</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xfs">Support for backing up raw XFS filesystems using xfsdump</flag>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
diff --git a/app-backup/backup-manager/metadata.xml b/app-backup/backup-manager/metadata.xml
index 4c100da6216e..2dbad1a4a8de 100644
--- a/app-backup/backup-manager/metadata.xml
+++ b/app-backup/backup-manager/metadata.xml
@@ -5,7 +5,6 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<herd>app-backup</herd>
 	<longdescription>command line backup tool, designed to help make daily archives of the file system. It can make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and provides interesting features (such as network exports or CD/DVD automated-burning)</longdescription>
 	<use>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml
index e7059eab1b95..c6bd378ff01c 100644
--- a/app-backup/backupninja/metadata.xml
+++ b/app-backup/backupninja/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>premek@vohnout.cz</email>
 	<name>Přemysl Vohnout</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index 1d438e3031fe..9b6fcba8d33b 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<upstream>
 		<remote-id type="sourceforge">backuppc</remote-id>
 	</upstream>
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index ee8e4ede21a2..73009da88973 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<maintainer>
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
diff --git a/app-backup/boxbackup/metadata.xml b/app-backup/boxbackup/metadata.xml
index 65452a7de81c..2da53a6fa649 100644
--- a/app-backup/boxbackup/metadata.xml
+++ b/app-backup/boxbackup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<longdescription>An open source, completely automatic on-line backup
 		system for UNIX.</longdescription>
 	<use>
diff --git a/app-backup/cdbackup/metadata.xml b/app-backup/cdbackup/metadata.xml
index e94d7236906d..097975e3adc2 100644
--- a/app-backup/cdbackup/metadata.xml
+++ b/app-backup/cdbackup/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-backup</herd>
 </pkgmetadata>
diff --git a/app-backup/cdbkup/metadata.xml b/app-backup/cdbkup/metadata.xml
index a41124469c09..a1639af4475b 100644
--- a/app-backup/cdbkup/metadata.xml
+++ b/app-backup/cdbkup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<longdescription>A backup application capable of full/incremental backups on
 	local and remote systems onto cd-r and cd-rw discs.</longdescription>
 	<upstream>
diff --git a/app-backup/cpdup/metadata.xml b/app-backup/cpdup/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/app-backup/cpdup/metadata.xml
+++ b/app-backup/cpdup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml
index 2c112e3cab72..f1b134a85370 100644
--- a/app-backup/deja-dup/metadata.xml
+++ b/app-backup/deja-dup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="nautilus">Build gnome-base/nautilus extension</flag>
   </use>
diff --git a/app-backup/dirvish/metadata.xml b/app-backup/dirvish/metadata.xml
index aa871bad3b06..5c68cd756e92 100644
--- a/app-backup/dirvish/metadata.xml
+++ b/app-backup/dirvish/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<longdescription lang="en">Dirvish is a fast, disk based, rotating network
 		backup system. With dirvish you can maintain a set of complete images 
 		of your filesystems with unattended creation and expiration. A dirvish 
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
index caa0d45789d2..668d2b9665e1 100644
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gentoo@pennewiss.de</email>
     <name>Marcel Pennewiß</name>
     <description>Proxy-maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/app-backup/kbackup/metadata.xml b/app-backup/kbackup/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/app-backup/kbackup/metadata.xml
+++ b/app-backup/kbackup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/luckybackup/metadata.xml b/app-backup/luckybackup/metadata.xml
index 2185e73b79c7..c75bb6ae3331 100644
--- a/app-backup/luckybackup/metadata.xml
+++ b/app-backup/luckybackup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">luckybackup</remote-id>
 	</upstream>
diff --git a/app-backup/mylvmbackup/metadata.xml b/app-backup/mylvmbackup/metadata.xml
index d30bc5bf280c..ea1ee845dd24 100644
--- a/app-backup/mylvmbackup/metadata.xml
+++ b/app-backup/mylvmbackup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<description>Primary maintainer</description>
diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml
index 3717738d65d6..40139472fe4b 100644
--- a/app-backup/pdumpfs/metadata.xml
+++ b/app-backup/pdumpfs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
@@ -11,6 +10,10 @@
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <longdescription>
 pdumpfs is a simple daily backup system similar to Plan9's dumpfs which
 preserves every daily snapshot. pdumpfs is written in Ruby. You can access
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 95ce537c7b9d..7ad0dbf2fa8e 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
index 0c450b378cdb..9a073b83ca0b 100644
--- a/app-backup/rear/metadata.xml
+++ b/app-backup/rear/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>morlix@morlix.de</email>
 		<name>Timo Eissler</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
 	</longdescription>
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index feced77e05ac..8aa6d751a999 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>Sergiy.Borodych@gmail.com</email>
     <name> Sergiy Borodych</name>
     <description>proxied maintainer</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/simplebackup/metadata.xml b/app-backup/simplebackup/metadata.xml
index 7b360064112f..6853f88a9e3f 100644
--- a/app-backup/simplebackup/metadata.xml
+++ b/app-backup/simplebackup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<upstream>
 		<remote-id type="sourceforge">migas-sbackup</remote-id>
 	</upstream>
diff --git a/app-backup/snapback2/metadata.xml b/app-backup/snapback2/metadata.xml
index edb1c6588c22..7c6cd4bb5fcd 100644
--- a/app-backup/snapback2/metadata.xml
+++ b/app-backup/snapback2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-backup</herd>
 	<upstream>
 		<remote-id type="cpan">Snapback2</remote-id>
 		<remote-id type="cpan-module">Backup::Snapback</remote-id>
diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
index 0f0eb6ff1c19..87ec64d3c2e1 100644
--- a/app-backup/snapper/metadata.xml
+++ b/app-backup/snapper/metadata.xml
@@ -6,7 +6,6 @@
 		It can create, delete and compare snapshots and undo changes done
 		between  snapshots. It supports both btrfs and ext4.
 	</longdescription>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pastas4@gmail.com</email>
 		<name>Dainius Masiliūnas (GreatEmerald)</name>
@@ -17,6 +16,10 @@
 		<name>Yixun Lan</name>
 		<description>co-maintainer, CC bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>aschnell@suse.de</email>
diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
index 6328f119b348..ed58bccf4261 100644
--- a/app-backup/tsm/metadata.xml
+++ b/app-backup/tsm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>Martin.vGagern@gmx.net</email>
 		<name>Martin von Gagern</name>
@@ -20,6 +19,10 @@
 		<name>Michael Weber</name>
 		<description>Proxy maintainer, CC him in bugs.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="hsm">Installs Tivoli Storage Manager for Space Management</flag>
 		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
diff --git a/app-benchmarks/acovea-gtk/metadata.xml b/app-benchmarks/acovea-gtk/metadata.xml
index ca0d72e3113b..24cbb90cf0c4 100644
--- a/app-benchmarks/acovea-gtk/metadata.xml
+++ b/app-benchmarks/acovea-gtk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
diff --git a/app-benchmarks/acovea/metadata.xml b/app-benchmarks/acovea/metadata.xml
index ca0d72e3113b..24cbb90cf0c4 100644
--- a/app-benchmarks/acovea/metadata.xml
+++ b/app-benchmarks/acovea/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
diff --git a/app-benchmarks/bashmark/metadata.xml b/app-benchmarks/bashmark/metadata.xml
index f50ab76d5abd..097975e3adc2 100644
--- a/app-benchmarks/bashmark/metadata.xml
+++ b/app-benchmarks/bashmark/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/bonnie++/metadata.xml b/app-benchmarks/bonnie++/metadata.xml
index dbb54cf3d480..9567e8fc3c30 100644
--- a/app-benchmarks/bonnie++/metadata.xml
+++ b/app-benchmarks/bonnie++/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<longdescription>
 		Bonnie++ is based on the Bonnie hard drive benchmark by Tim Bray. This
 		program is used by ReiserFS developers, but can be useful for anyone
diff --git a/app-benchmarks/bonnie/metadata.xml b/app-benchmarks/bonnie/metadata.xml
index 7e5a7f579109..097975e3adc2 100644
--- a/app-benchmarks/bonnie/metadata.xml
+++ b/app-benchmarks/bonnie/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/cpuburn/metadata.xml b/app-benchmarks/cpuburn/metadata.xml
index afc8cb4d2030..643c67eafb9a 100644
--- a/app-benchmarks/cpuburn/metadata.xml
+++ b/app-benchmarks/cpuburn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>benchmarks</herd>
   <longdescription>
 		CPUBurn is the ultimate stability testing tool for overclockers. The
 		program heats up any x86 CPU to the maximum possible operating
diff --git a/app-benchmarks/dbench/metadata.xml b/app-benchmarks/dbench/metadata.xml
index ca0d72e3113b..24cbb90cf0c4 100644
--- a/app-benchmarks/dbench/metadata.xml
+++ b/app-benchmarks/dbench/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
diff --git a/app-benchmarks/expedite/metadata.xml b/app-benchmarks/expedite/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/app-benchmarks/expedite/metadata.xml
+++ b/app-benchmarks/expedite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml
index fd1acd6e5c27..5b771e06862e 100644
--- a/app-benchmarks/filebench/metadata.xml
+++ b/app-benchmarks/filebench/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<upstream>
 		<remote-id type="sourceforge">filebench</remote-id>
 	</upstream>
diff --git a/app-benchmarks/forkbomb/metadata.xml b/app-benchmarks/forkbomb/metadata.xml
index d2a152451b5c..af0aa8a1512b 100644
--- a/app-benchmarks/forkbomb/metadata.xml
+++ b/app-benchmarks/forkbomb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<longdescription>
 	Controlled fork() bomber for testing heavy system load
 	</longdescription>
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
index 82d59e7109d1..8128aeb227a7 100644
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<longdescription lang="en">Httperf is a tool for measuring web server
 		performance. It provides a flexible facility for generating various HTTP
 		workloads and for measuring server performance. The focus of httperf is
diff --git a/app-benchmarks/ioping/metadata.xml b/app-benchmarks/ioping/metadata.xml
index 4ef63360a813..1b10b4ef9e4b 100644
--- a/app-benchmarks/ioping/metadata.xml
+++ b/app-benchmarks/ioping/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">ioping</remote-id>
     <remote-id type="github">koct9i/ioping</remote-id>
diff --git a/app-benchmarks/iozone/metadata.xml b/app-benchmarks/iozone/metadata.xml
index e283886bb23a..e290f29addd7 100644
--- a/app-benchmarks/iozone/metadata.xml
+++ b/app-benchmarks/iozone/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>benchmarks</herd>
 <maintainer>
   <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
diff --git a/app-benchmarks/jmeter/metadata.xml b/app-benchmarks/jmeter/metadata.xml
index 3712e22d3a34..8971937b0765 100644
--- a/app-benchmarks/jmeter/metadata.xml
+++ b/app-benchmarks/jmeter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <use>
 	<flag name="beanshell">Enable BeanShell scripting support</flag>
 </use>
diff --git a/app-benchmarks/ltp/metadata.xml b/app-benchmarks/ltp/metadata.xml
index ac1dee818a2e..61ed570dbcb4 100644
--- a/app-benchmarks/ltp/metadata.xml
+++ b/app-benchmarks/ltp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
diff --git a/app-benchmarks/os-autoinst/metadata.xml b/app-benchmarks/os-autoinst/metadata.xml
index 6fffb6812f9a..7b3677c1caee 100644
--- a/app-benchmarks/os-autoinst/metadata.xml
+++ b/app-benchmarks/os-autoinst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-benchmarks/phoronix-test-suite/metadata.xml b/app-benchmarks/phoronix-test-suite/metadata.xml
index f50ab76d5abd..097975e3adc2 100644
--- a/app-benchmarks/phoronix-test-suite/metadata.xml
+++ b/app-benchmarks/phoronix-test-suite/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/piozone/metadata.xml b/app-benchmarks/piozone/metadata.xml
index 7e5a7f579109..097975e3adc2 100644
--- a/app-benchmarks/piozone/metadata.xml
+++ b/app-benchmarks/piozone/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/pipebench/metadata.xml b/app-benchmarks/pipebench/metadata.xml
index 7e5a7f579109..097975e3adc2 100644
--- a/app-benchmarks/pipebench/metadata.xml
+++ b/app-benchmarks/pipebench/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index 7e5a7f579109..097975e3adc2 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/stress/metadata.xml b/app-benchmarks/stress/metadata.xml
index 7e5a7f579109..097975e3adc2 100644
--- a/app-benchmarks/stress/metadata.xml
+++ b/app-benchmarks/stress/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 </pkgmetadata>
diff --git a/app-benchmarks/sysbench/metadata.xml b/app-benchmarks/sysbench/metadata.xml
index 50b818706223..b3a144872302 100644
--- a/app-benchmarks/sysbench/metadata.xml
+++ b/app-benchmarks/sysbench/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<use>
 		<flag name="aio">Enable libaio support</flag>
 	</use>
diff --git a/app-cdr/acetoneiso/metadata.xml b/app-cdr/acetoneiso/metadata.xml
index 9ead352eca21..cfdd4df01b7b 100644
--- a/app-cdr/acetoneiso/metadata.xml
+++ b/app-cdr/acetoneiso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <upstream>
     <remote-id type="sourceforge">acetoneiso</remote-id>
   </upstream>
diff --git a/app-cdr/b5i2iso/metadata.xml b/app-cdr/b5i2iso/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-cdr/b5i2iso/metadata.xml
+++ b/app-cdr/b5i2iso/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/bashburn/metadata.xml b/app-cdr/bashburn/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-cdr/bashburn/metadata.xml
+++ b/app-cdr/bashburn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml
index e32589f7217c..7dcabc2a68b9 100644
--- a/app-cdr/bchunk/metadata.xml
+++ b/app-cdr/bchunk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>binchunker converts a CD image in a ".bin / .cue" format
 (sometimes ".raw / .cue") to a set of .iso and .cdr tracks.</longdescription>
 </pkgmetadata>
diff --git a/app-cdr/bin2iso/metadata.xml b/app-cdr/bin2iso/metadata.xml
index 0937d8ba0535..fd0828bdd8eb 100644
--- a/app-cdr/bin2iso/metadata.xml
+++ b/app-cdr/bin2iso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>
 Converts RAW format (.bin) files to ISO/WAV format and recovers .cue 
 files from .bin ones
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index de61cac68a76..44edd6a0f9ca 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>media-optical</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
diff --git a/app-cdr/burn-cd/metadata.xml b/app-cdr/burn-cd/metadata.xml
index e44077c4cb8e..f03f516df74e 100644
--- a/app-cdr/burn-cd/metadata.xml
+++ b/app-cdr/burn-cd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">burn-cd</remote-id>
diff --git a/app-cdr/burncdda/metadata.xml b/app-cdr/burncdda/metadata.xml
index b8ea64ff3beb..49b8334784b4 100644
--- a/app-cdr/burncdda/metadata.xml
+++ b/app-cdr/burncdda/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>
 	burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec,
 	flac, normalize, and mp3_check. It can be used to create audio CDs from an
diff --git a/app-cdr/burncenter/metadata.xml b/app-cdr/burncenter/metadata.xml
index 39c34fb79ef0..411b44bd9cb3 100644
--- a/app-cdr/burncenter/metadata.xml
+++ b/app-cdr/burncenter/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>
 	 Burncenter is a very easy-to-use text-based interface to cd-burning tools
 	 under UNIX (cdrecord, cdda2wav, mkisofs). Burncenter 3.x is a Perl module
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
index 8ef18cc24d1e..6e62f1cb43a3 100644
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription>
 CloneCD image to ISO image file converter
 </longdescription>
diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml
index 33e32af6ee6b..e1af3906fa9b 100644
--- a/app-cdr/cdck/metadata.xml
+++ b/app-cdr/cdck/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <maintainer>
     <email>zzam@gentoo.org</email>
     <name>Matthias Schwarzott</name>
diff --git a/app-cdr/cdcover/metadata.xml b/app-cdr/cdcover/metadata.xml
index 0b02723d0fa8..cf949f007b0e 100644
--- a/app-cdr/cdcover/metadata.xml
+++ b/app-cdr/cdcover/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">cdcover</remote-id>
 	</upstream>
diff --git a/app-cdr/cddetect/metadata.xml b/app-cdr/cddetect/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/cddetect/metadata.xml
+++ b/app-cdr/cddetect/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/cdlabelgen/metadata.xml b/app-cdr/cdlabelgen/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-cdr/cdlabelgen/metadata.xml
+++ b/app-cdr/cdlabelgen/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 3c7976dc0e4c..d346dd12cfb3 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <longdescription>
   CD command line recording, ripping and copying tool.  Especially ISOs- and
   bin/cue-files are handled very well.
diff --git a/app-cdr/cdrkit/metadata.xml b/app-cdr/cdrkit/metadata.xml
index aae6e8088839..7f7e040e3e84 100644
--- a/app-cdr/cdrkit/metadata.xml
+++ b/app-cdr/cdrkit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <use>
 	<flag name="hfs">Provide building of HFS (Apple) CD-images</flag>
 </use>
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
index 070540f55285..b8f6c8df37ab 100644
--- a/app-cdr/cdrtools/metadata.xml
+++ b/app-cdr/cdrtools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
index ef2c6a7ab80f..855d9a998673 100644
--- a/app-cdr/cdw/metadata.xml
+++ b/app-cdr/cdw/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 		<name>Michael Sterrett</name>
diff --git a/app-cdr/cue2toc/metadata.xml b/app-cdr/cue2toc/metadata.xml
index 132f38b47fc7..ee1fa09cb6dd 100644
--- a/app-cdr/cue2toc/metadata.xml
+++ b/app-cdr/cue2toc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription lang="en">
 		cue2toc is a free program for UNIX systems to convert CUE files to cdrdao's
 		TOC format. Features include: support for complete set of CUE commands (e.g.
diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml
index e0d2f24a7027..21d34a828bd1 100644
--- a/app-cdr/cuecue/metadata.xml
+++ b/app-cdr/cuecue/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription lang="en">
 		cuecue is a command line program to convert .cue + [.ogg|.flac|.wav|.mp3] to
 		.cue + .bin, in order to make them easier to burn with standard burning software.
diff --git a/app-cdr/cuegen/metadata.xml b/app-cdr/cuegen/metadata.xml
index 0b894b75abe9..1d6ffcbb92e9 100644
--- a/app-cdr/cuegen/metadata.xml
+++ b/app-cdr/cuegen/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription lang="en">
 		CUEgen is a FLAC-compatible cuesheet generator for Linux. The FLAC
 		format allows cuesheets to be embedded in .flac files by storing 
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
index 3594ad3a363a..574c03ef7d81 100644
--- a/app-cdr/cuetools/metadata.xml
+++ b/app-cdr/cuetools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<use>
 		<flag name="extras">Install additional script that tag files based on cue/toc file information</flag>
 	</use>
diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
index 2aaa56d0ca86..f3e138a3a737 100644
--- a/app-cdr/disc-cover/metadata.xml
+++ b/app-cdr/disc-cover/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <longdescription>
     This is the disc-cover CLI only. For the web application,
     see www-apps/disc-cover. These two packages are tightly
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index 6829312d3db5..93642c6ae02c 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>
 dvdrtools is a fork of cdrtools, with the primary goal of supporting
 writable DVD drives.
diff --git a/app-cdr/dvd95/metadata.xml b/app-cdr/dvd95/metadata.xml
index 917d7033c489..ae9e54150d40 100644
--- a/app-cdr/dvd95/metadata.xml
+++ b/app-cdr/dvd95/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvd95</remote-id>
 	</upstream>
diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
index f02ca884db99..dec8156ad951 100644
--- a/app-cdr/dvdisaster/metadata.xml
+++ b/app-cdr/dvdisaster/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvdisaster</remote-id>
 	</upstream>
diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
index f82fae79b6ae..13c5e3e1ae05 100644
--- a/app-cdr/dvdshrink/metadata.xml
+++ b/app-cdr/dvdshrink/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription>
 XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
 archival copies of DVD content on single-layer writable DVDs.
diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml
index ca3c1304c920..438b3201cc72 100644
--- a/app-cdr/extract-xiso/metadata.xml
+++ b/app-cdr/extract-xiso/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Tool for extracting and creating optimised Xbox ISO images</longdescription>
   <upstream>
     <remote-id type="sourceforge">extract-xiso</remote-id>
diff --git a/app-cdr/gnomebaker/metadata.xml b/app-cdr/gnomebaker/metadata.xml
index ffe73314bd8c..5c5c9ba25a9c 100644
--- a/app-cdr/gnomebaker/metadata.xml
+++ b/app-cdr/gnomebaker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">gnomebaker</remote-id>
 	</upstream>
diff --git a/app-cdr/graveman/metadata.xml b/app-cdr/graveman/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/graveman/metadata.xml
+++ b/app-cdr/graveman/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/gtkcdlabel/metadata.xml b/app-cdr/gtkcdlabel/metadata.xml
index 37d0a75406c0..a4ab4cb4946d 100644
--- a/app-cdr/gtkcdlabel/metadata.xml
+++ b/app-cdr/gtkcdlabel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">gtkcdlabel</remote-id>
 	</upstream>
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/iat/metadata.xml
+++ b/app-cdr/iat/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml
index 588a5b809eff..16bcc9f800a2 100644
--- a/app-cdr/isomaster/metadata.xml
+++ b/app-cdr/isomaster/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
diff --git a/app-cdr/k3b/metadata.xml b/app-cdr/k3b/metadata.xml
index faefd0ab4bb8..b9115d7a02b3 100644
--- a/app-cdr/k3b/metadata.xml
+++ b/app-cdr/k3b/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>media-optical</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="emovix">Enable burning support for eMoviX images</flag>
 	</use>
diff --git a/app-cdr/k9copy/metadata.xml b/app-cdr/k9copy/metadata.xml
index d4420fa11d74..09c5f3b334ba 100644
--- a/app-cdr/k9copy/metadata.xml
+++ b/app-cdr/k9copy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">k9copy</remote-id>
 	</upstream>
diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml
index 8fddefa5d03b..710850e4961f 100644
--- a/app-cdr/kcdemu/metadata.xml
+++ b/app-cdr/kcdemu/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-cdr/mode2cdmaker/metadata.xml b/app-cdr/mode2cdmaker/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/mode2cdmaker/metadata.xml
+++ b/app-cdr/mode2cdmaker/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/mp3burn/metadata.xml b/app-cdr/mp3burn/metadata.xml
index ecaafbfb6544..c3543eefe8fa 100644
--- a/app-cdr/mp3burn/metadata.xml
+++ b/app-cdr/mp3burn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">mp3burn</remote-id>
 	</upstream>
diff --git a/app-cdr/multicd/metadata.xml b/app-cdr/multicd/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/multicd/metadata.xml
+++ b/app-cdr/multicd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/mybashburn/metadata.xml b/app-cdr/mybashburn/metadata.xml
index e3262c6b7f10..26af9704b1f2 100644
--- a/app-cdr/mybashburn/metadata.xml
+++ b/app-cdr/mybashburn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<use>
 		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
 	</use>
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-cdr/nero/metadata.xml
+++ b/app-cdr/nero/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/nrg2iso/metadata.xml b/app-cdr/nrg2iso/metadata.xml
index 6259b9670113..9a6a05f617ca 100644
--- a/app-cdr/nrg2iso/metadata.xml
+++ b/app-cdr/nrg2iso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>Nrg2Iso is a linux utils for converting CD (or DVD) image
 generated by Nero Burning Rom to ISO format.
 </longdescription>
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
index 3ca6ae763b34..097975e3adc2 100644
--- a/app-cdr/pburn/metadata.xml
+++ b/app-cdr/pburn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/plextor-tool/metadata.xml b/app-cdr/plextor-tool/metadata.xml
index 645443001f0a..6ec9f833c35f 100644
--- a/app-cdr/plextor-tool/metadata.xml
+++ b/app-cdr/plextor-tool/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">plextor-tool</remote-id>
diff --git a/app-cdr/poweriso/metadata.xml b/app-cdr/poweriso/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-cdr/poweriso/metadata.xml
+++ b/app-cdr/poweriso/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/qmultirecord/metadata.xml b/app-cdr/qmultirecord/metadata.xml
index 8f92762cc1c9..097975e3adc2 100644
--- a/app-cdr/qmultirecord/metadata.xml
+++ b/app-cdr/qmultirecord/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/qpxtool/metadata.xml b/app-cdr/qpxtool/metadata.xml
index 6396beb75f92..333e84f6749b 100644
--- a/app-cdr/qpxtool/metadata.xml
+++ b/app-cdr/qpxtool/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">qpxtool</remote-id>
 	</upstream>
diff --git a/app-cdr/recorder/metadata.xml b/app-cdr/recorder/metadata.xml
index 71fa8c598679..26c362c8ce38 100644
--- a/app-cdr/recorder/metadata.xml
+++ b/app-cdr/recorder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <longdescription lang="en">
     Recorder is a graphical frontend of cdrecord/cdrtools, cdrdao, mkisofs
     and growisofs. It aims to be simple and easy to use, free of large
diff --git a/app-cdr/sync2cd/metadata.xml b/app-cdr/sync2cd/metadata.xml
index 1f9afb61bd09..5601a2cac62e 100644
--- a/app-cdr/sync2cd/metadata.xml
+++ b/app-cdr/sync2cd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <longdescription>
 sync2cd is an incremental archiving tool. It allows backing up complete filesystem hierarchies to multiple backup 
 media (e.g. CD-R). Files are archived incrementally, i.e. only new or changed files are stored during an archive 
diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml
index 8f92762cc1c9..097975e3adc2 100644
--- a/app-cdr/tkdvd/metadata.xml
+++ b/app-cdr/tkdvd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/uif2iso/metadata.xml b/app-cdr/uif2iso/metadata.xml
index fadf539e8a0b..53f09a6d8ca1 100644
--- a/app-cdr/uif2iso/metadata.xml
+++ b/app-cdr/uif2iso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
diff --git a/app-cdr/webcdwriter/metadata.xml b/app-cdr/webcdwriter/metadata.xml
index 44bbb0fe9738..eff5becbae11 100644
--- a/app-cdr/webcdwriter/metadata.xml
+++ b/app-cdr/webcdwriter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 <longdescription>webCDwriter can be used to make the CD- and DVD-writer(s)
 	connected to a Linux box available to all users in your network. It consists
 	of the server CDWserver and the clients webCDcreator and rcdrecord.
diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml
index d580470d000b..b37a98113a3b 100644
--- a/app-cdr/xbiso/metadata.xml
+++ b/app-cdr/xbiso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
   <longdescription>Tools for manipulating Xbox ISO images</longdescription>
   <upstream>
     <remote-id type="sourceforge">xbiso</remote-id>
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
index a180a61abbc4..39a231aac704 100644
--- a/app-cdr/xcdroast/metadata.xml
+++ b/app-cdr/xcdroast/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 	<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xcdroast</remote-id>
diff --git a/app-cdr/xdvdfs-tools/metadata.xml b/app-cdr/xdvdfs-tools/metadata.xml
index 14dba77325f5..f3486506bec7 100644
--- a/app-cdr/xdvdfs-tools/metadata.xml
+++ b/app-cdr/xdvdfs-tools/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Tools for manipulating Xbox ISO images</longdescription>
 </pkgmetadata>
diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml
index 9251991fca79..4d1ca6862d62 100644
--- a/app-cdr/xfburn/metadata.xml
+++ b/app-cdr/xfburn/metadata.xml
@@ -5,7 +5,6 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <herd>media-optical</herd>
   <upstream>
     <maintainer>
       <email>mario@xfce.org</email>
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 662ee8f7211f..0382b9ccbaa9 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>vincent.hardy.be@gmail.com</email>
     <description>Proxied maintainer, assign bugs to him</description>
@@ -11,4 +9,12 @@
     <email>flameeyes@gentoo.org</email>
     <description>Proxy-maintainer, CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-crypt/aescrypt/metadata.xml b/app-crypt/aescrypt/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/aescrypt/metadata.xml
+++ b/app-crypt/aescrypt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index b26c0f266c7f..419b426b7726 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="asm">Enable assebly modules</flag>
 		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
diff --git a/app-crypt/asedriveiiie-serial/metadata.xml b/app-crypt/asedriveiiie-serial/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/asedriveiiie-serial/metadata.xml
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/asedriveiiie-usb/metadata.xml b/app-crypt/asedriveiiie-usb/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/asedriveiiie-usb/metadata.xml
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/app-crypt/asekey/metadata.xml
+++ b/app-crypt/asekey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/bcrypt/metadata.xml b/app-crypt/bcrypt/metadata.xml
index eb17ed1ab0b2..3936e5d1afee 100644
--- a/app-crypt/bcrypt/metadata.xml
+++ b/app-crypt/bcrypt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bcrypt</remote-id>
 	</upstream>
diff --git a/app-crypt/bcwipe/metadata.xml b/app-crypt/bcwipe/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/app-crypt/bcwipe/metadata.xml
+++ b/app-crypt/bcwipe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/bestcrypt/metadata.xml
+++ b/app-crypt/bestcrypt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/bsign/metadata.xml b/app-crypt/bsign/metadata.xml
index e2e168b2d9c2..96f22ad3288c 100644
--- a/app-crypt/bsign/metadata.xml
+++ b/app-crypt/bsign/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>
 		This package embeds secure hashes (SHA1) and digital signatures (GNU 
 		Privacy Guard) into files for verification and authentication. 
diff --git a/app-crypt/cardpeek/metadata.xml b/app-crypt/cardpeek/metadata.xml
index e70ecc2e1e74..0e0fc8aee596 100644
--- a/app-crypt/cardpeek/metadata.xml
+++ b/app-crypt/cardpeek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
index 77a09421d608..c6d705bef2cd 100644
--- a/app-crypt/ccid/metadata.xml
+++ b/app-crypt/ccid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="twinserial">Enable twinserial reader</flag>
 	</use>
diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
index 85caba2b03f9..e9f74243cae2 100644
--- a/app-crypt/ccrypt/metadata.xml
+++ b/app-crypt/ccrypt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ccrypt</remote-id>
 	</upstream>
diff --git a/app-crypt/chntpw/metadata.xml b/app-crypt/chntpw/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/app-crypt/chntpw/metadata.xml
+++ b/app-crypt/chntpw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index 8a8bbde802b4..2c1faaa31d00 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>exa.exa@gmail.com</email>
 		<name>Mirek Kratochvil</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		This is a GnuPG-like unix program for encryption and signing
 		that uses only quantum-computer-resistant algorithms
diff --git a/app-crypt/coolkey/metadata.xml b/app-crypt/coolkey/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/coolkey/metadata.xml
+++ b/app-crypt/coolkey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml
index 085212f60315..51c5ddfd9894 100644
--- a/app-crypt/cryptkeeper/metadata.xml
+++ b/app-crypt/cryptkeeper/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>phobosk@fastmail.fm</email>
 	<name>PhobosK</name>
 	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 Cryptkeeper is a Linux system tray applet that manages EncFS encrypted folders.
 It allows users to mount and unmount encfs folders, to change the password and
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/dieharder/metadata.xml
+++ b/app-crypt/dieharder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/dirmngr/metadata.xml b/app-crypt/dirmngr/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/dirmngr/metadata.xml
+++ b/app-crypt/dirmngr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index a695712ba3d3..5708416de1fd 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>vincent.hardy.be@gmail.com</email>
 </maintainer>
 <maintainer>
   <email>flameeyes@gentoo.org</email>
 </maintainer>
+<maintainer>
+   <email>proxy-maint@gentoo.org</email>
+   <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
 
diff --git a/app-crypt/fcrackzip/metadata.xml b/app-crypt/fcrackzip/metadata.xml
index 2381b9de7c87..a56b4dcf193e 100644
--- a/app-crypt/fcrackzip/metadata.xml
+++ b/app-crypt/fcrackzip/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-crypt/gcr/metadata.xml
+++ b/app-crypt/gcr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/gnupg-pkcs11-scd/metadata.xml b/app-crypt/gnupg-pkcs11-scd/metadata.xml
index 7e1350d65107..48f391d24df2 100644
--- a/app-crypt/gnupg-pkcs11-scd/metadata.xml
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>
 		GnuPG scd replacement that enables the use of PKCS#11 tokens.
 	</longdescription>
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 6cb7075afb66..99c3652db47b 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <longdescription>
     GnuPG is a complete and free implementation of the OpenPGP standard as
     defined by RFC4880.
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/gpa/metadata.xml
+++ b/app-crypt/gpa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index 780611be23d4..1f249d901339 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
 	</use>
diff --git a/app-crypt/gpgstats/metadata.xml b/app-crypt/gpgstats/metadata.xml
index f08d14f4a08f..78ae252e12b0 100644
--- a/app-crypt/gpgstats/metadata.xml
+++ b/app-crypt/gpgstats/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>crypto@gentoo.org</email>
+  <name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/hashalot/metadata.xml b/app-crypt/hashalot/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-crypt/hashalot/metadata.xml
+++ b/app-crypt/hashalot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/hashcat-bin/metadata.xml b/app-crypt/hashcat-bin/metadata.xml
index 44d1c7b19811..cb486049f3a4 100644
--- a/app-crypt/hashcat-bin/metadata.xml
+++ b/app-crypt/hashcat-bin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>crypto@gentoo.org</email>
+<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/hashcat-gui/metadata.xml b/app-crypt/hashcat-gui/metadata.xml
index 0c85d8488350..80cda834d168 100644
--- a/app-crypt/hashcat-gui/metadata.xml
+++ b/app-crypt/hashcat-gui/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="cuda">Install oclhashcat-{plus,lite}-bin to take advantage of hardware cuda support.</flag>
     <flag name="opencl">Install oclhashcat-{plus,lite}-bin to take advantage of hardware opencl support.</flag>
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index a8ae6730c501..de7d5daa815f 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kerberos</herd>
+	<maintainer>
+		<email>kerberos@gentoo.org</email>
+		<name>Kerberos</name>
+	</maintainer>
 	<longdescription>Kerberos 5 implementation from KTH</longdescription>
 	<use>
 		<flag name="otp">
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
index c31b239a1d76..c0bfd8062c08 100644
--- a/app-crypt/hmaccalc/metadata.xml
+++ b/app-crypt/hmaccalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+<email>crypto@gentoo.org</email>
+<name>Crypto</name>
+</maintainer>
 <use>
 <flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
 </use>
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index 3bdf34cfa8eb..d7fe9af0fd3c 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>swift@gentoo.org</email>
 		<name>Sven Vermeulen</name>
 		<description>Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription lang="en">
 Supporting tools for IMA and EVM
 	</longdescription>
diff --git a/app-crypt/jacksum/metadata.xml b/app-crypt/jacksum/metadata.xml
index aa3ea50a24b3..777fd17e154b 100644
--- a/app-crypt/jacksum/metadata.xml
+++ b/app-crypt/jacksum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jacksum</remote-id>
 	</upstream>
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index dabd8490bbad..abb26ed52c84 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
     <description>Any and all help appreciated</description>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
     <flag name="mozilla"> Support mozilla password cracking</flag>
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/app-crypt/kencfs/metadata.xml
+++ b/app-crypt/kencfs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/kstart/metadata.xml b/app-crypt/kstart/metadata.xml
index 9d8a37e6bcbf..fb8bc868cccf 100644
--- a/app-crypt/kstart/metadata.xml
+++ b/app-crypt/kstart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kerberos</herd>
+  <maintainer>
+    <email>kerberos@gentoo.org</email>
+    <name>Kerberos</name>
+  </maintainer>
   <longdescription>Modified versions of kinit that can use srvtabs or
   keytabs to authenticate, can run as daemons and wake up periodically
   to refresh a ticket, and can run single commands with their own
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index 455620cf3c8e..c81875abf349 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
index 1b1e3adf7579..7d2ec9c205ad 100644
--- a/app-crypt/libu2f-host/metadata.xml
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="systemd">
       Use user ACLs rather than plugdev group to give user access to the HIDRAW
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
index 415933a13d78..fa660d8b11a1 100644
--- a/app-crypt/libykneomgr/metadata.xml
+++ b/app-crypt/libykneomgr/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Yubico/libykneomgr</remote-id>
     <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 8ea4760c3c9e..737d82b3bbd3 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">loop-aes</remote-id>
 	</upstream>
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
index 73113c99c420..bfafe385a333 100644
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcrypt</remote-id>
   </upstream>
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
index 2d87b7020851..71af1cefdf3d 100644
--- a/app-crypt/md6sum/metadata.xml
+++ b/app-crypt/md6sum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/app-crypt/mdcrack/metadata.xml b/app-crypt/mdcrack/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/mdcrack/metadata.xml
+++ b/app-crypt/mdcrack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5-appl/metadata.xml b/app-crypt/mit-krb5-appl/metadata.xml
index 5ae9375e9391..2a1e1d958528 100644
--- a/app-crypt/mit-krb5-appl/metadata.xml
+++ b/app-crypt/mit-krb5-appl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kerberos</herd>
+<maintainer>
+	<email>kerberos@gentoo.org</email>
+	<name>Kerberos</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
index 2609e96c2f9d..0d59724ab52b 100644
--- a/app-crypt/mit-krb5/metadata.xml
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kerberos</herd>
+<maintainer>
+  <email>kerberos@gentoo.org</email>
+  <name>Kerberos</name>
+</maintainer>
 <longdescription>Kerberos 5 reference implementation from MIT</longdescription>
 <use>
   <flag name="doc">
diff --git a/app-crypt/nasty/metadata.xml b/app-crypt/nasty/metadata.xml
index f08d14f4a08f..78ae252e12b0 100644
--- a/app-crypt/nasty/metadata.xml
+++ b/app-crypt/nasty/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>crypto@gentoo.org</email>
+  <name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 1da17f136e47..02986dea1093 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">nwipe</remote-id>
   </upstream>
diff --git a/app-crypt/oclhashcat-lite-bin/metadata.xml b/app-crypt/oclhashcat-lite-bin/metadata.xml
index 69c15d179dd6..5ace541b2f5b 100644
--- a/app-crypt/oclhashcat-lite-bin/metadata.xml
+++ b/app-crypt/oclhashcat-lite-bin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>crypto@gentoo.org</email>
+<name>Crypto</name>
+</maintainer>
 <use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 69c15d179dd6..5ace541b2f5b 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>crypto@gentoo.org</email>
+<name>Crypto</name>
+</maintainer>
 <use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
index f08d14f4a08f..78ae252e12b0 100644
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>crypto@gentoo.org</email>
+  <name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/openssl-tpm-engine/metadata.xml b/app-crypt/openssl-tpm-engine/metadata.xml
index 4df7fbfabf49..77526511d451 100644
--- a/app-crypt/openssl-tpm-engine/metadata.xml
+++ b/app-crypt/openssl-tpm-engine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">trousers</remote-id>
 	</upstream>
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index b756e0a0fc71..5459c732c3b2 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="asn1">Enable ASN.1 certificate support</flag>
 		<flag name="trust">Build the trust policy module</flag>
diff --git a/app-crypt/pdfcrack/metadata.xml b/app-crypt/pdfcrack/metadata.xml
index d810cd613bf3..a19553b069f0 100644
--- a/app-crypt/pdfcrack/metadata.xml
+++ b/app-crypt/pdfcrack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pdfcrack</remote-id>
 	</upstream>
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index d18704030551..64b9acb1b900 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="clipboard">Enable clipboard integration</flag>
 	</use>
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 7bb1a89b9276..32a17f5a15ac 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
 	<maintainer>
 		<email>tomk@gentoo.org</email>
 		<name>Tom Knight</name>
 	</maintainer>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription lang="en">
 		The PGP Individual UID Signer (PIUS) is a tool for individually
 		signing all of the UIDs on a set of keys and encrypt-emailing each
diff --git a/app-crypt/pkcrack/metadata.xml b/app-crypt/pkcrack/metadata.xml
index 18d7c93b8f4e..f989417c39d0 100644
--- a/app-crypt/pkcrack/metadata.xml
+++ b/app-crypt/pkcrack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription>
 pkcrack is a password cracking program for zip files. It works using a plain text cipher attack.
 </longdescription>
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
index 847b41571a92..33f3ef97e521 100644
--- a/app-crypt/pkcs11-data/metadata.xml
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pkcs11-tools</remote-id>
 	</upstream>
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
index 847b41571a92..33f3ef97e521 100644
--- a/app-crypt/pkcs11-dump/metadata.xml
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pkcs11-tools</remote-id>
 	</upstream>
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index 71e64852ee63..f0ad47ae9349 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<herd>qt</herd>
-<herd>kde</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="botan">Enable botan plugin</flag>
 	<flag name="gcrypt">Enable gcrypt plugin</flag>
diff --git a/app-crypt/quickcrypt/metadata.xml b/app-crypt/quickcrypt/metadata.xml
index f08d14f4a08f..78ae252e12b0 100644
--- a/app-crypt/quickcrypt/metadata.xml
+++ b/app-crypt/quickcrypt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>crypto@gentoo.org</email>
+  <name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/rainbowcrack/metadata.xml b/app-crypt/rainbowcrack/metadata.xml
index 5e64af814596..3b5de509f72c 100644
--- a/app-crypt/rainbowcrack/metadata.xml
+++ b/app-crypt/rainbowcrack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription>
 RainbowCrack is a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
  In short, the RainbowCrack tool is a password cracker. A traditional brute force cracker try all possible 
diff --git a/app-crypt/scl011-bin/metadata.xml b/app-crypt/scl011-bin/metadata.xml
index 40b0135cee6e..7ccd5f3a1c29 100644
--- a/app-crypt/scl011-bin/metadata.xml
+++ b/app-crypt/scl011-bin/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>egore@gmx.de</email>
     <description>Proxied maintainer, assign bugs to him</description>
@@ -11,4 +9,12 @@
     <email>flameeyes@gentoo.org</email>
     <description>Proxy-maintainer, CC him on bugs</description>
   </maintainer>
+<maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
index 1a0271ca15d8..be6c1ee6e158 100644
--- a/app-crypt/scute/metadata.xml
+++ b/app-crypt/scute/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lucas.yamanishi@gmail.com</email>
     <name>Lucas Yamanishi</name>
@@ -12,6 +10,14 @@
     <email>flameeyes@gentoo.org</email>
     <description>Proxying maintainer.</description>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Scute is a PKCS #11 module that adds support for the OpenPGP
     smartcard card to the Mozilla Network Security Services (NSS).
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ b/app-crypt/seahorse-sharing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 06955307321c..02290ce08069 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag>
 </use>
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
index 6356f38aa023..27d1a82ec8bd 100644
--- a/app-crypt/sgeps/metadata.xml
+++ b/app-crypt/sgeps/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
@@ -10,4 +9,8 @@
     <name>Enrico Tagliavini</name>
     <description>Proxied co-maintainer</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-crypt/shishi/metadata.xml b/app-crypt/shishi/metadata.xml
index df6085aecff8..aaf62386ee12 100644
--- a/app-crypt/shishi/metadata.xml
+++ b/app-crypt/shishi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kerberos</herd>
+<maintainer>
+  <email>kerberos@gentoo.org</email>
+  <name>Kerberos</name>
+</maintainer>
 <longdescription lang="en">GNU Shishi, a free implementation of the Kerberos 5 network security system</longdescription>
 <use>
   <flag name="des">Enable DES related encryption/checksum types.</flag>
diff --git a/app-crypt/signing-party/metadata.xml b/app-crypt/signing-party/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/signing-party/metadata.xml
+++ b/app-crypt/signing-party/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/ssdeep/metadata.xml b/app-crypt/ssdeep/metadata.xml
index 25665619c9c7..b3789a469fb6 100644
--- a/app-crypt/ssdeep/metadata.xml
+++ b/app-crypt/ssdeep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ssdeep</remote-id>
 	</upstream>
diff --git a/app-crypt/stan/metadata.xml b/app-crypt/stan/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/stan/metadata.xml
+++ b/app-crypt/stan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/tc-play/metadata.xml b/app-crypt/tc-play/metadata.xml
index add1c176228a..e5798161f15b 100644
--- a/app-crypt/tc-play/metadata.xml
+++ b/app-crypt/tc-play/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="openssl">
       Use openssl crypto backend.
diff --git a/app-crypt/tinyca/metadata.xml b/app-crypt/tinyca/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-crypt/tinyca/metadata.xml
+++ b/app-crypt/tinyca/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 276d0e496d12..6c84d442c31a 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tpm-emulator</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index 423e312921f2..34b3582d73a2 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="pkcs11">
       Build Token data management utilities based on OpenCryptoki's
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index e47fe20d59bf..79bd01a98cbb 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
     <remote-id type="sourceforge">trousers</remote-id>
diff --git a/app-crypt/truecrypt/metadata.xml b/app-crypt/truecrypt/metadata.xml
index 749e2ecbb38f..804ea089f0e9 100644
--- a/app-crypt/truecrypt/metadata.xml
+++ b/app-crypt/truecrypt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
 	</use>
diff --git a/app-crypt/xca/metadata.xml b/app-crypt/xca/metadata.xml
index d80f3df4eec7..5f08cba81271 100644
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xca</remote-id>
 	</upstream>
diff --git a/app-crypt/yubikey-neo-manager/metadata.xml b/app-crypt/yubikey-neo-manager/metadata.xml
index d23bf8d7b32b..3f2834d05381 100644
--- a/app-crypt/yubikey-neo-manager/metadata.xml
+++ b/app-crypt/yubikey-neo-manager/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Yubico/yubikey-neo-manager</remote-id>
     <remote-id type="pypi">yubikey-neo-manager</remote-id>
diff --git a/app-dicts/bookview/metadata.xml b/app-dicts/bookview/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-dicts/bookview/metadata.xml
+++ b/app-dicts/bookview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
index f0a10e5ebb10..bf6d8ff04f97 100644
--- a/app-dicts/canna-2ch/metadata.xml
+++ b/app-dicts/canna-2ch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">omaemona</remote-id>
 	</upstream>
diff --git a/app-dicts/canna-cannadic/metadata.xml b/app-dicts/canna-cannadic/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-dicts/canna-cannadic/metadata.xml
+++ b/app-dicts/canna-cannadic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/dikt/metadata.xml b/app-dicts/dikt/metadata.xml
index aee45dc3036c..dfdfad9446b7 100644
--- a/app-dicts/dikt/metadata.xml
+++ b/app-dicts/dikt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">dikt</remote-id>
 	</upstream>
diff --git a/app-dicts/gjiten/metadata.xml b/app-dicts/gjiten/metadata.xml
index 4eaa41970206..3d8887770ed8 100644
--- a/app-dicts/gjiten/metadata.xml
+++ b/app-dicts/gjiten/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription>
 		Gjiten is a Japanese dictionary program for GNOME. Gjiten also has a
 		kanji dictionary. Any combination of stroke count, radicals and search
diff --git a/app-dicts/gnome-dictionary/metadata.xml b/app-dicts/gnome-dictionary/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-dicts/gnome-dictionary/metadata.xml
+++ b/app-dicts/gnome-dictionary/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/gwaei/metadata.xml b/app-dicts/gwaei/metadata.xml
index d47c7bdfffa3..86ef6a0a6d39 100644
--- a/app-dicts/gwaei/metadata.xml
+++ b/app-dicts/gwaei/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">
     gWaei is a drop-in replacement for Gjiten. The main feature of
     this dictonary program is regular expression support. For example,
diff --git a/app-dicts/ipadic/metadata.xml b/app-dicts/ipadic/metadata.xml
index 678b58f1d042..446dced65274 100644
--- a/app-dicts/ipadic/metadata.xml
+++ b/app-dicts/ipadic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ipadic</remote-id>
 	</upstream>
diff --git a/app-dicts/kasumi/metadata.xml b/app-dicts/kasumi/metadata.xml
index 8c2265f9f7d3..0450cca97485 100644
--- a/app-dicts/kasumi/metadata.xml
+++ b/app-dicts/kasumi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">kasumi</remote-id>
 	</upstream>
diff --git a/app-dicts/mecab-ipadic/metadata.xml b/app-dicts/mecab-ipadic/metadata.xml
index 1c35da350f2c..9b5b349c9c06 100644
--- a/app-dicts/mecab-ipadic/metadata.xml
+++ b/app-dicts/mecab-ipadic/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mecab</remote-id>
   </upstream>
diff --git a/app-dicts/mecab-naist-jdic/metadata.xml b/app-dicts/mecab-naist-jdic/metadata.xml
index 0c8e69ca5bad..bbf243e7b00f 100644
--- a/app-dicts/mecab-naist-jdic/metadata.xml
+++ b/app-dicts/mecab-naist-jdic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">naist-jdic</remote-id>
   </upstream>
diff --git a/app-dicts/mecab-unidic/metadata.xml b/app-dicts/mecab-unidic/metadata.xml
index 0f2bc9a7af2d..cc8697cbfb88 100644
--- a/app-dicts/mecab-unidic/metadata.xml
+++ b/app-dicts/mecab-unidic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">unidic</remote-id>
   </upstream>
diff --git a/app-dicts/migemo-dict/metadata.xml b/app-dicts/migemo-dict/metadata.xml
index aef01fc3d591..c746f2860f8d 100644
--- a/app-dicts/migemo-dict/metadata.xml
+++ b/app-dicts/migemo-dict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml
index 2cfa7063165c..531e4546cdce 100644
--- a/app-dicts/myspell-en/metadata.xml
+++ b/app-dicts/myspell-en/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>elizabeth@interlinked.me</email>
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-lv/metadata.xml b/app-dicts/myspell-lv/metadata.xml
index af8a69d40fd1..9e2bdc228205 100644
--- a/app-dicts/myspell-lv/metadata.xml
+++ b/app-dicts/myspell-lv/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maris.gis@gmail.com</email>
 		<name>Maris Nartiss</name>
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-ru/metadata.xml b/app-dicts/myspell-ru/metadata.xml
index 572cd6519a72..0e5458b01219 100644
--- a/app-dicts/myspell-ru/metadata.xml
+++ b/app-dicts/myspell-ru/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>perfect007gentleman@gmail.com</email>
 		<name>Perfect Gentleman</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/opendict/metadata.xml b/app-dicts/opendict/metadata.xml
index 778060b1693b..3f29f09e0489 100644
--- a/app-dicts/opendict/metadata.xml
+++ b/app-dicts/opendict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opendict</remote-id>
 	</upstream>
diff --git a/app-dicts/prime-dict/metadata.xml b/app-dicts/prime-dict/metadata.xml
index 644e5296866e..8ee4109a2ce7 100644
--- a/app-dicts/prime-dict/metadata.xml
+++ b/app-dicts/prime-dict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">prime</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-jmdict-en-ja/metadata.xml b/app-dicts/stardict-jmdict-en-ja/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-jmdict-en-ja/metadata.xml
+++ b/app-dicts/stardict-jmdict-en-ja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-jmdict-ja-en/metadata.xml b/app-dicts/stardict-jmdict-ja-en/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-jmdict-ja-en/metadata.xml
+++ b/app-dicts/stardict-jmdict-ja-en/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-quick-eng-jpn/metadata.xml b/app-dicts/stardict-quick-eng-jpn/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-quick-eng-jpn/metadata.xml
+++ b/app-dicts/stardict-quick-eng-jpn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-quick-jpn-eng/metadata.xml b/app-dicts/stardict-quick-jpn-eng/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-quick-jpn-eng/metadata.xml
+++ b/app-dicts/stardict-quick-jpn-eng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
index ba8e8561d89c..4ab6f0aaedf4 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>
diff --git a/app-dicts/sword-ab/metadata.xml b/app-dicts/sword-ab/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-ab/metadata.xml
+++ b/app-dicts/sword-ab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-abbott/metadata.xml b/app-dicts/sword-abbott/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-abbott/metadata.xml
+++ b/app-dicts/sword-abbott/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml b/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml
+++ b/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-acv/metadata.xml b/app-dicts/sword-acv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-acv/metadata.xml
+++ b/app-dicts/sword-acv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-afr1953/metadata.xml b/app-dicts/sword-afr1953/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-afr1953/metadata.xml
+++ b/app-dicts/sword-afr1953/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-akjv/metadata.xml b/app-dicts/sword-akjv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-akjv/metadata.xml
+++ b/app-dicts/sword-akjv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-alb/metadata.xml b/app-dicts/sword-alb/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-alb/metadata.xml
+++ b/app-dicts/sword-alb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-aleppo/metadata.xml b/app-dicts/sword-aleppo/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-aleppo/metadata.xml
+++ b/app-dicts/sword-aleppo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-amtract/metadata.xml b/app-dicts/sword-amtract/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-amtract/metadata.xml
+++ b/app-dicts/sword-amtract/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-arasvd/metadata.xml b/app-dicts/sword-arasvd/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-arasvd/metadata.xml
+++ b/app-dicts/sword-arasvd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-armeastern/metadata.xml b/app-dicts/sword-armeastern/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-armeastern/metadata.xml
+++ b/app-dicts/sword-armeastern/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-armwestern/metadata.xml b/app-dicts/sword-armwestern/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-armwestern/metadata.xml
+++ b/app-dicts/sword-armwestern/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-asv/metadata.xml b/app-dicts/sword-asv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-asv/metadata.xml
+++ b/app-dicts/sword-asv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-barnes/metadata.xml b/app-dicts/sword-barnes/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-barnes/metadata.xml
+++ b/app-dicts/sword-barnes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-bashautin/metadata.xml b/app-dicts/sword-bashautin/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-bashautin/metadata.xml
+++ b/app-dicts/sword-bashautin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-bbe/metadata.xml b/app-dicts/sword-bbe/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-bbe/metadata.xml
+++ b/app-dicts/sword-bbe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-br_en/metadata.xml b/app-dicts/sword-br_en/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-br_en/metadata.xml
+++ b/app-dicts/sword-br_en/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-bulcarigradnt/metadata.xml b/app-dicts/sword-bulcarigradnt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-bulcarigradnt/metadata.xml
+++ b/app-dicts/sword-bulcarigradnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-bulveren/metadata.xml b/app-dicts/sword-bulveren/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-bulveren/metadata.xml
+++ b/app-dicts/sword-bulveren/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-burjudson/metadata.xml b/app-dicts/sword-burjudson/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-burjudson/metadata.xml
+++ b/app-dicts/sword-burjudson/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-bwe/metadata.xml b/app-dicts/sword-bwe/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-bwe/metadata.xml
+++ b/app-dicts/sword-bwe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-byz/metadata.xml b/app-dicts/sword-byz/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-byz/metadata.xml
+++ b/app-dicts/sword-byz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-cbc/metadata.xml b/app-dicts/sword-cbc/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-cbc/metadata.xml
+++ b/app-dicts/sword-cbc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-chamorro/metadata.xml b/app-dicts/sword-chamorro/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-chamorro/metadata.xml
+++ b/app-dicts/sword-chamorro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-chincvs/metadata.xml b/app-dicts/sword-chincvs/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-chincvs/metadata.xml
+++ b/app-dicts/sword-chincvs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-chincvt/metadata.xml b/app-dicts/sword-chincvt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-chincvt/metadata.xml
+++ b/app-dicts/sword-chincvt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-chiun/metadata.xml b/app-dicts/sword-chiun/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-chiun/metadata.xml
+++ b/app-dicts/sword-chiun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-chiuns/metadata.xml b/app-dicts/sword-chiuns/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-chiuns/metadata.xml
+++ b/app-dicts/sword-chiuns/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-clarke/metadata.xml b/app-dicts/sword-clarke/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-clarke/metadata.xml
+++ b/app-dicts/sword-clarke/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-common/metadata.xml b/app-dicts/sword-common/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-common/metadata.xml
+++ b/app-dicts/sword-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-cro/metadata.xml b/app-dicts/sword-cro/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-cro/metadata.xml
+++ b/app-dicts/sword-cro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-czebkr/metadata.xml b/app-dicts/sword-czebkr/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-czebkr/metadata.xml
+++ b/app-dicts/sword-czebkr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-czecep/metadata.xml b/app-dicts/sword-czecep/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-czecep/metadata.xml
+++ b/app-dicts/sword-czecep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-czekms/metadata.xml b/app-dicts/sword-czekms/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-czekms/metadata.xml
+++ b/app-dicts/sword-czekms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-czenkb/metadata.xml b/app-dicts/sword-czenkb/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-czenkb/metadata.xml
+++ b/app-dicts/sword-czenkb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-daily/metadata.xml b/app-dicts/sword-daily/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-daily/metadata.xml
+++ b/app-dicts/sword-daily/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-dan/metadata.xml b/app-dicts/sword-dan/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-dan/metadata.xml
+++ b/app-dicts/sword-dan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-darby/metadata.xml b/app-dicts/sword-darby/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-darby/metadata.xml
+++ b/app-dicts/sword-darby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-dbd/metadata.xml b/app-dicts/sword-dbd/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-dbd/metadata.xml
+++ b/app-dicts/sword-dbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-diaglott/metadata.xml b/app-dicts/sword-diaglott/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-diaglott/metadata.xml
+++ b/app-dicts/sword-diaglott/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-drc/metadata.xml b/app-dicts/sword-drc/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-drc/metadata.xml
+++ b/app-dicts/sword-drc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-dtn/metadata.xml b/app-dicts/sword-dtn/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-dtn/metadata.xml
+++ b/app-dicts/sword-dtn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-dutkant/metadata.xml b/app-dicts/sword-dutkant/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-dutkant/metadata.xml
+++ b/app-dicts/sword-dutkant/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-dutsvv/metadata.xml b/app-dicts/sword-dutsvv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-dutsvv/metadata.xml
+++ b/app-dicts/sword-dutsvv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-easton/metadata.xml b/app-dicts/sword-easton/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-easton/metadata.xml
+++ b/app-dicts/sword-easton/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-emtv/metadata.xml b/app-dicts/sword-emtv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-emtv/metadata.xml
+++ b/app-dicts/sword-emtv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-esperanto/metadata.xml b/app-dicts/sword-esperanto/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-esperanto/metadata.xml
+++ b/app-dicts/sword-esperanto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-est/metadata.xml b/app-dicts/sword-est/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-est/metadata.xml
+++ b/app-dicts/sword-est/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-family/metadata.xml b/app-dicts/sword-family/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-family/metadata.xml
+++ b/app-dicts/sword-family/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-farsiopv/metadata.xml b/app-dicts/sword-farsiopv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-farsiopv/metadata.xml
+++ b/app-dicts/sword-farsiopv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-finbiblia/metadata.xml b/app-dicts/sword-finbiblia/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-finbiblia/metadata.xml
+++ b/app-dicts/sword-finbiblia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-finney/metadata.xml b/app-dicts/sword-finney/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-finney/metadata.xml
+++ b/app-dicts/sword-finney/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-finpr/metadata.xml b/app-dicts/sword-finpr/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-finpr/metadata.xml
+++ b/app-dicts/sword-finpr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-finpr92/metadata.xml b/app-dicts/sword-finpr92/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-finpr92/metadata.xml
+++ b/app-dicts/sword-finpr92/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-frebbb/metadata.xml b/app-dicts/sword-frebbb/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-frebbb/metadata.xml
+++ b/app-dicts/sword-frebbb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-frecrampon/metadata.xml b/app-dicts/sword-frecrampon/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-frecrampon/metadata.xml
+++ b/app-dicts/sword-frecrampon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-frecrl/metadata.xml b/app-dicts/sword-frecrl/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-frecrl/metadata.xml
+++ b/app-dicts/sword-frecrl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-frelsg/metadata.xml b/app-dicts/sword-frelsg/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-frelsg/metadata.xml
+++ b/app-dicts/sword-frelsg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-fremartin/metadata.xml b/app-dicts/sword-fremartin/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-fremartin/metadata.xml
+++ b/app-dicts/sword-fremartin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-fresegond/metadata.xml b/app-dicts/sword-fresegond/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-fresegond/metadata.xml
+++ b/app-dicts/sword-fresegond/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-geneva/metadata.xml b/app-dicts/sword-geneva/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-geneva/metadata.xml
+++ b/app-dicts/sword-geneva/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-geneva1599/metadata.xml b/app-dicts/sword-geneva1599/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-geneva1599/metadata.xml
+++ b/app-dicts/sword-geneva1599/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-gerelb1871/metadata.xml b/app-dicts/sword-gerelb1871/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-gerelb1871/metadata.xml
+++ b/app-dicts/sword-gerelb1871/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-gerelb1905/metadata.xml b/app-dicts/sword-gerelb1905/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-gerelb1905/metadata.xml
+++ b/app-dicts/sword-gerelb1905/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-gerlut1545/metadata.xml b/app-dicts/sword-gerlut1545/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-gerlut1545/metadata.xml
+++ b/app-dicts/sword-gerlut1545/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-gersch/metadata.xml b/app-dicts/sword-gersch/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-gersch/metadata.xml
+++ b/app-dicts/sword-gersch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-greekhebrew/metadata.xml b/app-dicts/sword-greekhebrew/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-greekhebrew/metadata.xml
+++ b/app-dicts/sword-greekhebrew/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hebmodern/metadata.xml b/app-dicts/sword-hebmodern/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hebmodern/metadata.xml
+++ b/app-dicts/sword-hebmodern/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hebrewgreek/metadata.xml b/app-dicts/sword-hebrewgreek/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hebrewgreek/metadata.xml
+++ b/app-dicts/sword-hebrewgreek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-heretics/metadata.xml b/app-dicts/sword-heretics/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-heretics/metadata.xml
+++ b/app-dicts/sword-heretics/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hitchcock/metadata.xml b/app-dicts/sword-hitchcock/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hitchcock/metadata.xml
+++ b/app-dicts/sword-hitchcock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hnv/metadata.xml b/app-dicts/sword-hnv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hnv/metadata.xml
+++ b/app-dicts/sword-hnv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hunkar/metadata.xml b/app-dicts/sword-hunkar/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hunkar/metadata.xml
+++ b/app-dicts/sword-hunkar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-hunuj/metadata.xml b/app-dicts/sword-hunuj/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-hunuj/metadata.xml
+++ b/app-dicts/sword-hunuj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-icelandic/metadata.xml b/app-dicts/sword-icelandic/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-icelandic/metadata.xml
+++ b/app-dicts/sword-icelandic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-institutes/metadata.xml b/app-dicts/sword-institutes/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-institutes/metadata.xml
+++ b/app-dicts/sword-institutes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-isbe/metadata.xml b/app-dicts/sword-isbe/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-isbe/metadata.xml
+++ b/app-dicts/sword-isbe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-isv/metadata.xml b/app-dicts/sword-isv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-isv/metadata.xml
+++ b/app-dicts/sword-isv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-itadio/metadata.xml b/app-dicts/sword-itadio/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-itadio/metadata.xml
+++ b/app-dicts/sword-itadio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-itarive/metadata.xml b/app-dicts/sword-itarive/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-itarive/metadata.xml
+++ b/app-dicts/sword-itarive/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-jfb/metadata.xml b/app-dicts/sword-jfb/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-jfb/metadata.xml
+++ b/app-dicts/sword-jfb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-josephus/metadata.xml b/app-dicts/sword-josephus/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-josephus/metadata.xml
+++ b/app-dicts/sword-josephus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-jps/metadata.xml b/app-dicts/sword-jps/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-jps/metadata.xml
+++ b/app-dicts/sword-jps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-jst/metadata.xml b/app-dicts/sword-jst/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-jst/metadata.xml
+++ b/app-dicts/sword-jst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-jubilee2000/metadata.xml b/app-dicts/sword-jubilee2000/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-jubilee2000/metadata.xml
+++ b/app-dicts/sword-jubilee2000/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-kekchi/metadata.xml b/app-dicts/sword-kekchi/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-kekchi/metadata.xml
+++ b/app-dicts/sword-kekchi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-kjv/metadata.xml b/app-dicts/sword-kjv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-kjv/metadata.xml
+++ b/app-dicts/sword-kjv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-kjvd/metadata.xml b/app-dicts/sword-kjvd/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-kjvd/metadata.xml
+++ b/app-dicts/sword-kjvd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-klv/metadata.xml b/app-dicts/sword-klv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-klv/metadata.xml
+++ b/app-dicts/sword-klv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-klven_iklingon/metadata.xml b/app-dicts/sword-klven_iklingon/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-klven_iklingon/metadata.xml
+++ b/app-dicts/sword-klven_iklingon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-klviklingon_en/metadata.xml b/app-dicts/sword-klviklingon_en/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-klviklingon_en/metadata.xml
+++ b/app-dicts/sword-klviklingon_en/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-korean/metadata.xml b/app-dicts/sword-korean/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-korean/metadata.xml
+++ b/app-dicts/sword-korean/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-la_en/metadata.xml b/app-dicts/sword-la_en/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-la_en/metadata.xml
+++ b/app-dicts/sword-la_en/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-latvian/metadata.xml b/app-dicts/sword-latvian/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-latvian/metadata.xml
+++ b/app-dicts/sword-latvian/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-lightfoot/metadata.xml b/app-dicts/sword-lightfoot/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-lightfoot/metadata.xml
+++ b/app-dicts/sword-lightfoot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-litv/metadata.xml b/app-dicts/sword-litv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-litv/metadata.xml
+++ b/app-dicts/sword-litv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-luther/metadata.xml b/app-dicts/sword-luther/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-luther/metadata.xml
+++ b/app-dicts/sword-luther/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-mak/metadata.xml b/app-dicts/sword-mak/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-mak/metadata.xml
+++ b/app-dicts/sword-mak/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-manxgaelic/metadata.xml b/app-dicts/sword-manxgaelic/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-manxgaelic/metadata.xml
+++ b/app-dicts/sword-manxgaelic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-maori/metadata.xml b/app-dicts/sword-maori/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-maori/metadata.xml
+++ b/app-dicts/sword-maori/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-mhc/metadata.xml b/app-dicts/sword-mhc/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-mhc/metadata.xml
+++ b/app-dicts/sword-mhc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-mhcc/metadata.xml b/app-dicts/sword-mhcc/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-mhcc/metadata.xml
+++ b/app-dicts/sword-mhcc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-mkjv/metadata.xml b/app-dicts/sword-mkjv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-mkjv/metadata.xml
+++ b/app-dicts/sword-mkjv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-montgomery/metadata.xml b/app-dicts/sword-montgomery/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-montgomery/metadata.xml
+++ b/app-dicts/sword-montgomery/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-murdock/metadata.xml b/app-dicts/sword-murdock/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-murdock/metadata.xml
+++ b/app-dicts/sword-murdock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-nave/metadata.xml b/app-dicts/sword-nave/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-nave/metadata.xml
+++ b/app-dicts/sword-nave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-norsk/metadata.xml b/app-dicts/sword-norsk/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-norsk/metadata.xml
+++ b/app-dicts/sword-norsk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-orthodoxy/metadata.xml b/app-dicts/sword-orthodoxy/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-orthodoxy/metadata.xml
+++ b/app-dicts/sword-orthodoxy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-packard/metadata.xml b/app-dicts/sword-packard/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-packard/metadata.xml
+++ b/app-dicts/sword-packard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-personal/metadata.xml b/app-dicts/sword-personal/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-personal/metadata.xml
+++ b/app-dicts/sword-personal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-peshitta/metadata.xml b/app-dicts/sword-peshitta/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-peshitta/metadata.xml
+++ b/app-dicts/sword-peshitta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-pilgrim/metadata.xml b/app-dicts/sword-pilgrim/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-pilgrim/metadata.xml
+++ b/app-dicts/sword-pilgrim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-pnt/metadata.xml b/app-dicts/sword-pnt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-pnt/metadata.xml
+++ b/app-dicts/sword-pnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-practice/metadata.xml b/app-dicts/sword-practice/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-practice/metadata.xml
+++ b/app-dicts/sword-practice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rkjnt/metadata.xml b/app-dicts/sword-rkjnt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rkjnt/metadata.xml
+++ b/app-dicts/sword-rkjnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rnkjv/metadata.xml b/app-dicts/sword-rnkjv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rnkjv/metadata.xml
+++ b/app-dicts/sword-rnkjv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-robinson/metadata.xml b/app-dicts/sword-robinson/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-robinson/metadata.xml
+++ b/app-dicts/sword-robinson/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-romcor/metadata.xml b/app-dicts/sword-romcor/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-romcor/metadata.xml
+++ b/app-dicts/sword-romcor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rotherham/metadata.xml b/app-dicts/sword-rotherham/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rotherham/metadata.xml
+++ b/app-dicts/sword-rotherham/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rst/metadata.xml b/app-dicts/sword-rst/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rst/metadata.xml
+++ b/app-dicts/sword-rst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rusmakarij/metadata.xml b/app-dicts/sword-rusmakarij/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rusmakarij/metadata.xml
+++ b/app-dicts/sword-rusmakarij/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rwebster/metadata.xml b/app-dicts/sword-rwebster/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rwebster/metadata.xml
+++ b/app-dicts/sword-rwebster/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-rwp/metadata.xml b/app-dicts/sword-rwp/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-rwp/metadata.xml
+++ b/app-dicts/sword-rwp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-saoa/metadata.xml b/app-dicts/sword-saoa/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-saoa/metadata.xml
+++ b/app-dicts/sword-saoa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-scofield/metadata.xml b/app-dicts/sword-scofield/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-scofield/metadata.xml
+++ b/app-dicts/sword-scofield/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-scotsgaelic/metadata.xml b/app-dicts/sword-scotsgaelic/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-scotsgaelic/metadata.xml
+++ b/app-dicts/sword-scotsgaelic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-sme/metadata.xml b/app-dicts/sword-sme/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-sme/metadata.xml
+++ b/app-dicts/sword-sme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-smith/metadata.xml b/app-dicts/sword-smith/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-smith/metadata.xml
+++ b/app-dicts/sword-smith/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-sparv/metadata.xml b/app-dicts/sword-sparv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-sparv/metadata.xml
+++ b/app-dicts/sword-sparv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-sparvg2004/metadata.xml b/app-dicts/sword-sparvg2004/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-sparvg2004/metadata.xml
+++ b/app-dicts/sword-sparvg2004/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-spasev/metadata.xml b/app-dicts/sword-spasev/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-spasev/metadata.xml
+++ b/app-dicts/sword-spasev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-spavnt/metadata.xml b/app-dicts/sword-spavnt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-spavnt/metadata.xml
+++ b/app-dicts/sword-spavnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-spurious/metadata.xml b/app-dicts/sword-spurious/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-spurious/metadata.xml
+++ b/app-dicts/sword-spurious/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-strongsgreek/metadata.xml b/app-dicts/sword-strongsgreek/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-strongsgreek/metadata.xml
+++ b/app-dicts/sword-strongsgreek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-strongshebrew/metadata.xml b/app-dicts/sword-strongshebrew/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-strongshebrew/metadata.xml
+++ b/app-dicts/sword-strongshebrew/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-swahili/metadata.xml b/app-dicts/sword-swahili/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-swahili/metadata.xml
+++ b/app-dicts/sword-swahili/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tagalog/metadata.xml b/app-dicts/sword-tagalog/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tagalog/metadata.xml
+++ b/app-dicts/sword-tagalog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tcr/metadata.xml b/app-dicts/sword-tcr/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tcr/metadata.xml
+++ b/app-dicts/sword-tcr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tdavid/metadata.xml b/app-dicts/sword-tdavid/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tdavid/metadata.xml
+++ b/app-dicts/sword-tdavid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tfg/metadata.xml b/app-dicts/sword-tfg/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tfg/metadata.xml
+++ b/app-dicts/sword-tfg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tisch/metadata.xml b/app-dicts/sword-tisch/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tisch/metadata.xml
+++ b/app-dicts/sword-tisch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-torrey/metadata.xml b/app-dicts/sword-torrey/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-torrey/metadata.xml
+++ b/app-dicts/sword-torrey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tr/metadata.xml b/app-dicts/sword-tr/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tr/metadata.xml
+++ b/app-dicts/sword-tr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tsk/metadata.xml b/app-dicts/sword-tsk/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tsk/metadata.xml
+++ b/app-dicts/sword-tsk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-twenty/metadata.xml b/app-dicts/sword-twenty/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-twenty/metadata.xml
+++ b/app-dicts/sword-twenty/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-tyndale/metadata.xml b/app-dicts/sword-tyndale/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-tyndale/metadata.xml
+++ b/app-dicts/sword-tyndale/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-ukjv/metadata.xml b/app-dicts/sword-ukjv/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-ukjv/metadata.xml
+++ b/app-dicts/sword-ukjv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-ukrainian/metadata.xml b/app-dicts/sword-ukrainian/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-ukrainian/metadata.xml
+++ b/app-dicts/sword-ukrainian/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-uma/metadata.xml b/app-dicts/sword-uma/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-uma/metadata.xml
+++ b/app-dicts/sword-uma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-umgreek/metadata.xml b/app-dicts/sword-umgreek/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-umgreek/metadata.xml
+++ b/app-dicts/sword-umgreek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-vulgate/metadata.xml b/app-dicts/sword-vulgate/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-vulgate/metadata.xml
+++ b/app-dicts/sword-vulgate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-vulgate_hebps/metadata.xml b/app-dicts/sword-vulgate_hebps/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-vulgate_hebps/metadata.xml
+++ b/app-dicts/sword-vulgate_hebps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-web/metadata.xml b/app-dicts/sword-web/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-web/metadata.xml
+++ b/app-dicts/sword-web/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-webster/metadata.xml b/app-dicts/sword-webster/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-webster/metadata.xml
+++ b/app-dicts/sword-webster/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-webstersdict/metadata.xml b/app-dicts/sword-webstersdict/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-webstersdict/metadata.xml
+++ b/app-dicts/sword-webstersdict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-wesley/metadata.xml b/app-dicts/sword-wesley/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-wesley/metadata.xml
+++ b/app-dicts/sword-wesley/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-weymouth/metadata.xml b/app-dicts/sword-weymouth/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-weymouth/metadata.xml
+++ b/app-dicts/sword-weymouth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-whnu/metadata.xml b/app-dicts/sword-whnu/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-whnu/metadata.xml
+++ b/app-dicts/sword-whnu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-wlc/metadata.xml b/app-dicts/sword-wlc/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-wlc/metadata.xml
+++ b/app-dicts/sword-wlc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-wulfila/metadata.xml b/app-dicts/sword-wulfila/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-wulfila/metadata.xml
+++ b/app-dicts/sword-wulfila/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-wycliffe/metadata.xml b/app-dicts/sword-wycliffe/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-wycliffe/metadata.xml
+++ b/app-dicts/sword-wycliffe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-xhosa/metadata.xml b/app-dicts/sword-xhosa/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-xhosa/metadata.xml
+++ b/app-dicts/sword-xhosa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/sword-ylt/metadata.xml b/app-dicts/sword-ylt/metadata.xml
index 6545fc35e3a5..0ce692c272ae 100644
--- a/app-dicts/sword-ylt/metadata.xml
+++ b/app-dicts/sword-ylt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
+<maintainer>
+	<email>theology@gentoo.org</email>
+	<name>Theology</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/wnn-ldic/metadata.xml b/app-dicts/wnn-ldic/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-dicts/wnn-ldic/metadata.xml
+++ b/app-dicts/wnn-ldic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-doc/abs-guide/metadata.xml b/app-doc/abs-guide/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/abs-guide/metadata.xml
+++ b/app-doc/abs-guide/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-doc/autobook/metadata.xml b/app-doc/autobook/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/autobook/metadata.xml
+++ b/app-doc/autobook/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-doc/blas-docs/metadata.xml b/app-doc/blas-docs/metadata.xml
index 55cdc5494fbb..a802fad1f861 100644
--- a/app-doc/blas-docs/metadata.xml
+++ b/app-doc/blas-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
 BLAS (Basic Linear Algebra Subroutines) is a set of efficient routines
 for most of the basic vector and matrix operations. They are widely
diff --git a/app-doc/csound-manual/metadata.xml b/app-doc/csound-manual/metadata.xml
index bd13905b6d0a..1a3458bc134e 100644
--- a/app-doc/csound-manual/metadata.xml
+++ b/app-doc/csound-manual/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 	</use>
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index c573796b03a8..b35396859ceb 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
 <longdescription>Doxygen is a tool for analyzing, documenting, and reverse-engineering 
     source code of various languages using a variety of output formats 
     (try it and see).  Doxygen supports C++, C, Java, Objective-C, Python, 
diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
index ac83800a5389..4fbe32c84e9d 100644
--- a/app-doc/edox-data/metadata.xml
+++ b/app-doc/edox-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
diff --git a/app-doc/geant-docs/metadata.xml b/app-doc/geant-docs/metadata.xml
index fa9b4cb556d3..8656bb5d037a 100644
--- a/app-doc/geant-docs/metadata.xml
+++ b/app-doc/geant-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   This package contains all the user documentation for the Geant4
   simulation toolkit in PDF formats.
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index f360b30a1cce..8a68b2d50d12 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>
diff --git a/app-doc/jargon/metadata.xml b/app-doc/jargon/metadata.xml
index fac0ae6714e5..097975e3adc2 100644
--- a/app-doc/jargon/metadata.xml
+++ b/app-doc/jargon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-doc</herd>
 </pkgmetadata>
diff --git a/app-doc/kicad-doc/metadata.xml b/app-doc/kicad-doc/metadata.xml
index 186e47339e54..f4f9d40611ee 100644
--- a/app-doc/kicad-doc/metadata.xml
+++ b/app-doc/kicad-doc/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="html">Generate documentation in HTML format</flag>
 		<flag name="pdf">Generate documentation in PDF format</flag>
diff --git a/app-doc/lapack-docs/metadata.xml b/app-doc/lapack-docs/metadata.xml
index cd3018de2bb8..ed0373fc4a96 100644
--- a/app-doc/lapack-docs/metadata.xml
+++ b/app-doc/lapack-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
 LAPACK is a comprehensive FORTRAN library that does linear
 algebra operations including matrix inversions, least squared
diff --git a/app-doc/linux-device-drivers/metadata.xml b/app-doc/linux-device-drivers/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/app-doc/linux-device-drivers/metadata.xml
+++ b/app-doc/linux-device-drivers/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index 512a5f321eac..f0cd2eaed52c 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="htmlsingle">Install all-on-one-page HTML version.</flag>
 	</use>
diff --git a/app-doc/php-docs/metadata.xml b/app-doc/php-docs/metadata.xml
index a8b98f4e37fa..89c1515aa43f 100644
--- a/app-doc/php-docs/metadata.xml
+++ b/app-doc/php-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>php</herd>
+    <maintainer>
+        <email>php-bugs@gentoo.org</email>
+        <name>PHP</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/app-doc/podbrowser/metadata.xml b/app-doc/podbrowser/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/app-doc/podbrowser/metadata.xml
+++ b/app-doc/podbrowser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 4947d04a2988..3d3ffb2f7f88 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -5,7 +5,10 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   This package contains the automatically generated ROOT class
   documentation.
diff --git a/app-doc/single-unix-specification/metadata.xml b/app-doc/single-unix-specification/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/single-unix-specification/metadata.xml
+++ b/app-doc/single-unix-specification/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index 0abe3fa9b6f9..5bcee00a8486 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install multi-chapter HTML docs</flag>
 		<flag name="htmlsingle">Install all-on-one-page HTML docs</flag>
diff --git a/app-editors/amyedit/metadata.xml b/app-editors/amyedit/metadata.xml
index 01c0744c8231..3b6e0ff7228b 100644
--- a/app-editors/amyedit/metadata.xml
+++ b/app-editors/amyedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">amyedit</remote-id>
   </upstream>
diff --git a/app-editors/beaver/metadata.xml b/app-editors/beaver/metadata.xml
index 756a13c648f5..0ef050bf2cbc 100644
--- a/app-editors/beaver/metadata.xml
+++ b/app-editors/beaver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">beaver-editor</remote-id>
 	</upstream>
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 80fb9b49f00e..4a92cf92dd14 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sdnick484@gmail.com</email>
 		<name>Nick Andrade</name>
 		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 </use>
diff --git a/app-editors/editra/metadata.xml b/app-editors/editra/metadata.xml
index a191ef54b9b3..c03e05d18cbf 100644
--- a/app-editors/editra/metadata.xml
+++ b/app-editors/editra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-editors/elvis/metadata.xml
+++ b/app-editors/elvis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/focuswriter/metadata.xml b/app-editors/focuswriter/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/app-editors/focuswriter/metadata.xml
+++ b/app-editors/focuswriter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 7b45ad6b3a1c..b198900e33ac 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>Official plugins for gedit</longdescription>
 <use>
 	<flag name="charmap">Insert special characters just by clicking on
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index a9cd9b4eb473..195680632c50 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>alexvandermey@gmail.com</email>
 <name>Alexander van der Mey</name>
@@ -12,6 +11,10 @@
 <name>Markos Chandras</name>
 <description>Proxy maintainer.</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index f4007d12d814..617bbb647801 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="netbeans">Include netbeans external editor integration support</flag>
diff --git a/app-editors/hexcurse/metadata.xml b/app-editors/hexcurse/metadata.xml
index eccdb28e857d..76bae4ae405d 100644
--- a/app-editors/hexcurse/metadata.xml
+++ b/app-editors/hexcurse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription>
 A console-based hex editor for the *NIX platform which uses the ncurses library.
 </longdescription>
diff --git a/app-editors/jedit/metadata.xml b/app-editors/jedit/metadata.xml
index e0ffd1dacbbe..985fc4de8843 100644
--- a/app-editors/jedit/metadata.xml
+++ b/app-editors/jedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jedit</remote-id>
 	</upstream>
diff --git a/app-editors/jext/metadata.xml b/app-editors/jext/metadata.xml
index bf4c75acc9b5..5c1ad70c20a6 100644
--- a/app-editors/jext/metadata.xml
+++ b/app-editors/jext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jext</remote-id>
 	</upstream>
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
index ac2cf167fb14..104db3fae9cc 100644
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">juffed</remote-id>
 	</upstream>
diff --git a/app-editors/kile/metadata.xml b/app-editors/kile/metadata.xml
index 184766816831..de52bb50c215 100644
--- a/app-editors/kile/metadata.xml
+++ b/app-editors/kile/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kile</remote-id>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
diff --git a/app-editors/latexila/metadata.xml b/app-editors/latexila/metadata.xml
index bba9d6cb634f..506b38acdfbd 100644
--- a/app-editors/latexila/metadata.xml
+++ b/app-editors/latexila/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default
 		for the build tools)</flag>
diff --git a/app-editors/leo/metadata.xml b/app-editors/leo/metadata.xml
index 31615d44deee..9e447ce37968 100644
--- a/app-editors/leo/metadata.xml
+++ b/app-editors/leo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">leo-editor/leo-editor</remote-id>
     <remote-id type="sourceforge">leo</remote-id>
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index e227b2c1c966..7add4235c5b4 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
diff --git a/app-editors/ng/metadata.xml b/app-editors/ng/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-editors/ng/metadata.xml
+++ b/app-editors/ng/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/padre/metadata.xml b/app-editors/padre/metadata.xml
index c4e883858d94..5b2c20b086a6 100644
--- a/app-editors/padre/metadata.xml
+++ b/app-editors/padre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Padre</remote-id>
   </upstream>
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index cf4c89f861f5..35e6cf12a306 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/pluma</remote-id>
     </upstream>
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
index 64f2a9e844c3..e4fc88c700a7 100644
--- a/app-editors/qxmledit/metadata.xml
+++ b/app-editors/qxmledit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		QXmlEdit is a simple XML editor written in Qt4. Its main
 		features are unusual data visualization modes, it has some
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index ad77fe863a08..02ef8bae19fe 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ervin.peters@ervnet.de</email>
 		<name>Ervin Peters</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scintilla</remote-id>
 	</upstream>
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index 79ad70798a5b..35d9e67fff4b 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <longdescription>
     A very small Qt text editor. It has lots of extra features including syntax
     highlighting and a built in file manager as well as a built in image viewer.
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
index 4728811b89d9..cf63c79b2da6 100644
--- a/app-editors/vim-core/metadata.xml
+++ b/app-editors/vim-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim/vim</remote-id>
 	</upstream>
diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index 108fd3e09ab2..0a6690208773 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="lto">Enable configure workaround for -flto</flag>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 6ec53ae58520..08d1823d285a 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml
index fee87e271829..72299366447d 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>wxwidgets</herd>
+  <maintainer>
+    <email>wxwidgets@gentoo.org</email>
+    <name>Gentoo wxWidgets Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wxhexeditor</remote-id>
   </upstream>
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 413e8714efd4..60f767952aed 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
   <maintainer>
     <email>xemacs@gentoo.org</email>
     <description>Primary Maintainer</description>
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index 5c04de6911fc..3da8128085ba 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dabbott@gentoo.org</email>
 		<name>David Abbott</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	Fast, free, validating XML editor.
 </longdescription>
diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-editors/xvile/metadata.xml
+++ b/app-editors/xvile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/znotes/metadata.xml b/app-editors/znotes/metadata.xml
index 1fc9dad40de4..eeafdeadaffc 100644
--- a/app-editors/znotes/metadata.xml
+++ b/app-editors/znotes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">znotes</remote-id>
 		<remote-id type="github">proton/zNotes</remote-id>
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index a7b402869aaf..2456a4998cc4 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>tex</herd>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>
   AUCTeX is an extensible package for writing and formatting TeX files
   in GNU Emacs and XEmacs. It supports many different TeX macro packages,
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
index 13c0f1e7ba37..bed1925dc6ff 100644
--- a/app-emacs/cldoc/metadata.xml
+++ b/app-emacs/cldoc/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+  <email>common-lisp@gentoo.org</email>
+  <name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
   Show Common Lisp operators and variables information in echo area.
   cldoc.el has a database of parameters and results of Common Lisp's
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
index 7fb92b25f5a4..5040a8886ce7 100644
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index 400f45cc2bf2..b7e7a1eeef3e 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>eselect</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>eselect@gentoo.org</email>
+  <name>eselect configuration and management tool</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
index d999aca2da6e..9d114c30acf3 100644
--- a/app-emacs/ghc-mod/metadata.xml
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+</maintainer>
 <longdescription>
   This packages includes Elisp files and a Haskell command, "ghc-mod".
   "ghc*.el" enable completion of Haskell symbols on Emacs. Flymake is
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index c4a025804ec8..493d6df30e6a 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>chromium</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>chromium@gentoo.org</email>
+  <name>Chromium in Gentoo Project</name>
+</maintainer>
 <upstream>
   <remote-id type="github">google/styleguide</remote-id>
 </upstream>
diff --git a/app-emacs/imaxima/metadata.xml b/app-emacs/imaxima/metadata.xml
index dff6ceb4b947..1a7ea110cb71 100644
--- a/app-emacs/imaxima/metadata.xml
+++ b/app-emacs/imaxima/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Imaxima provides support for interacting with the computer algebra system
   Maxima in an Emacs buffer. Imaxima processes the output from Maxima with TeX
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index ba9dba3feeb2..a0bf777ce7ad 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>java</herd>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 <longdescription>
   The Java Development Environment for Emacs is a software package
   that interfaces Emacs to command-line Java development tools (for
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
index 202265529129..5040a8886ce7 100644
--- a/app-emacs/lookup/metadata.xml
+++ b/app-emacs/lookup/metadata.xml
@@ -5,5 +5,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>cjk</herd>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index 202265529129..5040a8886ce7 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -5,5 +5,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>cjk</herd>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index 4e09ad0e30fd..78964ec687f9 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <upstream>
   <remote-id type="sourceforge">navi2ch</remote-id>
 </upstream>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
index 9078b5ed03d6..42f6ade928f7 100644
--- a/app-emacs/nxml-libvirt-schemas/metadata.xml
+++ b/app-emacs/nxml-libvirt-schemas/metadata.xml
@@ -8,5 +8,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>virtualization</herd>
+<maintainer>
+  <email>virtualization@gentoo.org</email>
+  <name>Gentoo Virtualization Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index 987ffbd1b686..4f645e55309a 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 25d3fe951b7e..26e975a3a7c1 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <upstream>
   <remote-id type="github">pinard/Pymacs</remote-id>
 </upstream>
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
index fbb92e6910c1..9daa11a4ea20 100644
--- a/app-emacs/riece/metadata.xml
+++ b/app-emacs/riece/metadata.xml
@@ -5,5 +5,4 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 1cf8ad40d03d..863b99736534 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+  <email>common-lisp@gentoo.org</email>
+  <name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
   SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
   fresh, new Emacs mode for Common Lisp development inspired by existing
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index 0672c8815592..b463054f76d0 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <upstream>
   <remote-id type="sourceforge-jp">sumibi</remote-id>
 </upstream>
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 53adc5aad66b..1597a6098f54 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
 <longdescription>
   Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
   indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
index 3e2504b4bb23..adc3998abe76 100644
--- a/app-emacs/wanderlust/metadata.xml
+++ b/app-emacs/wanderlust/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>net-mail</herd>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <use>
   <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
 </use>
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index 51d2849fce16..8dccdd3f7db3 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <longdescription lang="en">
   YaTeX is an intelligent, acquisitive and integrated package which reduces
   your efforts of composing LaTeX source on Emacs. And yahtml is the honest
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
index 7fb92b25f5a4..5040a8886ce7 100644
--- a/app-emacs/yc/metadata.xml
+++ b/app-emacs/yc/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml
index 25667e2ea9cd..08cc3bde0365 100644
--- a/app-emulation/aqemu/metadata.xml
+++ b/app-emulation/aqemu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maksbotan@gentoo.org</email>
 		<description>Proxy maintainer (CC on bugs)</description>
@@ -10,6 +9,10 @@
 		<email>andreis.vinogradovs@gmail.com</email>
 		<description>Proxied maintainer (assign bugs)</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aqemu</remote-id>
 	</upstream>
diff --git a/app-emulation/armv8-fast-model/metadata.xml b/app-emulation/armv8-fast-model/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/app-emulation/armv8-fast-model/metadata.xml
+++ b/app-emulation/armv8-fast-model/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index 1c248771204b..a64bd15faabc 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
@@ -10,6 +9,10 @@
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Package provides configuration and customization of cloud instance.
   </longdescription>
diff --git a/app-emulation/coldfire/metadata.xml b/app-emulation/coldfire/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/app-emulation/coldfire/metadata.xml
+++ b/app-emulation/coldfire/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/crossover-office-bin/metadata.xml b/app-emulation/crossover-office-bin/metadata.xml
index 27f54c99739f..d1d911c9e685 100644
--- a/app-emulation/crossover-office-bin/metadata.xml
+++ b/app-emulation/crossover-office-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wine</herd>
+<maintainer>
+	<email>wine@gentoo.org</email>
+	<name>Wine</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/crossover-office-pro-bin/metadata.xml b/app-emulation/crossover-office-pro-bin/metadata.xml
index 27f54c99739f..d1d911c9e685 100644
--- a/app-emulation/crossover-office-pro-bin/metadata.xml
+++ b/app-emulation/crossover-office-pro-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wine</herd>
+<maintainer>
+	<email>wine@gentoo.org</email>
+	<name>Wine</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 907d5d1da2ee..19035c6934c7 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -8,7 +8,6 @@
 		scale, in production, on VMs, bare metal, OpenStack clusters, public
 		clouds and more.
 	</longdescription>
-	<herd>proxy-maintainers</herd>
 	<maintainer status="active">
 		<email>admwiggin@gmail.com</email>
 		<name>Tianon</name>
@@ -25,6 +24,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="aufs">
 			Enables dependencies for the "aufs" graph driver, including
diff --git a/app-emulation/edumips64/metadata.xml b/app-emulation/edumips64/metadata.xml
index 75e63da88fc1..74aceb425c89 100644
--- a/app-emulation/edumips64/metadata.xml
+++ b/app-emulation/edumips64/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
     <name>Fabio Erculiani</name>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">edumips64</remote-id>
   </upstream>
diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml
index b5eea7296dd7..07eecd588c11 100644
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
@@ -12,6 +11,10 @@
 		<description>Proxied Maintainer. Please assign on bugs.</description>
 		<name>José Manuel Ferrer Ortiz</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some
 		features, including logfiles.</flag>
diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index f7c150dc0efc..b70c23a46aad 100644
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jmfo1982@yahoo.es</email>
 		<description>Proxied Maintainer. Please assign on bugs.</description>
@@ -12,6 +11,10 @@
 		<name>Jesus Rivero</name>
 		<description>Proxy Maintainer. Please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-emulator</remote-id>
 	</upstream>
diff --git a/app-emulation/ganeti-htools/metadata.xml b/app-emulation/ganeti-htools/metadata.xml
index 02c3c44cf9a1..bb306a2977c1 100644
--- a/app-emulation/ganeti-htools/metadata.xml
+++ b/app-emulation/ganeti-htools/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription lang="en">
 	These are some simple cluster tools for fixing common allocation
 	problems on Ganeti 2.0 clusters.
diff --git a/app-emulation/ganeti-instance-debootstrap/metadata.xml b/app-emulation/ganeti-instance-debootstrap/metadata.xml
index 92e4e2a9c1ff..c521935c2199 100644
--- a/app-emulation/ganeti-instance-debootstrap/metadata.xml
+++ b/app-emulation/ganeti-instance-debootstrap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<longdescription lang="en">This is a guest OS definition for Ganeti (https://code.google.com/p/ganeti).
 	It will install a minimal version of Debian or Ubuntu via debootstrap (thus
 	it requires network access). This only works if you have a Debian-based node
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index dc0b0f994411..299c5dc1fee9 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	Ganeti is a cluster virtual server management software tool built on top of
 	existing virtualization technologies such as Xen or KVM and other Open
diff --git a/app-emulation/hercules/metadata.xml b/app-emulation/hercules/metadata.xml
index feb9acec70a3..aa33326f052b 100644
--- a/app-emulation/hercules/metadata.xml
+++ b/app-emulation/hercules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>s390</herd>
+<maintainer>
+	<email>s390@gentoo.org</email>
+	<name>Gentoo Linux s390 Development</name>
+</maintainer>
 <longdescription>
   Hercules is an emulator for the IBM System/360, System/370, ESA/390, and
   z/Architecture series of mainframe computer systems. It will run any
diff --git a/app-emulation/libcacard/metadata.xml b/app-emulation/libcacard/metadata.xml
index 6804d7590f41..2843a3bbd94c 100644
--- a/app-emulation/libcacard/metadata.xml
+++ b/app-emulation/libcacard/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>virtualization</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+<maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/libguestfs-appliance/metadata.xml b/app-emulation/libguestfs-appliance/metadata.xml
index 4b62b2824c99..36f7b7a43f8e 100644
--- a/app-emulation/libguestfs-appliance/metadata.xml
+++ b/app-emulation/libguestfs-appliance/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -15,4 +14,8 @@
 	<name>Richard Jones</name>
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index c9f268cb4b4b..6541c439d8fc 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -16,6 +15,11 @@
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
 
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+
 <longdescription>Libguestfs is a library and tool set for accessing and 
 modifying virtual machine (VM) disk images</longdescription>
 <use>
diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml
index c54cad01d6b3..23564a3a7821 100644
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
@@ -12,6 +11,10 @@
 		<description>Proxied Maintainer. Please CC on bugs.</description>
 		<name>José Manuel Ferrer Ortiz</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 libspectrum is a library designed to make the input and output of some ZX
 Spectrum emulator files slightly easier. It is intended to be usable on Unix
diff --git a/app-emulation/libvirt-glib/metadata.xml b/app-emulation/libvirt-glib/metadata.xml
index 670adf61506f..07ea6d67d210 100644
--- a/app-emulation/libvirt-glib/metadata.xml
+++ b/app-emulation/libvirt-glib/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
 	<email>tamiko@gentoo.org</email>
 	<name>Matthias Maier</name>
 	<description>Please CC me on bugs</description>
 </maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 7a316de694ad..7f9946bc4adf 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -10,7 +10,10 @@
 	<email>cardoe@gentoo.org</email>
 	<name>Doug Goldstein</name>
 </maintainer>
-<herd>virtualization</herd>
+<maintainer>
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
 <use>
 	<!-- Pool backend flags -->
 	<flag name="iscsi">
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index 536d8f3d85be..ea669bae4bef 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>virtualization</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
@@ -11,6 +10,10 @@
   <maintainer>
     <email>hwoarang@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag>
   </use>
diff --git a/app-emulation/open-vm-tools-kmod/metadata.xml b/app-emulation/open-vm-tools-kmod/metadata.xml
index 2560d635322b..ae17e23ac25a 100644
--- a/app-emulation/open-vm-tools-kmod/metadata.xml
+++ b/app-emulation/open-vm-tools-kmod/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription>
 		The Open Virtual Machine Tools (open-vm-tools) are the open source
 		implementation of VMware Tools. They are a set of guest operating system
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index 021bf9a90fc5..27b59f8636cf 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription>
 		The Open Virtual Machine Tools (open-vm-tools) are the open source
 		implementation of VMware Tools. They are a set of guest operating system
diff --git a/app-emulation/playonlinux/metadata.xml b/app-emulation/playonlinux/metadata.xml
index 39af67079cd2..673a5c975cc6 100644
--- a/app-emulation/playonlinux/metadata.xml
+++ b/app-emulation/playonlinux/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wine</herd>
 	<maintainer>
 		<email>np-hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
+	<maintainer>
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
 	<use>
 		<flag name="winbind">Enables support for the winbind auth daemon</flag>
 	</use>
diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml
index 4ad3c6023f85..1c76397baac5 100644
--- a/app-emulation/q4wine/metadata.xml
+++ b/app-emulation/q4wine/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="gnome">Use the gksu sudo GUI for managing the devices</flag>
 		<flag name="icoutils">Enable icoutils support</flag>
diff --git a/app-emulation/qemu-guest-agent/metadata.xml b/app-emulation/qemu-guest-agent/metadata.xml
index 7f49e1f062a1..b007046326a1 100644
--- a/app-emulation/qemu-guest-agent/metadata.xml
+++ b/app-emulation/qemu-guest-agent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qemu</herd>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index d282a753b64a..690bc49427fa 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qemu</herd>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
 	<use>
 		<flag name="accessibility">Adds support for braille displays using brltty</flag>
 		<flag name="aio">Enables support for Linux's Async IO</flag>
diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index 1adcc9617845..72d0d48b43ba 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex.buell@munted.eu</email>
 		<name>Alex Buell</name>
@@ -10,4 +9,8 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index 96baef6ac811..a1c9205e1c94 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ia64</herd>
+	<maintainer>
+		<email>ia64@gentoo.org</email>
+		<name>Gentoo Linux IA-64 Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ski</remote-id>
 	</upstream>
diff --git a/app-emulation/softgun/metadata.xml b/app-emulation/softgun/metadata.xml
index 3e94ca34282f..bb6a1c20c432 100644
--- a/app-emulation/softgun/metadata.xml
+++ b/app-emulation/softgun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>arm</herd>
+	<maintainer>
+		<email>arm@gentoo.org</email>
+		<name>Gentoo Linux ARM Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">softgun</remote-id>
 	</upstream>
diff --git a/app-emulation/spice-protocol/metadata.xml b/app-emulation/spice-protocol/metadata.xml
index 6804d7590f41..2843a3bbd94c 100644
--- a/app-emulation/spice-protocol/metadata.xml
+++ b/app-emulation/spice-protocol/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>virtualization</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+<maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/spice-vdagent/metadata.xml b/app-emulation/spice-vdagent/metadata.xml
index 7b4cb96eca68..78fec8e81118 100644
--- a/app-emulation/spice-vdagent/metadata.xml
+++ b/app-emulation/spice-vdagent/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> to determine the
 			master vdagentd in case of multiple running vdagentds (highly
diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml
index fc2293f7536a..34d049af360a 100644
--- a/app-emulation/spice/metadata.xml
+++ b/app-emulation/spice/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag>
 	</use>
diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/app-emulation/uade/metadata.xml
+++ b/app-emulation/uade/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index d6200239a00e..3a188037c441 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="virtualbox">
 			Use VirtualBox provider.
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index d1b9f8b0db3a..f180bc1d043a 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
 		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 1865234ab1fe..5079a28e6e2a 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>virtualization</herd>
+  <maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="policykit">
       Enables <pkg>sys-auth/polkit</pkg> authentication support,
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index d7b0ca72457d..84ab196bb15c 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="spice">Support connecting to SPICE-enabled virtual
 			machines.</flag>
diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index 313c1627f097..ba6b23526269 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+    	<email>vmware@gentoo.org</email>
+    	<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription>
 		VMware kernel modules.
 	</longdescription>
diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index 9be8d037b50c..3c746d3ec582 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<use>
 		<flag name="ovftool">Install OVF tool for importing and exporting appliance files</flag>
 		<flag name="vmware-tools">Install VMware Tools images</flag>
diff --git a/app-emulation/vmware-tools/metadata.xml b/app-emulation/vmware-tools/metadata.xml
index 672ebec01f3b..52f17ef0c5ef 100644
--- a/app-emulation/vmware-tools/metadata.xml
+++ b/app-emulation/vmware-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/vmware-vix/metadata.xml b/app-emulation/vmware-vix/metadata.xml
index bf1b34bea29b..3807f0268d81 100644
--- a/app-emulation/vmware-vix/metadata.xml
+++ b/app-emulation/vmware-vix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription>
 		The VIX API allows you to write programs and scripts that automate
 		virtual machine operations, as well as the guests within virtual
diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml
index f6f81f187905..09bbcc1e5946 100644
--- a/app-emulation/vmware-workstation/metadata.xml
+++ b/app-emulation/vmware-workstation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription>
 		VMWare Workstation is a virtual machine which can be used to install 
 		other operating systems in a virtual environment to run on top of Gentoo.
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index b81ce11ec0b1..504f0a50577e 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wine</herd>
+	<maintainer>
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
 	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
 
diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml
index 0c912e8caf8c..6a7cb4c8c651 100644
--- a/app-emulation/winetricks/metadata.xml
+++ b/app-emulation/winetricks/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wine</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
+	<maintainer>
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">winetricks</remote-id>
 		<remote-id type="github">Winetricks/winetricks</remote-id>
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
index 789adcec8fa5..25ea79cf7f77 100644
--- a/app-emulation/xe-guest-utilities/metadata.xml
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>openstack</herd>
-<herd>virtualization</herd>
-<herd>xen</herd>
 <maintainer>
 	<email>bugs@camisa.org</email>
 	<name>Christopher J. Camisa</name>
@@ -12,6 +9,18 @@
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>openstack@gentoo.org</email>
+	<name>Openstack</name>
+</maintainer>
+<maintainer>
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
+<maintainer>
+	<email>xen@gentoo.org</email>
+	<name>Gentoo Xen Project</name>
+</maintainer>
 <longdescription>XenServer Virtual Machine Tools</longdescription>
 <use>
 	<flag name="xenstore">Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools</flag>
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
index cc9d568a3360..403a8b6e328f 100644
--- a/app-emulation/xen-pvgrub/metadata.xml
+++ b/app-emulation/xen-pvgrub/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xen</herd>
+<maintainer>
+	<email>xen@gentoo.org</email>
+	<name>Gentoo Xen Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 97467e9828f7..c004e3fabf88 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>xen</herd>
+	<maintainer>
+		<email>xen@gentoo.org</email>
+		<name>Gentoo Xen Project</name>
+	</maintainer>
 	<use>
 		<flag name="api">Build the C libxenapi bindings</flag>
 		<flag name="flask">Enable the Flask XSM module from NSA</flag>
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index b36628ed8b4b..6aa3a0fc8247 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>xen</herd>
+	<maintainer>
+		<email>xen@gentoo.org</email>
+		<name>Gentoo Xen Project</name>
+	</maintainer>
 	<use>
 		<flag name="flask">Enable the Flask XSM module from NSA</flag>
 		<flag name="xsm">Enable the Xen Security Modules (XSM)</flag>
diff --git a/app-eselect/eselect-awk/metadata.xml b/app-eselect/eselect-awk/metadata.xml
index 6ce7863fe532..088db66d342a 100644
--- a/app-eselect/eselect-awk/metadata.xml
+++ b/app-eselect/eselect-awk/metadata.xml
@@ -5,5 +5,8 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-	<herd>base-system</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/app-eselect/eselect-blas/metadata.xml b/app-eselect/eselect-blas/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/app-eselect/eselect-blas/metadata.xml
+++ b/app-eselect/eselect-blas/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-cblas/metadata.xml b/app-eselect/eselect-cblas/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/app-eselect/eselect-cblas/metadata.xml
+++ b/app-eselect/eselect-cblas/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-cdparanoia/metadata.xml b/app-eselect/eselect-cdparanoia/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/app-eselect/eselect-cdparanoia/metadata.xml
+++ b/app-eselect/eselect-cdparanoia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-fontconfig/metadata.xml b/app-eselect/eselect-fontconfig/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/app-eselect/eselect-fontconfig/metadata.xml
+++ b/app-eselect/eselect-fontconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-gnat/metadata.xml b/app-eselect/eselect-gnat/metadata.xml
index 3a0ddbad4e34..6351c98cfadd 100644
--- a/app-eselect/eselect-gnat/metadata.xml
+++ b/app-eselect/eselect-gnat/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>The eselect module for the supported gnat compilers.</longdescription>
 </pkgmetadata>
diff --git a/app-eselect/eselect-gnome-shell-extensions/metadata.xml b/app-eselect/eselect-gnome-shell-extensions/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-eselect/eselect-gnome-shell-extensions/metadata.xml
+++ b/app-eselect/eselect-gnome-shell-extensions/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-infinality/metadata.xml b/app-eselect/eselect-infinality/metadata.xml
index c4a86d017be5..dcf984c9d2a2 100644
--- a/app-eselect/eselect-infinality/metadata.xml
+++ b/app-eselect/eselect-infinality/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yngwin/eselect-infinality</remote-id>
   </upstream>
diff --git a/app-eselect/eselect-java/metadata.xml b/app-eselect/eselect-java/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/app-eselect/eselect-java/metadata.xml
+++ b/app-eselect/eselect-java/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/app-eselect/eselect-lapack/metadata.xml b/app-eselect/eselect-lapack/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/app-eselect/eselect-lapack/metadata.xml
+++ b/app-eselect/eselect-lapack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-lcdfilter/metadata.xml b/app-eselect/eselect-lcdfilter/metadata.xml
index bb17f15c3812..c371cc0413f9 100644
--- a/app-eselect/eselect-lcdfilter/metadata.xml
+++ b/app-eselect/eselect-lcdfilter/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yngwin/eselect-lcdfilter</remote-id>
   </upstream>
diff --git a/app-eselect/eselect-maven/metadata.xml b/app-eselect/eselect-maven/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/app-eselect/eselect-maven/metadata.xml
+++ b/app-eselect/eselect-maven/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-mesa/metadata.xml b/app-eselect/eselect-mesa/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/app-eselect/eselect-mesa/metadata.xml
+++ b/app-eselect/eselect-mesa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-mpg123/metadata.xml b/app-eselect/eselect-mpg123/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/app-eselect/eselect-mpg123/metadata.xml
+++ b/app-eselect/eselect-mpg123/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-mpost/metadata.xml b/app-eselect/eselect-mpost/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-eselect/eselect-mpost/metadata.xml
+++ b/app-eselect/eselect-mpost/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-notify-send/metadata.xml b/app-eselect/eselect-notify-send/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/app-eselect/eselect-notify-send/metadata.xml
+++ b/app-eselect/eselect-notify-send/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/app-eselect/eselect-oodict/metadata.xml b/app-eselect/eselect-oodict/metadata.xml
index bd52955bcf2f..04dd41352e7c 100644
--- a/app-eselect/eselect-oodict/metadata.xml
+++ b/app-eselect/eselect-oodict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>
 		Manages configuration of dictionaries for OpenOffice.Org.
 	</longdescription>
diff --git a/app-eselect/eselect-opengl/metadata.xml b/app-eselect/eselect-opengl/metadata.xml
index 6b9cda09561b..ccaf6377889b 100644
--- a/app-eselect/eselect-opengl/metadata.xml
+++ b/app-eselect/eselect-opengl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <longdescription>Utility to switch opengl implementations between various providers.</longdescription>
 </pkgmetadata>
diff --git a/app-eselect/eselect-package-manager/metadata.xml b/app-eselect/eselect-package-manager/metadata.xml
index dc5dc4fc2cc8..c7b22287dea6 100644
--- a/app-eselect/eselect-package-manager/metadata.xml
+++ b/app-eselect/eselect-package-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>eselect</herd>
+<maintainer>
+	<email>eselect@gentoo.org</email>
+	<name>eselect configuration and management tool</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-pdftex/metadata.xml b/app-eselect/eselect-pdftex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-eselect/eselect-pdftex/metadata.xml
+++ b/app-eselect/eselect-pdftex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-php/metadata.xml b/app-eselect/eselect-php/metadata.xml
index 7623c8de68d1..480b04ca0b3d 100644
--- a/app-eselect/eselect-php/metadata.xml
+++ b/app-eselect/eselect-php/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">PHP eselect module
 	</longdescription>
 	<use>
diff --git a/app-eselect/eselect-pinentry/metadata.xml b/app-eselect/eselect-pinentry/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/app-eselect/eselect-pinentry/metadata.xml
+++ b/app-eselect/eselect-pinentry/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-postgresql/metadata.xml b/app-eselect/eselect-postgresql/metadata.xml
index e9b829d37be2..b9d4236b18db 100644
--- a/app-eselect/eselect-postgresql/metadata.xml
+++ b/app-eselect/eselect-postgresql/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
   <maintainer restrict="&gt;=app-eselect/eselect-postgresql-1.0.0">
 	<email>titanofold@gentoo.org</email>
 	<name>Aaron W. Swenson</name>
   </maintainer>
+<maintainer>
+  <email>pgsql-bugs@gentoo.org</email>
+  <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-python/metadata.xml b/app-eselect/eselect-python/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/app-eselect/eselect-python/metadata.xml
+++ b/app-eselect/eselect-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-qtgraphicssystem/metadata.xml b/app-eselect/eselect-qtgraphicssystem/metadata.xml
index e03ee137648c..b19ee7515c16 100644
--- a/app-eselect/eselect-qtgraphicssystem/metadata.xml
+++ b/app-eselect/eselect-qtgraphicssystem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gentoo/eselect-qtgraphicssystem</remote-id>
   </upstream>
diff --git a/app-eselect/eselect-rails/metadata.xml b/app-eselect/eselect-rails/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/app-eselect/eselect-rails/metadata.xml
+++ b/app-eselect/eselect-rails/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-renpy/metadata.xml b/app-eselect/eselect-renpy/metadata.xml
index ee67c3092f58..0ef28b12546e 100644
--- a/app-eselect/eselect-renpy/metadata.xml
+++ b/app-eselect/eselect-renpy/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-ruby/metadata.xml b/app-eselect/eselect-ruby/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/app-eselect/eselect-ruby/metadata.xml
+++ b/app-eselect/eselect-ruby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-scala/metadata.xml b/app-eselect/eselect-scala/metadata.xml
index b5357c259075..5bcb13a1bc18 100644
--- a/app-eselect/eselect-scala/metadata.xml
+++ b/app-eselect/eselect-scala/metadata.xml
@@ -4,5 +4,8 @@
 <maintainer>
   <email>gienah@gentoo.org</email>
 </maintainer>
-<herd>java</herd>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-timidity/metadata.xml b/app-eselect/eselect-timidity/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/app-eselect/eselect-timidity/metadata.xml
+++ b/app-eselect/eselect-timidity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-unison/metadata.xml b/app-eselect/eselect-unison/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/app-eselect/eselect-unison/metadata.xml
+++ b/app-eselect/eselect-unison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-vdr/metadata.xml b/app-eselect/eselect-vdr/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/app-eselect/eselect-vdr/metadata.xml
+++ b/app-eselect/eselect-vdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/app-eselect/eselect-vi/metadata.xml b/app-eselect/eselect-vi/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-eselect/eselect-vi/metadata.xml
+++ b/app-eselect/eselect-vi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-wxwidgets/metadata.xml b/app-eselect/eselect-wxwidgets/metadata.xml
index a191ef54b9b3..c03e05d18cbf 100644
--- a/app-eselect/eselect-wxwidgets/metadata.xml
+++ b/app-eselect/eselect-wxwidgets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/afflib/metadata.xml b/app-forensics/afflib/metadata.xml
index ded99876e3a6..b1ad293f697b 100644
--- a/app-forensics/afflib/metadata.xml
+++ b/app-forensics/afflib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <use>
     <flag name="fuse">Enable extra fuse thingies</flag>
     <flag name="qemu">Enable qemu stuff</flag>
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index 8acc034ea989..f8054df9ec16 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<use>
 		<flag name="prelink">Enable support for <pkg>sys-devel/prelink</pkg></flag>
 	</use>
diff --git a/app-forensics/air/metadata.xml b/app-forensics/air/metadata.xml
index 9f20c12db63e..520bb847010d 100644
--- a/app-forensics/air/metadata.xml
+++ b/app-forensics/air/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">air-imager</remote-id>
 	</upstream>
diff --git a/app-forensics/autopsy/metadata.xml b/app-forensics/autopsy/metadata.xml
index a0f79f2db3b1..01d68a6b5103 100644
--- a/app-forensics/autopsy/metadata.xml
+++ b/app-forensics/autopsy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">autopsy</remote-id>
 	</upstream>
diff --git a/app-forensics/chkrootkit/metadata.xml b/app-forensics/chkrootkit/metadata.xml
index 710ea088e6a5..3cb2e12ac4ed 100644
--- a/app-forensics/chkrootkit/metadata.xml
+++ b/app-forensics/chkrootkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<use>
 		<flag name="cron">Install cron script for weekly rootkit scans</flag>
 	</use>
diff --git a/app-forensics/cmospwd/metadata.xml b/app-forensics/cmospwd/metadata.xml
index f2f257b19a0a..e52b7b3ce216 100644
--- a/app-forensics/cmospwd/metadata.xml
+++ b/app-forensics/cmospwd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<longdescription>
 		CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
  
diff --git a/app-forensics/examiner/metadata.xml b/app-forensics/examiner/metadata.xml
index 2ff523b91b12..462277e24e09 100644
--- a/app-forensics/examiner/metadata.xml
+++ b/app-forensics/examiner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
+<maintainer>
+	<email>forensics@gentoo.org</email>
+	<name>Gentoo Forensics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/foremost/metadata.xml b/app-forensics/foremost/metadata.xml
index 588a10a90d9f..10426a25473f 100644
--- a/app-forensics/foremost/metadata.xml
+++ b/app-forensics/foremost/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
   <maintainer>
     <email>ikelos@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">foremost</remote-id>
   </upstream>
diff --git a/app-forensics/galleta/metadata.xml b/app-forensics/galleta/metadata.xml
index 259976d9a211..696c24c2d633 100644
--- a/app-forensics/galleta/metadata.xml
+++ b/app-forensics/galleta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">odessa</remote-id>
 	</upstream>
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
index dc79c997112f..a660514eaf37 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<use>
 		<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
 		<flag name="rawio">Enables raw IO handling</flag>
diff --git a/app-forensics/lynis/metadata.xml b/app-forensics/lynis/metadata.xml
index e6aa47785764..7adf90b20408 100644
--- a/app-forensics/lynis/metadata.xml
+++ b/app-forensics/lynis/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
 <maintainer>
 	<email>idl0r@gentoo.org</email>
 	<name>Christian Ruppert</name>
 </maintainer>
+<maintainer>
+	<email>forensics@gentoo.org</email>
+	<name>Gentoo Forensics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/mac-robber/metadata.xml b/app-forensics/mac-robber/metadata.xml
index 52de7337b30e..29fda4f6e582 100644
--- a/app-forensics/mac-robber/metadata.xml
+++ b/app-forensics/mac-robber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<longdescription>
 mac-robber is a digital forensics and incident response tool that collects data from allocated files in a mounted file system. 
 The data can be used by the mactime tool in The Sleuth Kit to make a timeline of file activity. The mac-robber tool is based on 
diff --git a/app-forensics/magicrescue/metadata.xml b/app-forensics/magicrescue/metadata.xml
index 551acf5d4f41..0a137c93251d 100644
--- a/app-forensics/magicrescue/metadata.xml
+++ b/app-forensics/magicrescue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
+<maintainer>
+	<email>forensics@gentoo.org</email>
+	<name>Gentoo Forensics Project</name>
+</maintainer>
 <longdescription>
 Magic Rescue scans a block device for file types it knows how to recover and calls an external program to extract them. It looks
 at "magic bytes" in file contents, so it can be used both as an undelete utility and for recovering a corrupted drive or
diff --git a/app-forensics/memdump/metadata.xml b/app-forensics/memdump/metadata.xml
index 2ff523b91b12..462277e24e09 100644
--- a/app-forensics/memdump/metadata.xml
+++ b/app-forensics/memdump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
+<maintainer>
+	<email>forensics@gentoo.org</email>
+	<name>Gentoo Forensics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml
index 2c055be2c4fe..411d19673429 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>clabbe.montjoie@gmail.com</email>
 <name>LABBE Corentin (Montjoie)</name>
 <description>Maintainer</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 <flag name="gconf">Build the gconf independant probes</flag>
 <flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag>
diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml
index c82cdda62c13..94c25fa71389 100644
--- a/app-forensics/ovaldi/metadata.xml
+++ b/app-forensics/ovaldi/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>clabbe.montjoie@gmail.com</email>
 		<name>LABBE Corentin</name>
 		<description>Upstream and Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="rpm">Enable the RPM probes</flag>
 	</use>
diff --git a/app-forensics/pasco/metadata.xml b/app-forensics/pasco/metadata.xml
index 259976d9a211..696c24c2d633 100644
--- a/app-forensics/pasco/metadata.xml
+++ b/app-forensics/pasco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">odessa</remote-id>
 	</upstream>
diff --git a/app-forensics/rdd/metadata.xml b/app-forensics/rdd/metadata.xml
index dd5f0a448a31..bf90f829c059 100644
--- a/app-forensics/rdd/metadata.xml
+++ b/app-forensics/rdd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
diff --git a/app-forensics/rifiuti/metadata.xml b/app-forensics/rifiuti/metadata.xml
index 259976d9a211..696c24c2d633 100644
--- a/app-forensics/rifiuti/metadata.xml
+++ b/app-forensics/rifiuti/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">odessa</remote-id>
 	</upstream>
diff --git a/app-forensics/rkhunter/metadata.xml b/app-forensics/rkhunter/metadata.xml
index c1740f780c19..88fd0934f745 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">rkhunter</remote-id>
   </upstream>
diff --git a/app-forensics/scalpel/metadata.xml b/app-forensics/scalpel/metadata.xml
index 4a106d1643b3..040bfdd2bc2d 100644
--- a/app-forensics/scalpel/metadata.xml
+++ b/app-forensics/scalpel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <longdescription lang="en">
     Scalpel is a fast file carver that reads a database of header and footer
     definitions and extracts matching files or data fragments from a set of image
diff --git a/app-forensics/sleuthkit/metadata.xml b/app-forensics/sleuthkit/metadata.xml
index bbbab40dda92..7b5182eed416 100644
--- a/app-forensics/sleuthkit/metadata.xml
+++ b/app-forensics/sleuthkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <use>
     <flag name="aff">Enable extra aff formats</flag>
     <flag name="ewf">Enable libewf support</flag>
diff --git a/app-forensics/volatility/metadata.xml b/app-forensics/volatility/metadata.xml
index 3c0e6747535a..a0712671e3af 100644
--- a/app-forensics/volatility/metadata.xml
+++ b/app-forensics/volatility/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/yasat/metadata.xml b/app-forensics/yasat/metadata.xml
index 21f80afe1716..a280b301c7c4 100644
--- a/app-forensics/yasat/metadata.xml
+++ b/app-forensics/yasat/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>clabbe.montjoie@gmail.com</email>
 		<name>LABBE Corentin</name>
 		<description>Upstream and Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yasat</remote-id>
 	</upstream>
diff --git a/app-i18n/anthy-ss/metadata.xml b/app-i18n/anthy-ss/metadata.xml
index 7deacf38f2b1..ca1729ff1c1e 100644
--- a/app-i18n/anthy-ss/metadata.xml
+++ b/app-i18n/anthy-ss/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription>
     Anthy is a free and secure Japanese kana-kanji server.  This ebuild
     includes cannadic as a server-side dictionary, so you don't need any
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 22231128a4f7..7f75d277547d 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription>
   Anthy is a free and secure Japanese kana-kanji server.  This ebuild includes
   cannadic as a server-side dictionary, so you don't need any extra package to
diff --git a/app-i18n/atokx3/metadata.xml b/app-i18n/atokx3/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/atokx3/metadata.xml
+++ b/app-i18n/atokx3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/bidiv/metadata.xml b/app-i18n/bidiv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/bidiv/metadata.xml
+++ b/app-i18n/bidiv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/canfep/metadata.xml
+++ b/app-i18n/canfep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
index 12ed83cf199d..2821b2ad9bb5 100644
--- a/app-i18n/canna/metadata.xml
+++ b/app-i18n/canna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">canna</remote-id>
 	</upstream>
diff --git a/app-i18n/dbskkd-cdb/metadata.xml b/app-i18n/dbskkd-cdb/metadata.xml
index de646be8897c..2434313df97a 100644
--- a/app-i18n/dbskkd-cdb/metadata.xml
+++ b/app-i18n/dbskkd-cdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">dbskkd-cdb</remote-id>
 	</upstream>
diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml
index 7e45291f8cbc..0a1461728075 100644
--- a/app-i18n/enca/metadata.xml
+++ b/app-i18n/enca/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>stasrtf@gmail.com</email>
 		<description>Proxy maintainer</description>
@@ -11,4 +10,8 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fbiterm/metadata.xml b/app-i18n/fbiterm/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/fbiterm/metadata.xml
+++ b/app-i18n/fbiterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-anthy/metadata.xml
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-chewing/metadata.xml
+++ b/app-i18n/fcitx-chewing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index 7cb952df2e6d..11c7c1d9d035 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">fcitx</remote-id>
 	</upstream>
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index 4484e0f7375b..0e11f9918824 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="gtk3">Use GTK+3 instead of 2</flag>
 	</use>
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index cd86b6ba3a6d..ea5158d7c21d 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="dictmanager">
       Enable dictionary manager. Requires <pkg>dev-qt/qtwebkit</pkg>.
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index 774e4f904369..427a8cf6a1f2 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
     <remote-id type="google-code">rimeime</remote-id>
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index 7cb952df2e6d..11c7c1d9d035 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">fcitx</remote-id>
 	</upstream>
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 9be9adb92d3a..4b305dda68bb 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="autostart">Enable xdg-compatible autostart of fcitx</flag>
     <flag name="enchant">Use <pkg>app-text/enchant</pkg> for text prediction</flag>
diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml
index 12bb1ff75af3..a6bd063e0fed 100644
--- a/app-i18n/freewnn/metadata.xml
+++ b/app-i18n/freewnn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">freewnn</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index 6b2f60169a00..6d0a711fb5fa 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The Anthy engine for IBus platform. It provides Japanese input method from
 libanthy.</longdescription>
 	<upstream>
diff --git a/app-i18n/ibus-cangjie/metadata.xml b/app-i18n/ibus-cangjie/metadata.xml
index 7a8c0e170875..e22367a90e8d 100644
--- a/app-i18n/ibus-cangjie/metadata.xml
+++ b/app-i18n/ibus-cangjie/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brendan@horan.hk</email>
     <name>Brendan Horan</name>
     <description>Proxy - Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Cangjians/ibus-cangjie</remote-id>
   </upstream>
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index 57657ad7a713..ac692ee44f06 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The Chewing engine for IBus platform. It provides Chinese input method from libchewing.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-fbterm/metadata.xml b/app-i18n/ibus-fbterm/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/ibus-fbterm/metadata.xml
+++ b/app-i18n/ibus-fbterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml
index b705e0c6c1e7..58cc2ce43979 100644
--- a/app-i18n/ibus-handwrite/metadata.xml
+++ b/app-i18n/ibus-handwrite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>cjk</herd>
+ <maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+ </maintainer>
 <use>
 	<flag name="zinnia">Build with <pkg>app-i18n/zinnia</pkg> engine.</flag>
 </use>
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index cfe537c73219..3001f2ef44c0 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index 04783a72c06d..dc134df6abef 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>ramsey.graham@ntlworld.com</email>
     <name>Graham Ramsey</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 		PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 	</longdescription>
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index a1663ffedc99..a9d69991fca2 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">
     M17N engine for IBus input platform. It allows input of many
     launguaes using the input table maps from m17n-db.
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index da4f439af94c..df95f788db05 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">
 PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 </longdescription>
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
index f605ee66a1f2..c2b014aa6155 100644
--- a/app-i18n/ibus-qt/metadata.xml
+++ b/app-i18n/ibus-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.</longdescription>
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
index 6cb5d5358eb7..a4441fbb0124 100644
--- a/app-i18n/ibus-rime/metadata.xml
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>chen.sst@gmail.com</email>
diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml
index 8603c718073c..62260fe1fc1a 100644
--- a/app-i18n/ibus-skk/metadata.xml
+++ b/app-i18n/ibus-skk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">
 A Japanese Simple Kana Kanji Input Method Engine for ibus.
 </longdescription>
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index d83314f5cabe..0e6751fd6cdc 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">sunpinyin</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml
index 90760e39892f..3c2a25dfcef8 100644
--- a/app-i18n/ibus-table-chinese/metadata.xml
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>cjk@gentoo.org</email>
   </maintainer>
diff --git a/app-i18n/ibus-table-code/metadata.xml b/app-i18n/ibus-table-code/metadata.xml
index 7995586c1fcb..cdeff6c59391 100644
--- a/app-i18n/ibus-table-code/metadata.xml
+++ b/app-i18n/ibus-table-code/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The package contains additional tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-table-cyrillic/metadata.xml b/app-i18n/ibus-table-cyrillic/metadata.xml
index c14f190bf59d..783b3cf63e63 100644
--- a/app-i18n/ibus-table-cyrillic/metadata.xml
+++ b/app-i18n/ibus-table-cyrillic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">ibus-table-cyrillic provides Transit, Russian Traditional, Yawerty input method on IBus-Table on IBus framework.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml
index 3dccf2765c10..4c94c2c350d8 100644
--- a/app-i18n/ibus-table-extraphrase/metadata.xml
+++ b/app-i18n/ibus-table-extraphrase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
 		<remote-id type="github">ibus/ibus</remote-id>
diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml
index d28bbfa34c71..19b01169e24e 100644
--- a/app-i18n/ibus-table-latin/metadata.xml
+++ b/app-i18n/ibus-table-latin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The Latin tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-table-tv/metadata.xml b/app-i18n/ibus-table-tv/metadata.xml
index 9cba36082eda..ab34f83b9735 100644
--- a/app-i18n/ibus-table-tv/metadata.xml
+++ b/app-i18n/ibus-table-tv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The Thai and Viqr (Vietnamese) tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index be7a0b838864..7502a5d80693 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">The package contains general Table engine for IBus platform.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
diff --git a/app-i18n/ibus-tutcode/metadata.xml b/app-i18n/ibus-tutcode/metadata.xml
index f18ac2c4cac6..75d58056f356 100644
--- a/app-i18n/ibus-tutcode/metadata.xml
+++ b/app-i18n/ibus-tutcode/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">deton/ibus-tutcode</remote-id>
   </upstream>
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 229a5e652cc5..0c550f48c115 100644
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">Ibus-unikey is a IM Engine for IBus
 Use for type Vietnamese
 Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85</longdescription>
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index b81da6fb8318..e51e345e7634 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">
 IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
 full featured and user friendly input method user interface. It also may help
diff --git a/app-i18n/im-canna/metadata.xml b/app-i18n/im-canna/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/im-canna/metadata.xml
+++ b/app-i18n/im-canna/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
index 77cea0e92b3b..b62c094e6a59 100644
--- a/app-i18n/im-chooser/metadata.xml
+++ b/app-i18n/im-chooser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <longdescription lang="en">
 IM Chooser is a GUI configuration tool for IMSettings to
 choose Input Method you want to use or disable it entirely
diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/im-freewnn/metadata.xml
+++ b/app-i18n/im-freewnn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/im-ja/metadata.xml b/app-i18n/im-ja/metadata.xml
index 2a36a4e74a73..fb30c2f0180a 100644
--- a/app-i18n/im-ja/metadata.xml
+++ b/app-i18n/im-ja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription>
   IM-JA is a Japanese input module for GTK+2. It supports kanji
   conversion using either the Canna or the (Free)Wnn kanji conversion
diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml
index b59e83555ce5..f314c915cbf6 100644
--- a/app-i18n/imhangul/metadata.xml
+++ b/app-i18n/imhangul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">imhangul</remote-id>
 	</upstream>
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index ac94bcf41af2..748eefc222c4 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="xfconf">Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
     <flag name="gconf">Enable GConf support</flag>
diff --git a/app-i18n/jfbterm/metadata.xml b/app-i18n/jfbterm/metadata.xml
index 8c34bf4bda67..649ea1968d7f 100644
--- a/app-i18n/jfbterm/metadata.xml
+++ b/app-i18n/jfbterm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">
 		JFBTERM/ME takes advantages of framebuffer device that is supported
 		since linux kernel 2.2.x (at least on ix86 architecture) and make it
diff --git a/app-i18n/kakasi/metadata.xml b/app-i18n/kakasi/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/kakasi/metadata.xml
+++ b/app-i18n/kakasi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/kanjipad/metadata.xml b/app-i18n/kanjipad/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/kanjipad/metadata.xml
+++ b/app-i18n/kanjipad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/kcc/metadata.xml b/app-i18n/kcc/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/kcc/metadata.xml
+++ b/app-i18n/kcc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/kcm-fcitx/metadata.xml
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
index c8d8de0993a3..d71db337b454 100644
--- a/app-i18n/kde-l10n-scripts/metadata.xml
+++ b/app-i18n/kde-l10n-scripts/metadata.xml
@@ -5,7 +5,10 @@
     <email>scarabeus@gentoo.org</email>
     <name>Tomáš Chvátal</name>
   </maintainer>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vpelcak/kde-scripts</remote-id>
   </upstream>
diff --git a/app-i18n/kimera/metadata.xml b/app-i18n/kimera/metadata.xml
index 62f7c5a60790..5aad9ee3304c 100644
--- a/app-i18n/kimera/metadata.xml
+++ b/app-i18n/kimera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription>
 Kimera is a Qt-based Japanese input method bridge.
 Currently it supports Canna and Anthy.
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/libcangjie/metadata.xml b/app-i18n/libcangjie/metadata.xml
index bab0395fc927..c7cd5b0b194b 100644
--- a/app-i18n/libcangjie/metadata.xml
+++ b/app-i18n/libcangjie/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brendan@horan.hk</email>
     <name>Brendan Horan</name>
     <description>Proxy - Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Cangjians/libcangjie</remote-id>
   </upstream>
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index 7264771eb8f1..d949bed8ddef 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libhangul</remote-id>
 	</upstream>
diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
index de5111485391..46d78da9dfee 100644
--- a/app-i18n/libpinyin/metadata.xml
+++ b/app-i18n/libpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">libpinyin/libpinyin</remote-id>
     <remote-id type="sourceforge">libpinyin</remote-id>
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
index 6cb5d5358eb7..a4441fbb0124 100644
--- a/app-i18n/librime/metadata.xml
+++ b/app-i18n/librime/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>chen.sst@gmail.com</email>
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
index 11924c6429bb..6725d601a740 100644
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
diff --git a/app-i18n/libtabe/metadata.xml b/app-i18n/libtabe/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/libtabe/metadata.xml
+++ b/app-i18n/libtabe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/libtomoe-gtk/metadata.xml b/app-i18n/libtomoe-gtk/metadata.xml
index 64244b7f75df..0811e3a7d25a 100644
--- a/app-i18n/libtomoe-gtk/metadata.xml
+++ b/app-i18n/libtomoe-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 	</use>
diff --git a/app-i18n/man-pages-de/metadata.xml b/app-i18n/man-pages-de/metadata.xml
index eb83bf818203..4e772814213a 100644
--- a/app-i18n/man-pages-de/metadata.xml
+++ b/app-i18n/man-pages-de/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>oehme.markus@gmx.de</email>
 		<name>Markus Oehme</name>
 		<description>Assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
index 325a8881bdfd..b1d70b2de339 100644
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>axelgenus@gmail.com</email>
 		<name>Alessandro Calorì</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>giulio@pluto.it</email>
diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml
index 26fa1a0c76e1..a8cdee33899c 100644
--- a/app-i18n/man-pages-ja/metadata.xml
+++ b/app-i18n/man-pages-ja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription>
     Japanese translation of portage/gentoolkit man pages are contributed by
     Gentoo Linux User Group Japan and maintained by that mailing list
diff --git a/app-i18n/man-pages-pl/metadata.xml b/app-i18n/man-pages-pl/metadata.xml
index 7466b20f1768..46989965291f 100644
--- a/app-i18n/man-pages-pl/metadata.xml
+++ b/app-i18n/man-pages-pl/metadata.xml
@@ -6,7 +6,10 @@
 		<name> Marcin Kowalski</name>
 		<description>Maintainer. Assign bugs on him</description>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">manpages-pl</remote-id>
 	</upstream>
diff --git a/app-i18n/mecab-skkserv/metadata.xml b/app-i18n/mecab-skkserv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/mecab-skkserv/metadata.xml
+++ b/app-i18n/mecab-skkserv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 6f9e8961bd0a..2638fdcb59de 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">
 Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Windows, Mac and Linux. This open-source project originates from Google Japanese Input.
 </longdescription>
diff --git a/app-i18n/multiskkserv/metadata.xml b/app-i18n/multiskkserv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/multiskkserv/metadata.xml
+++ b/app-i18n/multiskkserv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/nabi/metadata.xml
+++ b/app-i18n/nabi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml
index 22082c33e432..932f91e96bc1 100644
--- a/app-i18n/nkf/metadata.xml
+++ b/app-i18n/nkf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">nkf</remote-id>
 	</upstream>
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index 75a9129447b3..cf39a8a1d658 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">OpenCC is a library for converting characters and phrases between
 Traditional Chinese and Simplified Chinese.</longdescription>
 	<upstream>
diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml
index b679232046c0..ea7a12907807 100644
--- a/app-i18n/poedit/metadata.xml
+++ b/app-i18n/poedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vslavik/poedit</remote-id>
 		<remote-id type="sourceforge">poedit</remote-id>
diff --git a/app-i18n/pology/metadata.xml b/app-i18n/pology/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/app-i18n/pology/metadata.xml
+++ b/app-i18n/pology/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml
index 977e6e010cd0..aace4790b2ee 100644
--- a/app-i18n/pyzy/metadata.xml
+++ b/app-i18n/pyzy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
     <flag name="doc">Enable support for documents</flag>
diff --git a/app-i18n/qimhangul/metadata.xml b/app-i18n/qimhangul/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/qimhangul/metadata.xml
+++ b/app-i18n/qimhangul/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/qkc/metadata.xml b/app-i18n/qkc/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/qkc/metadata.xml
+++ b/app-i18n/qkc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
index 6cb5d5358eb7..a4441fbb0124 100644
--- a/app-i18n/rime-data/metadata.xml
+++ b/app-i18n/rime-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>chen.sst@gmail.com</email>
diff --git a/app-i18n/scim-anthy/metadata.xml b/app-i18n/scim-anthy/metadata.xml
index bd133e7d6277..437edd079422 100644
--- a/app-i18n/scim-anthy/metadata.xml
+++ b/app-i18n/scim-anthy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="kasumi">Use Anthy dictionary maintenance tool
     (<pkg>app-dicts/kasumi</pkg>)</flag>
diff --git a/app-i18n/scim-bridge/metadata.xml b/app-i18n/scim-bridge/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-bridge/metadata.xml
+++ b/app-i18n/scim-bridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-canna/metadata.xml b/app-i18n/scim-canna/metadata.xml
index 8c34088ee307..af9894ae884e 100644
--- a/app-i18n/scim-canna/metadata.xml
+++ b/app-i18n/scim-canna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">scim-imengine</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-hangul/metadata.xml b/app-i18n/scim-hangul/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-hangul/metadata.xml
+++ b/app-i18n/scim-hangul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-input-pad/metadata.xml b/app-i18n/scim-input-pad/metadata.xml
index ac9a0e51e32a..c374d7e87009 100644
--- a/app-i18n/scim-input-pad/metadata.xml
+++ b/app-i18n/scim-input-pad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="EN">
 		The Smart Common Input Method (SCIM) input pad is a tool used to
 		input special characters, in an easy way. You select the text
diff --git a/app-i18n/scim-m17n/metadata.xml b/app-i18n/scim-m17n/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-m17n/metadata.xml
+++ b/app-i18n/scim-m17n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-pinyin/metadata.xml b/app-i18n/scim-pinyin/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-pinyin/metadata.xml
+++ b/app-i18n/scim-pinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml
index 72cb5fb7ad3e..14336141993d 100644
--- a/app-i18n/scim-sayura/metadata.xml
+++ b/app-i18n/scim-sayura/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <longdescription lang="en">
 This package provides the Sayura Sinhala input method for SCIM.
 </longdescription>
diff --git a/app-i18n/scim-skk/metadata.xml b/app-i18n/scim-skk/metadata.xml
index 8c34088ee307..af9894ae884e 100644
--- a/app-i18n/scim-skk/metadata.xml
+++ b/app-i18n/scim-skk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">scim-imengine</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
index d83314f5cabe..0e6751fd6cdc 100644
--- a/app-i18n/scim-sunpinyin/metadata.xml
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">sunpinyin</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-tables/metadata.xml b/app-i18n/scim-tables/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-tables/metadata.xml
+++ b/app-i18n/scim-tables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-tomoe/metadata.xml b/app-i18n/scim-tomoe/metadata.xml
index 084e6cd5c686..16e14ab37e27 100644
--- a/app-i18n/scim-tomoe/metadata.xml
+++ b/app-i18n/scim-tomoe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 	</use>
diff --git a/app-i18n/scim-uim/metadata.xml b/app-i18n/scim-uim/metadata.xml
index 24424e8cb6de..2e7d3e028be0 100644
--- a/app-i18n/scim-uim/metadata.xml
+++ b/app-i18n/scim-uim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scim</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-wijesekera/metadata.xml b/app-i18n/scim-wijesekera/metadata.xml
index c3aeb5baf11d..69b535e3d09e 100644
--- a/app-i18n/scim-wijesekera/metadata.xml
+++ b/app-i18n/scim-wijesekera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sinhala</remote-id>
 	</upstream>
diff --git a/app-i18n/scim-wnn/metadata.xml b/app-i18n/scim-wnn/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/scim-wnn/metadata.xml
+++ b/app-i18n/scim-wnn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
index ac9610b941e2..36b10e61535a 100644
--- a/app-i18n/scim/metadata.xml
+++ b/app-i18n/scim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
 	</use>
diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/skk-jisyo/metadata.xml
+++ b/app-i18n/skk-jisyo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/skkfep/metadata.xml b/app-i18n/skkfep/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/skkfep/metadata.xml
+++ b/app-i18n/skkfep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/skkserv/metadata.xml
+++ b/app-i18n/skkserv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index adc59fd218e2..6298c9c64f47 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">sunpinyin</remote-id>
   </upstream>
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
index adc59fd218e2..6298c9c64f47 100644
--- a/app-i18n/sunpinyin/metadata.xml
+++ b/app-i18n/sunpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">sunpinyin</remote-id>
   </upstream>
diff --git a/app-i18n/tegaki-zinnia-japanese/metadata.xml b/app-i18n/tegaki-zinnia-japanese/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/tegaki-zinnia-japanese/metadata.xml
+++ b/app-i18n/tegaki-zinnia-japanese/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/tomoe/metadata.xml b/app-i18n/tomoe/metadata.xml
index af6df3615dc3..456de0c8f44d 100644
--- a/app-i18n/tomoe/metadata.xml
+++ b/app-i18n/tomoe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="hyperestraier">Enable support for
 		<pkg>app-text/hyperestraier</pkg></flag>
diff --git a/app-i18n/uim-tomoe-gtk/metadata.xml b/app-i18n/uim-tomoe-gtk/metadata.xml
index 3c3e3b94bf2a..8ef1107c8d21 100644
--- a/app-i18n/uim-tomoe-gtk/metadata.xml
+++ b/app-i18n/uim-tomoe-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tomoe</remote-id>
 	</upstream>
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index 43ecf63bb11a..32db09aa6313 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <longdescription lang="en">
   uim is a simple, secure and flexible input method library.  At the moment
   Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/app-i18n/unicode-data/metadata.xml
+++ b/app-i18n/unicode-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/x-unikey/metadata.xml b/app-i18n/x-unikey/metadata.xml
index c225088eb91e..f0711335fbe9 100644
--- a/app-i18n/x-unikey/metadata.xml
+++ b/app-i18n/x-unikey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">unikey</remote-id>
 	</upstream>
diff --git a/app-i18n/xcin/metadata.xml b/app-i18n/xcin/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-i18n/xcin/metadata.xml
+++ b/app-i18n/xcin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/xsim/metadata.xml b/app-i18n/xsim/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-i18n/xsim/metadata.xml
+++ b/app-i18n/xsim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
index adc59fd218e2..6298c9c64f47 100644
--- a/app-i18n/xsunpinyin/metadata.xml
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">sunpinyin</remote-id>
   </upstream>
diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
index a3280dbd685b..a8bd6ee20354 100644
--- a/app-i18n/xvnkb/metadata.xml
+++ b/app-i18n/xvnkb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">xvnkb</remote-id>
   </upstream>
diff --git a/app-i18n/zhcon/metadata.xml b/app-i18n/zhcon/metadata.xml
index 5f8bf1908043..7bb62ccd5b74 100644
--- a/app-i18n/zhcon/metadata.xml
+++ b/app-i18n/zhcon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription>zhcon is a Fast double-byte virtual console for
 Chinese/Japanese/Korean (CJK) running under GNU/Linux and FreeBSD.
 It adds the ability of displaying and inputting CJK double-byte
diff --git a/app-i18n/zinnia-tomoe/metadata.xml b/app-i18n/zinnia-tomoe/metadata.xml
index 500ba13f450c..f428567af6b0 100644
--- a/app-i18n/zinnia-tomoe/metadata.xml
+++ b/app-i18n/zinnia-tomoe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zinnia</remote-id>
 	</upstream>
diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml
index 500ba13f450c..f428567af6b0 100644
--- a/app-i18n/zinnia/metadata.xml
+++ b/app-i18n/zinnia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zinnia</remote-id>
 	</upstream>
diff --git a/app-laptop/configure-trackpoint/metadata.xml b/app-laptop/configure-trackpoint/metadata.xml
index 06d24143b235..a467e4862d0d 100644
--- a/app-laptop/configure-trackpoint/metadata.xml
+++ b/app-laptop/configure-trackpoint/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
@@ -12,6 +11,10 @@
 		<name>Markellos Orfanos</name>
 		<description>Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index bc07e19e061e..23f4f4d95a65 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>adi@adirat.com</email>
 		<name>Ioan-Adrian Ratiu</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">i8kutils</remote-id>
 	</upstream>
diff --git a/app-laptop/nvidiabl/metadata.xml b/app-laptop/nvidiabl/metadata.xml
index 4057bbed13e6..9bd2a005583a 100644
--- a/app-laptop/nvidiabl/metadata.xml
+++ b/app-laptop/nvidiabl/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoobugzilla@jeltef.nl</email>
 		<name>Jelte Fennema</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">guillaumezin/nvidiabl</remote-id>
 	</upstream>
diff --git a/app-laptop/pbbuttonsd/metadata.xml b/app-laptop/pbbuttonsd/metadata.xml
index 1a1b5460d183..57e759c1da9f 100644
--- a/app-laptop/pbbuttonsd/metadata.xml
+++ b/app-laptop/pbbuttonsd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<use>
 		<flag name="ibam">Enable support for Intelligent Battery Monitoring</flag>
 		<flag name="macbook">Enable support for the Macbook and Macbook Pro</flag>
diff --git a/app-laptop/powerprefs/metadata.xml b/app-laptop/powerprefs/metadata.xml
index 261472dfbb66..8390706cc7c3 100644
--- a/app-laptop/powerprefs/metadata.xml
+++ b/app-laptop/powerprefs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pbbuttons</remote-id>
 	</upstream>
diff --git a/app-laptop/samsung-tools/metadata.xml b/app-laptop/samsung-tools/metadata.xml
index 6ca6fbc9ae4e..2ffe42282643 100644
--- a/app-laptop/samsung-tools/metadata.xml
+++ b/app-laptop/samsung-tools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 		<description>Proxy maintainer for assignee of bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">samsung-tools</remote-id>
 	</upstream>
diff --git a/app-leechcraft/laretz/metadata.xml b/app-leechcraft/laretz/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/laretz/metadata.xml
+++ b/app-leechcraft/laretz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-advancednotifications/metadata.xml b/app-leechcraft/lc-advancednotifications/metadata.xml
index 62757b189362..1a6f589d3d16 100644
--- a/app-leechcraft/lc-advancednotifications/metadata.xml
+++ b/app-leechcraft/lc-advancednotifications/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<longdescription>Advanced Notifications module provides an extremely flexible and configurable
 		notifications framework for LeechCraft. More information is in the corresponding devel
 		digest: http://leechcraft.org/devel-digest-5.</longdescription> 
diff --git a/app-leechcraft/lc-aggregator/metadata.xml b/app-leechcraft/lc-aggregator/metadata.xml
index c33962165ff1..d482b621aed7 100644
--- a/app-leechcraft/lc-aggregator/metadata.xml
+++ b/app-leechcraft/lc-aggregator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<use>
 		<flag name="webaccess">Enables web interface submodule for Aggregator</flag>
 	</use>
diff --git a/app-leechcraft/lc-anhero/metadata.xml b/app-leechcraft/lc-anhero/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-anhero/metadata.xml
+++ b/app-leechcraft/lc-anhero/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-auscrie/metadata.xml b/app-leechcraft/lc-auscrie/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-auscrie/metadata.xml
+++ b/app-leechcraft/lc-auscrie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-azoth/metadata.xml b/app-leechcraft/lc-azoth/metadata.xml
index 5ee5f1b54811..28f2bc43c194 100644
--- a/app-leechcraft/lc-azoth/metadata.xml
+++ b/app-leechcraft/lc-azoth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <use>
 	<flag name="astrality">Build Astrality, support for protocols provided by Telepathy</flag>
 	<flag name="acetamide">Build Acetamide, the IRC protocol support</flag>
diff --git a/app-leechcraft/lc-bittorrent/metadata.xml b/app-leechcraft/lc-bittorrent/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-bittorrent/metadata.xml
+++ b/app-leechcraft/lc-bittorrent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-blasq/metadata.xml b/app-leechcraft/lc-blasq/metadata.xml
index fe5553e9b7e3..769eb8de4d3a 100644
--- a/app-leechcraft/lc-blasq/metadata.xml
+++ b/app-leechcraft/lc-blasq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <use>
 	<flag name="deathnote">Support LiveJournal FotoBilder service</flag>
 	<flag name="rappor">Support VKontakte service</flag>
diff --git a/app-leechcraft/lc-blogique/metadata.xml b/app-leechcraft/lc-blogique/metadata.xml
index 20ec9d3295b8..fc5bc74fa462 100644
--- a/app-leechcraft/lc-blogique/metadata.xml
+++ b/app-leechcraft/lc-blogique/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <use>
 	<flag name="metida">Support for the LiveJournal blogging platform</flag>
 	<flag name="hestia">Allows one to keep a local blog</flag>
diff --git a/app-leechcraft/lc-certmgr/metadata.xml b/app-leechcraft/lc-certmgr/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-certmgr/metadata.xml
+++ b/app-leechcraft/lc-certmgr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-core/metadata.xml b/app-leechcraft/lc-core/metadata.xml
index d5867f1989c8..72b9534b6d0d 100644
--- a/app-leechcraft/lc-core/metadata.xml
+++ b/app-leechcraft/lc-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<longdescription>Core of LeechCraft, the opensource modular network client providing a full-featured web browser, BitTorrent client and much more.</longdescription> 
 	<use>
 		<flag name="qwt">Support for QML plotting item through <pkg>x11-libs/qwt</pkg></flag>
diff --git a/app-leechcraft/lc-cpuload/metadata.xml b/app-leechcraft/lc-cpuload/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-cpuload/metadata.xml
+++ b/app-leechcraft/lc-cpuload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-cstp/metadata.xml b/app-leechcraft/lc-cstp/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/app-leechcraft/lc-cstp/metadata.xml
+++ b/app-leechcraft/lc-cstp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-dbusmanager/metadata.xml b/app-leechcraft/lc-dbusmanager/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-dbusmanager/metadata.xml
+++ b/app-leechcraft/lc-dbusmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-deadlyrics/metadata.xml b/app-leechcraft/lc-deadlyrics/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-deadlyrics/metadata.xml
+++ b/app-leechcraft/lc-deadlyrics/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-devmon/metadata.xml b/app-leechcraft/lc-devmon/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-devmon/metadata.xml
+++ b/app-leechcraft/lc-devmon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-dolozhee/metadata.xml b/app-leechcraft/lc-dolozhee/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-dolozhee/metadata.xml
+++ b/app-leechcraft/lc-dolozhee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-eleeminator/metadata.xml b/app-leechcraft/lc-eleeminator/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-eleeminator/metadata.xml
+++ b/app-leechcraft/lc-eleeminator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-fenet/metadata.xml b/app-leechcraft/lc-fenet/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-fenet/metadata.xml
+++ b/app-leechcraft/lc-fenet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-gacts/metadata.xml b/app-leechcraft/lc-gacts/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-gacts/metadata.xml
+++ b/app-leechcraft/lc-gacts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-glance/metadata.xml b/app-leechcraft/lc-glance/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-glance/metadata.xml
+++ b/app-leechcraft/lc-glance/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-gmailnotifier/metadata.xml b/app-leechcraft/lc-gmailnotifier/metadata.xml
index 61e4db644d5b..1b6bbe10924e 100644
--- a/app-leechcraft/lc-gmailnotifier/metadata.xml
+++ b/app-leechcraft/lc-gmailnotifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<use>
 		<flag name="quark">Pull in a plugin to show GMail Notifier's quark</flag>
 		<flag name="notify">Pull in a plugin to show notifications from GMail Notiifer</flag>
diff --git a/app-leechcraft/lc-historyholder/metadata.xml b/app-leechcraft/lc-historyholder/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-historyholder/metadata.xml
+++ b/app-leechcraft/lc-historyholder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-hotsensors/metadata.xml b/app-leechcraft/lc-hotsensors/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-hotsensors/metadata.xml
+++ b/app-leechcraft/lc-hotsensors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-hotstreams/metadata.xml b/app-leechcraft/lc-hotstreams/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/app-leechcraft/lc-hotstreams/metadata.xml
+++ b/app-leechcraft/lc-hotstreams/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-htthare/metadata.xml b/app-leechcraft/lc-htthare/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-htthare/metadata.xml
+++ b/app-leechcraft/lc-htthare/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-imgaste/metadata.xml b/app-leechcraft/lc-imgaste/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-imgaste/metadata.xml
+++ b/app-leechcraft/lc-imgaste/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-intermutko/metadata.xml b/app-leechcraft/lc-intermutko/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-intermutko/metadata.xml
+++ b/app-leechcraft/lc-intermutko/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-kbswitch/metadata.xml b/app-leechcraft/lc-kbswitch/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-kbswitch/metadata.xml
+++ b/app-leechcraft/lc-kbswitch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-kinotify/metadata.xml b/app-leechcraft/lc-kinotify/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-kinotify/metadata.xml
+++ b/app-leechcraft/lc-kinotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-knowhow/metadata.xml b/app-leechcraft/lc-knowhow/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-knowhow/metadata.xml
+++ b/app-leechcraft/lc-knowhow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-krigstask/metadata.xml b/app-leechcraft/lc-krigstask/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-krigstask/metadata.xml
+++ b/app-leechcraft/lc-krigstask/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-lackman/metadata.xml b/app-leechcraft/lc-lackman/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-lackman/metadata.xml
+++ b/app-leechcraft/lc-lackman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-lastfmscrobble/metadata.xml b/app-leechcraft/lc-lastfmscrobble/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-lastfmscrobble/metadata.xml
+++ b/app-leechcraft/lc-lastfmscrobble/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-laughty/metadata.xml b/app-leechcraft/lc-laughty/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-laughty/metadata.xml
+++ b/app-leechcraft/lc-laughty/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-launchy/metadata.xml b/app-leechcraft/lc-launchy/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/app-leechcraft/lc-launchy/metadata.xml
+++ b/app-leechcraft/lc-launchy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-lemon/metadata.xml b/app-leechcraft/lc-lemon/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-lemon/metadata.xml
+++ b/app-leechcraft/lc-lemon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-lhtr/metadata.xml b/app-leechcraft/lc-lhtr/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-lhtr/metadata.xml
+++ b/app-leechcraft/lc-lhtr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-liznoo/metadata.xml b/app-leechcraft/lc-liznoo/metadata.xml
index 27926b7a815c..2d06766b2910 100644
--- a/app-leechcraft/lc-liznoo/metadata.xml
+++ b/app-leechcraft/lc-liznoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<use>
 		<flag name="systemd">Pull in correct UPower dependencies for systemd and non-systemd users.</flag>
 	</use>
diff --git a/app-leechcraft/lc-lmp/metadata.xml b/app-leechcraft/lc-lmp/metadata.xml
index e080d2300e0a..620b104c5757 100644
--- a/app-leechcraft/lc-lmp/metadata.xml
+++ b/app-leechcraft/lc-lmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+	</maintainer>
 <use>
 	<flag name="fradj">Build FrAdj, the equalizer effect module</flag>
 	<flag name="graffiti">Build media tags editor plugin</flag>
diff --git a/app-leechcraft/lc-mellonetray/metadata.xml b/app-leechcraft/lc-mellonetray/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-mellonetray/metadata.xml
+++ b/app-leechcraft/lc-mellonetray/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-monocle/metadata.xml b/app-leechcraft/lc-monocle/metadata.xml
index 9ff1a0285cda..0125733336ea 100644
--- a/app-leechcraft/lc-monocle/metadata.xml
+++ b/app-leechcraft/lc-monocle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<use>
 		<flag name="fb2">Enable support for FictionBook format</flag>
 		<flag name="mobi">Enable support for MOBI format</flag>
diff --git a/app-leechcraft/lc-musiczombie/metadata.xml b/app-leechcraft/lc-musiczombie/metadata.xml
index 431b3d1b9eae..9e1784989591 100644
--- a/app-leechcraft/lc-musiczombie/metadata.xml
+++ b/app-leechcraft/lc-musiczombie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<use>
 		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
 	</use>
diff --git a/app-leechcraft/lc-nacheku/metadata.xml b/app-leechcraft/lc-nacheku/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-nacheku/metadata.xml
+++ b/app-leechcraft/lc-nacheku/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-netstoremanager/metadata.xml b/app-leechcraft/lc-netstoremanager/metadata.xml
index f688d8b901c4..a1c96097dec0 100644
--- a/app-leechcraft/lc-netstoremanager/metadata.xml
+++ b/app-leechcraft/lc-netstoremanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <use>
 	<flag name="googledrive">Support Google Drive storage backend</flag>
 	<flag name="yandexdisk">Support Yandex.Disk storage backend</flag>
diff --git a/app-leechcraft/lc-networkmonitor/metadata.xml b/app-leechcraft/lc-networkmonitor/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-networkmonitor/metadata.xml
+++ b/app-leechcraft/lc-networkmonitor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-newlife/metadata.xml b/app-leechcraft/lc-newlife/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-newlife/metadata.xml
+++ b/app-leechcraft/lc-newlife/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-ooronee/metadata.xml b/app-leechcraft/lc-ooronee/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-ooronee/metadata.xml
+++ b/app-leechcraft/lc-ooronee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-otlozhu/metadata.xml b/app-leechcraft/lc-otlozhu/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-otlozhu/metadata.xml
+++ b/app-leechcraft/lc-otlozhu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-pintab/metadata.xml b/app-leechcraft/lc-pintab/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-pintab/metadata.xml
+++ b/app-leechcraft/lc-pintab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-pogooglue/metadata.xml b/app-leechcraft/lc-pogooglue/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/app-leechcraft/lc-pogooglue/metadata.xml
+++ b/app-leechcraft/lc-pogooglue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-popishu/metadata.xml b/app-leechcraft/lc-popishu/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-popishu/metadata.xml
+++ b/app-leechcraft/lc-popishu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-poshuku/metadata.xml b/app-leechcraft/lc-poshuku/metadata.xml
index c98f7f93142f..ab4c50acf284 100644
--- a/app-leechcraft/lc-poshuku/metadata.xml
+++ b/app-leechcraft/lc-poshuku/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <use>
 	<flag name="autosearch">Provide automatic search suggestions for Poshuku.</flag>
 	<flag name="cleanweb">Build CleanWeb for ad blocking compatible with Firefox's AdBlock+.</flag>
diff --git a/app-leechcraft/lc-qrosp/metadata.xml b/app-leechcraft/lc-qrosp/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-qrosp/metadata.xml
+++ b/app-leechcraft/lc-qrosp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-rosenthal/metadata.xml b/app-leechcraft/lc-rosenthal/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/app-leechcraft/lc-rosenthal/metadata.xml
+++ b/app-leechcraft/lc-rosenthal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-sb2/metadata.xml b/app-leechcraft/lc-sb2/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-sb2/metadata.xml
+++ b/app-leechcraft/lc-sb2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-scroblibre/metadata.xml b/app-leechcraft/lc-scroblibre/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-scroblibre/metadata.xml
+++ b/app-leechcraft/lc-scroblibre/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-secman/metadata.xml b/app-leechcraft/lc-secman/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-secman/metadata.xml
+++ b/app-leechcraft/lc-secman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-seekthru/metadata.xml b/app-leechcraft/lc-seekthru/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-seekthru/metadata.xml
+++ b/app-leechcraft/lc-seekthru/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-summary/metadata.xml b/app-leechcraft/lc-summary/metadata.xml
index e0c0a196302d..e3abb72bc917 100644
--- a/app-leechcraft/lc-summary/metadata.xml
+++ b/app-leechcraft/lc-summary/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <longdescription>Summary which shows all the downloads, events and statuses in LeechCraft.</longdescription> 
 </pkgmetadata>
diff --git a/app-leechcraft/lc-sysnotify/metadata.xml b/app-leechcraft/lc-sysnotify/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-sysnotify/metadata.xml
+++ b/app-leechcraft/lc-sysnotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-tabsessmanager/metadata.xml b/app-leechcraft/lc-tabsessmanager/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-tabsessmanager/metadata.xml
+++ b/app-leechcraft/lc-tabsessmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-tabslist/metadata.xml b/app-leechcraft/lc-tabslist/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-tabslist/metadata.xml
+++ b/app-leechcraft/lc-tabslist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-touchstreams/metadata.xml b/app-leechcraft/lc-touchstreams/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-touchstreams/metadata.xml
+++ b/app-leechcraft/lc-touchstreams/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-tpi/metadata.xml b/app-leechcraft/lc-tpi/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-tpi/metadata.xml
+++ b/app-leechcraft/lc-tpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-vgrabber/metadata.xml b/app-leechcraft/lc-vgrabber/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-vgrabber/metadata.xml
+++ b/app-leechcraft/lc-vgrabber/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-vrooby/metadata.xml b/app-leechcraft/lc-vrooby/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-vrooby/metadata.xml
+++ b/app-leechcraft/lc-vrooby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-xproxy/metadata.xml b/app-leechcraft/lc-xproxy/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-xproxy/metadata.xml
+++ b/app-leechcraft/lc-xproxy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-xtazy/metadata.xml b/app-leechcraft/lc-xtazy/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/app-leechcraft/lc-xtazy/metadata.xml
+++ b/app-leechcraft/lc-xtazy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-leechcraft/lcpackgen/metadata.xml b/app-leechcraft/lcpackgen/metadata.xml
index fa39ac17d96d..afaefff74ed1 100644
--- a/app-leechcraft/lcpackgen/metadata.xml
+++ b/app-leechcraft/lcpackgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>leechcraft</herd>
+  <maintainer>
+    <email>leechcraft@gentoo.org</email>
+    <name>LeechCraft</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">0xd34df00d/lcpackgen</remote-id>
   </upstream>
diff --git a/app-leechcraft/leechcraft-meta/metadata.xml b/app-leechcraft/leechcraft-meta/metadata.xml
index d5d998d1b969..f1a798d01c7a 100644
--- a/app-leechcraft/leechcraft-meta/metadata.xml
+++ b/app-leechcraft/leechcraft-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<longdescription>LeechCraft full package including all official plugins which are considered to be useful.</longdescription> 
 	<use>
 		<flag name="de">Install components, that allow using Leechcraft as Desktop Environment</flag>
diff --git a/app-leechcraft/liblaretz/metadata.xml b/app-leechcraft/liblaretz/metadata.xml
index 2219e38d9f40..0bdf3c777484 100644
--- a/app-leechcraft/liblaretz/metadata.xml
+++ b/app-leechcraft/liblaretz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">0xd34df00d/laretz</remote-id>
 	</upstream>
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index e062d001b116..6d631a3d8f78 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>hendrik@consetetur.de</email>
 	<name>Hendrik v. Raven (lorem_ipsum)</name>
@@ -10,6 +9,10 @@
 	<email>xmw@gentoo.org</email>
 	<name>Michael Weber</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	abduco provides session management i.e. it allows programs to be run independently from its controlling terminal. That is programs can be detached - run in the background - and then later reattached. Together with dvtm it provides a simpler and cleaner alternative to tmux or screen.
 </longdescription>
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index d749e27f51b7..4089996a8aac 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>Abook is a text-based addressbook program designed to use with mutt mail client.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">abook</remote-id>
diff --git a/app-misc/activylircd/metadata.xml b/app-misc/activylircd/metadata.xml
index 332e9ad12d8a..cc1cf8eb4d1b 100644
--- a/app-misc/activylircd/metadata.xml
+++ b/app-misc/activylircd/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>vdr@helmutauer.de</email>
   <name>Helmut Auer</name>
   <description>Proxy maintaining through zzam</description>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/astrolog-ephemeris/metadata.xml b/app-misc/astrolog-ephemeris/metadata.xml
index ccfb996d72e6..8eaa54f33513 100644
--- a/app-misc/astrolog-ephemeris/metadata.xml
+++ b/app-misc/astrolog-ephemeris/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-
 <maintainer>
 	<email>george@gentoo.org</email>
 	<name>George Shapovalov</name>
@@ -12,4 +10,8 @@
 	</description>
 </maintainer>
 
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/banner/metadata.xml b/app-misc/banner/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/app-misc/banner/metadata.xml
+++ b/app-misc/banner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/beep/metadata.xml b/app-misc/beep/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/beep/metadata.xml
+++ b/app-misc/beep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/bfm/metadata.xml b/app-misc/bfm/metadata.xml
index 05f7df690ca1..dc71c9fa338d 100644
--- a/app-misc/bfm/metadata.xml
+++ b/app-misc/bfm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 	BFM, the Brutal File Manager is a combined file manager and first
diff --git a/app-misc/bfr/metadata.xml b/app-misc/bfr/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/bfr/metadata.xml
+++ b/app-misc/bfr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index 8a8cf37ba41f..af75837c8c64 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
 </use>
diff --git a/app-misc/binclock/metadata.xml b/app-misc/binclock/metadata.xml
index dbf8947073ac..e54c60ce3af9 100644
--- a/app-misc/binclock/metadata.xml
+++ b/app-misc/binclock/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription>binclock displays a binary clock in your terminal.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/birthday/metadata.xml b/app-misc/birthday/metadata.xml
index 66d5c0543734..c18d7dbe26c5 100644
--- a/app-misc/birthday/metadata.xml
+++ b/app-misc/birthday/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">birthday</remote-id>
 	</upstream>
diff --git a/app-misc/boxes/metadata.xml b/app-misc/boxes/metadata.xml
index 940c759eeb8f..45a036af24ca 100644
--- a/app-misc/boxes/metadata.xml
+++ b/app-misc/boxes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ascii-boxes/boxes</remote-id>
   </upstream>
diff --git a/app-misc/byobu/metadata.xml b/app-misc/byobu/metadata.xml
index 1c7747e40943..0c02297275d7 100644
--- a/app-misc/byobu/metadata.xml
+++ b/app-misc/byobu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription>
 Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
 It was originally designed to provide elegant enhancements to the otherwise
diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml
index 652357b5c427..b843c6c14b9e 100644
--- a/app-misc/c_rehash/metadata.xml
+++ b/app-misc/c_rehash/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index e6feee227865..a3377c56d17d 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <use>
   <flag name="cacert">
     Include root certs from CAcert (http://www.cacert.org/) and
diff --git a/app-misc/calendar/metadata.xml b/app-misc/calendar/metadata.xml
index a0c9932e6ed3..1651271178fd 100644
--- a/app-misc/calendar/metadata.xml
+++ b/app-misc/calendar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bsdcalendar</remote-id>
 	</upstream>
diff --git a/app-misc/cdargs/metadata.xml b/app-misc/cdargs/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/cdargs/metadata.xml
+++ b/app-misc/cdargs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
index d8aa7d5ac921..1b88be0ced18 100644
--- a/app-misc/chkcrontab/metadata.xml
+++ b/app-misc/chkcrontab/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lyda/chkcrontab</remote-id>
 	</upstream>
diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml
index 8dc8f03abd0a..27dd36968d66 100644
--- a/app-misc/ckermit/metadata.xml
+++ b/app-misc/ckermit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/color/metadata.xml b/app-misc/color/metadata.xml
index c1bead0461d4..4885f232b53e 100644
--- a/app-misc/color/metadata.xml
+++ b/app-misc/color/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Color is a nifty little utility that you can call from shell scripts,
 		that will let you easily use ANSI escape codes (for colors, bold,
diff --git a/app-misc/colordiff/metadata.xml b/app-misc/colordiff/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/colordiff/metadata.xml
+++ b/app-misc/colordiff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/countrycodes/metadata.xml b/app-misc/countrycodes/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/countrycodes/metadata.xml
+++ b/app-misc/countrycodes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/cw/metadata.xml b/app-misc/cw/metadata.xml
index ffe1cdfd6046..0a7f69a8c449 100644
--- a/app-misc/cw/metadata.xml
+++ b/app-misc/cw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cwrapper</remote-id>
 	</upstream>
diff --git a/app-misc/cwiid/metadata.xml b/app-misc/cwiid/metadata.xml
index a5f3f76b89bb..9ac23130119b 100644
--- a/app-misc/cwiid/metadata.xml
+++ b/app-misc/cwiid/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>lxnay@gentoo.org</email>
 	</maintainer>
@@ -10,4 +9,8 @@
 		<name>Marco Clocchiatti</name>
 	    <description>Proxied co-maintainer</description>
 	</maintainer>
+<maintainer>
+	    <email>proxy-maint@gentoo.org</email>
+	    <name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/delay/metadata.xml b/app-misc/delay/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/delay/metadata.xml
+++ b/app-misc/delay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/detachtty/metadata.xml b/app-misc/detachtty/metadata.xml
index 95138c2e6f6c..493811d3db20 100644
--- a/app-misc/detachtty/metadata.xml
+++ b/app-misc/detachtty/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>shell-tools@gentoo.org</email>
+	<name>Gentoo Shell Tools Project</name>
+</maintainer>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 detachtty is a utility that lets you run interactive programs non-interactively.
 Reattaching can be done locally or over the network.  detachtty is similar in
diff --git a/app-misc/detox/metadata.xml b/app-misc/detox/metadata.xml
index 73c014e4f0b3..07c66b8e1b74 100644
--- a/app-misc/detox/metadata.xml
+++ b/app-misc/detox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">detox</remote-id>
 	</upstream>
diff --git a/app-misc/devtodo/metadata.xml b/app-misc/devtodo/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/devtodo/metadata.xml
+++ b/app-misc/devtodo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/dtach/metadata.xml b/app-misc/dtach/metadata.xml
index 31d4e7b5558b..3e5418f5c5d8 100644
--- a/app-misc/dtach/metadata.xml
+++ b/app-misc/dtach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dtach</remote-id>
 	</upstream>
diff --git a/app-misc/editor-wrapper/metadata.xml b/app-misc/editor-wrapper/metadata.xml
index 83d335031da4..af8ca5386095 100644
--- a/app-misc/editor-wrapper/metadata.xml
+++ b/app-misc/editor-wrapper/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>emacs</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>emacs@gentoo.org</email>
+	<name>Gentoo Emacs project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/eid-viewer-bin/metadata.xml b/app-misc/eid-viewer-bin/metadata.xml
index 66cfa9108058..b787e2db1af6 100644
--- a/app-misc/eid-viewer-bin/metadata.xml
+++ b/app-misc/eid-viewer-bin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>vincent.hardy.be@gmail.com</email>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
 
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 896195d6d5ca..aca96b9724ff 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>erkiferenc@gmail.com</email>
     <name>Ferenc Erki</name>
     <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
index 07e1e7150826..5ce05de541eb 100644
--- a/app-misc/email2trac/metadata.xml
+++ b/app-misc/email2trac/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>lukas@dzunko.sk</email>
 		<name>Lukas Dzunko</name>
 	</maintainer>
+<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/emelfm2/metadata.xml b/app-misc/emelfm2/metadata.xml
index e1e6d97fc81e..e733650b5376 100644
--- a/app-misc/emelfm2/metadata.xml
+++ b/app-misc/emelfm2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use><flag name="ansi">Add support for ANSI escape sequences</flag></use>
   <use><flag name="gtk3">Use <pkg>x11-libs/gtk:3</pkg> instead of <pkg>x11-libs/gtk:2</pkg></flag></use>
 </pkgmetadata>
diff --git a/app-misc/fdupes/metadata.xml b/app-misc/fdupes/metadata.xml
index b33a33f26d14..4cc904461122 100644
--- a/app-misc/fdupes/metadata.xml
+++ b/app-misc/fdupes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">adrianlopezroche/fdupes</remote-id>
   </upstream>
diff --git a/app-misc/fdutils/metadata.xml b/app-misc/fdutils/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/app-misc/fdutils/metadata.xml
+++ b/app-misc/fdutils/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/app-misc/freemind/metadata.xml b/app-misc/freemind/metadata.xml
index 9ada244d0d9c..ca80e94847a9 100644
--- a/app-misc/freemind/metadata.xml
+++ b/app-misc/freemind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="groovy">Build plugin for scripting via Groovy</flag>
 		<flag name="latex">Build plugin for inserting mathematical formulas in LaTeX syntax</flag>
diff --git a/app-misc/fsniper/metadata.xml b/app-misc/fsniper/metadata.xml
index 12e19ee50e91..624b0cefa875 100644
--- a/app-misc/fsniper/metadata.xml
+++ b/app-misc/fsniper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">l3ib/fsniper</remote-id>
   </upstream>
diff --git a/app-misc/gcal/metadata.xml b/app-misc/gcal/metadata.xml
index d8de67ce3e0b..630d83f9dd92 100644
--- a/app-misc/gcal/metadata.xml
+++ b/app-misc/gcal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription>
   Gcal is a program similar the standard calendar programs BSD "cal" and
   "calendar". Gcal displays hybrid and proleptic Julian and Gregorian calendar
diff --git a/app-misc/gentoo/metadata.xml b/app-misc/gentoo/metadata.xml
index 2c6f3bff0351..56a06de1190d 100644
--- a/app-misc/gentoo/metadata.xml
+++ b/app-misc/gentoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gentoo</remote-id>
 	</upstream>
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 977a113098cf..c19ad9f5a7d2 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="geonames">Install geonames.org provider</flag>
     <flag name="gsmloc">Install GSM location provider</flag>
diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml
index f4618b6e7fe3..9f8ca40391a1 100644
--- a/app-misc/getopt/metadata.xml
+++ b/app-misc/getopt/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
-<herd>prefix</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
index 348778d43318..232223cc9b9a 100644
--- a/app-misc/gnote/metadata.xml
+++ b/app-misc/gnote/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tsuna/boost.m4</remote-id>
   </upstream>
diff --git a/app-misc/gnuit/metadata.xml b/app-misc/gnuit/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/gnuit/metadata.xml
+++ b/app-misc/gnuit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index 20b50d5355b8..bde960c03fe3 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>fabiano.francesconi@gmail.com</email>
 		<name>Fabiano Francesconi</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/app-misc/grc/metadata.xml b/app-misc/grc/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/grc/metadata.xml
+++ b/app-misc/grc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index 601749080185..bb630be7557e 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dabbott@gentoo.org</email>
 		<name>David Abbott</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/hatools/metadata.xml b/app-misc/hatools/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/hatools/metadata.xml
+++ b/app-misc/hatools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/hilite/metadata.xml b/app-misc/hilite/metadata.xml
index 4d9e7a6e0909..649774a0e374 100644
--- a/app-misc/hilite/metadata.xml
+++ b/app-misc/hilite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hilite</remote-id>
 	</upstream>
diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml
index 60c7f53239ef..c5570c3e872e 100644
--- a/app-misc/hivex/metadata.xml
+++ b/app-misc/hivex/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ifp-line/metadata.xml b/app-misc/ifp-line/metadata.xml
index 74257d7e3e82..35be62e6693a 100644
--- a/app-misc/ifp-line/metadata.xml
+++ b/app-misc/ifp-line/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ifp-driver</remote-id>
 	</upstream>
diff --git a/app-misc/iguanaIR/metadata.xml b/app-misc/iguanaIR/metadata.xml
index 7fe8613fea0f..4ba667b89e1f 100644
--- a/app-misc/iguanaIR/metadata.xml
+++ b/app-misc/iguanaIR/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>hd_brummy@gentoo.org</email>
 <name>Joerg Bornkessel</name>
diff --git a/app-misc/inputlircd/metadata.xml b/app-misc/inputlircd/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/app-misc/inputlircd/metadata.xml
+++ b/app-misc/inputlircd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index c6a2181d8d68..a4823db88147 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>mario.fetka@gmail.com</email>
 <name>Mario Fetka</name>
@@ -13,4 +12,8 @@
 <name>Joerg Bornkessel</name>
 <description>Proxying maintainer</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index 44fa8a3b7cb9..c3499819e17f 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mario.fetka@gmail.com</email>
 		<name>Mario Fetka</name>
@@ -12,6 +11,10 @@
 		<name>Joerg Bornkessel</name>
 		<description>Proxying maintainer</description>
 		</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="mono">Enable mono support</flag>
 	</use>
diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml
index 48f89fef7f38..61e4e6d92761 100644
--- a/app-misc/jail/metadata.xml
+++ b/app-misc/jail/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>spiculator@gmail.com</email>
 		<name>Sergey Redin</name>
 		<description>Maintainer, Assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">spiculator/jail</remote-id>
 		<bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
diff --git a/app-misc/jitac/metadata.xml b/app-misc/jitac/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/app-misc/jitac/metadata.xml
+++ b/app-misc/jitac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/jot/metadata.xml b/app-misc/jot/metadata.xml
index 8316cf847a61..68ba47ea8ff0 100644
--- a/app-misc/jot/metadata.xml
+++ b/app-misc/jot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">bsd-jot</remote-id>
 	</upstream>
diff --git a/app-misc/joymouse/metadata.xml b/app-misc/joymouse/metadata.xml
index 1ad1c0a5d386..1b7d6fe8e5d6 100644
--- a/app-misc/joymouse/metadata.xml
+++ b/app-misc/joymouse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">joymouse-linux</remote-id>
 	</upstream>
diff --git a/app-misc/kanatest/metadata.xml b/app-misc/kanatest/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-misc/kanatest/metadata.xml
+++ b/app-misc/kanatest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/lcd-stuff/metadata.xml b/app-misc/lcd-stuff/metadata.xml
index f49cd001cf3e..f78a107f56bc 100644
--- a/app-misc/lcd-stuff/metadata.xml
+++ b/app-misc/lcd-stuff/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>bernhard.walle@gmx.de</email>
 <name>Bernhard Walle</name>
 <description>Upstream maintainer wants to be CC'ed directly on bugs.</description>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
   lcd-stuff is a client for app-misc/lcdproc written in C. It features
   displaying of e-mail using POP3 and IMAP, mpd control, news items using RSS,
diff --git a/app-misc/leave/metadata.xml b/app-misc/leave/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/leave/metadata.xml
+++ b/app-misc/leave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ledit/metadata.xml b/app-misc/ledit/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/app-misc/ledit/metadata.xml
+++ b/app-misc/ledit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 199a453f60ec..b99f291ccb1c 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<use>
 		<flag name="hardware-carrier">The transmitter device generates its clock
     signal in hardware</flag>
diff --git a/app-misc/livecd-tools/metadata.xml b/app-misc/livecd-tools/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/app-misc/livecd-tools/metadata.xml
+++ b/app-misc/livecd-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/app-misc/logitech-applet/metadata.xml
+++ b/app-misc/logitech-applet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/lxsplit/metadata.xml b/app-misc/lxsplit/metadata.xml
index 25dad7549cd7..2d92d9415ec4 100644
--- a/app-misc/lxsplit/metadata.xml
+++ b/app-misc/lxsplit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lxsplit</remote-id>
 	</upstream>
diff --git a/app-misc/matew/metadata.xml b/app-misc/matew/metadata.xml
index ba7f23233247..d89712ea4c93 100644
--- a/app-misc/matew/metadata.xml
+++ b/app-misc/matew/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">matew</remote-id>
 	</upstream>
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 2045d54a3048..834579a868c6 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>wired@gentoo.org</email>
     <name>Alex Alexander</name>
@@ -14,6 +13,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
     <flag name="mclib">Compile and install the libmc.so shared library</flag>
diff --git a/app-misc/media-player-info/metadata.xml b/app-misc/media-player-info/metadata.xml
index 941d094fcec5..7588e7760aed 100644
--- a/app-misc/media-player-info/metadata.xml
+++ b/app-misc/media-player-info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
+<maintainer>
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/metromap/metadata.xml b/app-misc/metromap/metadata.xml
index 496cc906a4cf..3f45642c35ef 100644
--- a/app-misc/metromap/metadata.xml
+++ b/app-misc/metromap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
@@ -10,4 +9,8 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/mime-types/metadata.xml b/app-misc/mime-types/metadata.xml
index f93bc00f409c..47f7f8eb6cde 100644
--- a/app-misc/mime-types/metadata.xml
+++ b/app-misc/mime-types/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
 <maintainer>
   <email>djc@gentoo.org</email>
   <name>Dirkjan Ochtman</name>
 </maintainer>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/mmv/metadata.xml b/app-misc/mmv/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/mmv/metadata.xml
+++ b/app-misc/mmv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/mtail/metadata.xml b/app-misc/mtail/metadata.xml
index 36a21bace4d6..a30c07406705 100644
--- a/app-misc/mtail/metadata.xml
+++ b/app-misc/mtail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		mtail is a small tail workalike that performs output coloring using
 		ansi escape sequences (although the sequences are overridable, so you
diff --git a/app-misc/ondir/metadata.xml b/app-misc/ondir/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/ondir/metadata.xml
+++ b/app-misc/ondir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/oneko/metadata.xml b/app-misc/oneko/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/app-misc/oneko/metadata.xml
+++ b/app-misc/oneko/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/pip/metadata.xml b/app-misc/pip/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/pip/metadata.xml
+++ b/app-misc/pip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ps3pf_utils/metadata.xml b/app-misc/ps3pf_utils/metadata.xml
index f9a5b22fcbec..8278b9b25ff2 100644
--- a/app-misc/ps3pf_utils/metadata.xml
+++ b/app-misc/ps3pf_utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc64</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index bc5ec521530d..60fd80ada138 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
 	<email>chead@chead.ca</email>
 	<name>Christopher Head</name>	
 	<description>Proxy maintainer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     pwsafe is a commandline password database utility compatible with
     Counterpane's Password Safe. It is compatible with Counterpane Password
diff --git a/app-misc/realpath/metadata.xml b/app-misc/realpath/metadata.xml
index c0dd433566a9..8df698ec0e9b 100644
--- a/app-misc/realpath/metadata.xml
+++ b/app-misc/realpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription lang="en">
   The realpath utility finds the canonicalized absolute pathname of its
   arguments in a similar way to readlink -f.
diff --git a/app-misc/regionset/metadata.xml b/app-misc/regionset/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/app-misc/regionset/metadata.xml
+++ b/app-misc/regionset/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-misc/remind/metadata.xml b/app-misc/remind/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/app-misc/remind/metadata.xml
+++ b/app-misc/remind/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/reptyr/metadata.xml b/app-misc/reptyr/metadata.xml
index e24b4c3fe4b8..10142625e8a5 100644
--- a/app-misc/reptyr/metadata.xml
+++ b/app-misc/reptyr/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nelhage/reptyr</remote-id>
   </upstream>
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index 7d749dcbefb7..c5023017edb0 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>swegener@gentoo.org</email>
 		<description>primary maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription>randomize lines can be used to randomize the contents of text files or standard input.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/rlwrap/metadata.xml b/app-misc/rlwrap/metadata.xml
index 0c2b9b15728e..91ceadca3d82 100644
--- a/app-misc/rlwrap/metadata.xml
+++ b/app-misc/rlwrap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>common-lisp</herd>
+  <maintainer>
+    <email>common-lisp@gentoo.org</email>
+    <name>Gentoo Common Lisp Project</name>
+  </maintainer>
   <longdescription>
     rlwrap is a 'readline wrapper' that uses the GNU Readline library to
     allow the editing of keyboard input for any other command. Input
diff --git a/app-misc/roadnav/metadata.xml b/app-misc/roadnav/metadata.xml
index 29dde1bff37a..6ccfb9014476 100644
--- a/app-misc/roadnav/metadata.xml
+++ b/app-misc/roadnav/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andrew.cremins@gmail.com</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="festival">Enable support for
     <pkg>app-accessibility/festival</pkg></flag>
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 386e0d25ea97..9effdff5573d 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>ppurka@gmail.com</email>
 	<name>Punarbasu 'ppurka' Purkayastha</name>
@@ -12,6 +11,10 @@
 	<name>sitquietly</name>
 	<description>Co Maintainer, CC bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<maintainer status="active">
 		<email>talex5@gmail.com</email>
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index 87bfb0b9eb6b..65850952e642 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>swegener@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription>
 Screen is a full-screen window manager that multiplexes a physical terminal
 between several processes, typically interactive shells. Each virtual terminal
diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
index b614aabc0394..cad975906dea 100644
--- a/app-misc/screenie/metadata.xml
+++ b/app-misc/screenie/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>rgkmg25@gmail.com</email>
     <name>Robert Kowalski</name>
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Screenie is a small and lightweight GNU screen(1) frontend that is
     designed to be a session handler that simplifies the process of
diff --git a/app-misc/slashtime/metadata.xml b/app-misc/slashtime/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/app-misc/slashtime/metadata.xml
+++ b/app-misc/slashtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
index 7427fff80184..1a72108323d9 100644
--- a/app-misc/spacenavd/metadata.xml
+++ b/app-misc/spacenavd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>anthoine.bourgeois@gmail.com</email>
 		<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The spacenavd daemon can be used directly as a drop-in replacement
 		to the 3DxWare daemon. It can communicate with the official magellan
diff --git a/app-misc/splitvt/metadata.xml b/app-misc/splitvt/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/splitvt/metadata.xml
+++ b/app-misc/splitvt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/strigi/metadata.xml b/app-misc/strigi/metadata.xml
index ceb0f7756c4a..0070341ebded 100644
--- a/app-misc/strigi/metadata.xml
+++ b/app-misc/strigi/metadata.xml
@@ -6,5 +6,8 @@
 		<flag name="inotify">Enable support for inotify.</flag>
 		<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index 4aae21b6e0e2..5dbf8d6bff42 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>me@bearsh.org</email>
     <name>Martin Gysel</name>
     <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     An open source dive log program.
   </longdescription>
diff --git a/app-misc/supercat/metadata.xml b/app-misc/supercat/metadata.xml
index 80ac69d9c2f2..85e9d1a546fc 100644
--- a/app-misc/supercat/metadata.xml
+++ b/app-misc/supercat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
+<maintainer>
+	<email>shell-tools@gentoo.org</email>
+	<name>Gentoo Shell Tools Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/symlinks/metadata.xml b/app-misc/symlinks/metadata.xml
index 8cefae8361fc..737ee06a8b50 100644
--- a/app-misc/symlinks/metadata.xml
+++ b/app-misc/symlinks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Symlinks scans directories for symbolic links and lists them on stdout.
 		Each link is prefixed with a classification of relative, absolute,
diff --git a/app-misc/tasque/metadata.xml b/app-misc/tasque/metadata.xml
index 3c068913d449..65fcc9f5cf35 100644
--- a/app-misc/tasque/metadata.xml
+++ b/app-misc/tasque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<use>
 		<flag name="rememberthemilk">
 			Allows you to use http://www.rememberthemilk.com/ as your storage backend.
diff --git a/app-misc/tdl/metadata.xml b/app-misc/tdl/metadata.xml
index 26e00e65cfb9..5b3d42991374 100644
--- a/app-misc/tdl/metadata.xml
+++ b/app-misc/tdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		tdl is a command-line application for managing a list of outstanding
 		tasks that you have to do. It can organise tasks in a hierarchy, produce
diff --git a/app-misc/timestamp/metadata.xml b/app-misc/timestamp/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/timestamp/metadata.xml
+++ b/app-misc/timestamp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index e9b1261b1a95..c8b010cfbb81 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>wired@gentoo.org</email>
     <name>Alex Alexander</name>
   </maintainer>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription>
 		tmux is a "terminal multiplexer", it enables a number of terminals
 		(or windows) to be accessed and controlled from a single terminal.
diff --git a/app-misc/tomboy/metadata.xml b/app-misc/tomboy/metadata.xml
index d35e9300c540..b578be7f7b36 100644
--- a/app-misc/tomboy/metadata.xml
+++ b/app-misc/tomboy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/tpipe/metadata.xml b/app-misc/tpipe/metadata.xml
index 3fe269f0a5ae..b45914b6dea2 100644
--- a/app-misc/tpipe/metadata.xml
+++ b/app-misc/tpipe/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>shell-tools@gentoo.org</email>
+  <name>Gentoo Shell Tools Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 4772252bde28..162bb0be031b 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="cue">Enable cue sheet parsing</flag>
     <!-- 'firefox-bookmarks' instead of 'firefox' to prevent most users from
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
index eaee8326e08d..ab4d52b881b7 100644
--- a/app-misc/trash-cli/metadata.xml
+++ b/app-misc/trash-cli/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>alex_y_xu@yahoo.ca</email>
     <name>Alex Xu</name>
     <description>Proxied maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>sito@andreafrancia.it</email>
diff --git a/app-misc/unfoo/metadata.xml b/app-misc/unfoo/metadata.xml
index 01018901a9f6..5ee26fc68bf9 100644
--- a/app-misc/unfoo/metadata.xml
+++ b/app-misc/unfoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <use>
     <flag name="minimal">Do not install all support archive binaries</flag>
   </use>
diff --git a/app-misc/usbirboy/metadata.xml b/app-misc/usbirboy/metadata.xml
index d07e38bcb915..34cd99026cc7 100644
--- a/app-misc/usbirboy/metadata.xml
+++ b/app-misc/usbirboy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">usbirboy</remote-id>
 	</upstream>
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index d1a7b5241a38..4c6e8374d3a1 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
@@ -12,6 +11,10 @@
 <name>Kfir Lavi</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/app-misc/vcp/metadata.xml b/app-misc/vcp/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/vcp/metadata.xml
+++ b/app-misc/vcp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/vlock/metadata.xml b/app-misc/vlock/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-misc/vlock/metadata.xml
+++ b/app-misc/vlock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/vzstats/metadata.xml b/app-misc/vzstats/metadata.xml
index a9d54a531d50..ef4215a3c416 100644
--- a/app-misc/vzstats/metadata.xml
+++ b/app-misc/vzstats/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
 		<description>Primary maintainer, assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>kir@openvz.org</email>
diff --git a/app-misc/wcd/metadata.xml b/app-misc/wcd/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/wcd/metadata.xml
+++ b/app-misc/wcd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/when/metadata.xml b/app-misc/when/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-misc/when/metadata.xml
+++ b/app-misc/when/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
index 5e2b26791f50..872ae9ffc768 100644
--- a/app-misc/workrave/metadata.xml
+++ b/app-misc/workrave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="distribution">Enable networking. See
 	http://www.workrave.org/features/</flag>
diff --git a/app-misc/wyrd/metadata.xml b/app-misc/wyrd/metadata.xml
index 70a77c240afa..944233e46f10 100644
--- a/app-misc/wyrd/metadata.xml
+++ b/app-misc/wyrd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Wyrd is a text-based front-end to Remind, a sophisticated calendar and alarm
 		program. Remind's power lies in its programmability, and Wyrd does not hide this
diff --git a/app-misc/yworklog/metadata.xml b/app-misc/yworklog/metadata.xml
index d70174a2e003..f8a4e197b422 100644
--- a/app-misc/yworklog/metadata.xml
+++ b/app-misc/yworklog/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yac@gentoo.org</email>
     <name>Jan Matejka</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/app-misc/zisofs-tools/metadata.xml b/app-misc/zisofs-tools/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/app-misc/zisofs-tools/metadata.xml
+++ b/app-misc/zisofs-tools/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml b/app-mobilephone/gnome-phone-manager/metadata.xml
index 755902aa939e..0c3220bf6d48 100644
--- a/app-mobilephone/gnome-phone-manager/metadata.xml
+++ b/app-mobilephone/gnome-phone-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>Phone Manager is a program created to allow you to control aspects 
 of your mobile phone from your GNOME desktop.
 
diff --git a/app-mobilephone/lightblue/metadata.xml b/app-mobilephone/lightblue/metadata.xml
index 5660d9af5326..95c2e1cf0e26 100644
--- a/app-mobilephone/lightblue/metadata.xml
+++ b/app-mobilephone/lightblue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lightblue</remote-id>
 	</upstream>
diff --git a/app-mobilephone/qtadb/metadata.xml b/app-mobilephone/qtadb/metadata.xml
index c9ed59e50d27..f4cb77f6c566 100644
--- a/app-mobilephone/qtadb/metadata.xml
+++ b/app-mobilephone/qtadb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>opensource@andmarios.com</email>
 <name>Marios Andreopoulos</name>
@@ -12,4 +11,8 @@
 <name>Markos Chandras</name>
 <description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/abiword-docs/metadata.xml b/app-office/abiword-docs/metadata.xml
index 669f23da60ac..fe3dc94b2bcd 100644
--- a/app-office/abiword-docs/metadata.xml
+++ b/app-office/abiword-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index c13e2d98bf6c..f1e19390a7e4 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="collab">Enable collaborative editing plugin</flag>
 	<flag name="goffice">Enable goffice plugin</flag>
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-office/borg/metadata.xml b/app-office/borg/metadata.xml
index c5de5a643677..3518ce9a8fd5 100644
--- a/app-office/borg/metadata.xml
+++ b/app-office/borg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">borg-calendar</remote-id>
 	</upstream>
diff --git a/app-office/calligra-l10n/metadata.xml b/app-office/calligra-l10n/metadata.xml
index 8f56a0ca69db..55ec89dcf8a4 100644
--- a/app-office/calligra-l10n/metadata.xml
+++ b/app-office/calligra-l10n/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 2b3ff5ed653b..b3e8c1a17d21 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index a257c2310768..41fd03cd0f63 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
   Dia is a gtk+ based diagram creation program. It can be used to
   draw many different kinds of diagrams. It currently has special
diff --git a/app-office/dia2code/metadata.xml b/app-office/dia2code/metadata.xml
index 344ede1bdad6..3e8527b79bc9 100644
--- a/app-office/dia2code/metadata.xml
+++ b/app-office/dia2code/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dia2code</remote-id>
 	</upstream>
diff --git a/app-office/eqe/metadata.xml b/app-office/eqe/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-office/eqe/metadata.xml
+++ b/app-office/eqe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/glabels/metadata.xml b/app-office/glabels/metadata.xml
index 6cab71eddf79..16037625891e 100644
--- a/app-office/glabels/metadata.xml
+++ b/app-office/glabels/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
   gLabels is a program for creating labels and business cards for
   the GNOME desktop environment. It is designed to work with various
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index f089453f5023..a72eca09a4a7 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="chipcard">Enable support for chipcard reading and
 		processing.</flag>
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index 8f58012e6548..379a2acbe85c 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="libgda">Enable database support through
 		<pkg>gnome-extra/libgda</pkg>.</flag>
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index 927ccdcbd1bb..5d8e3ba6bff0 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>remi@gentoo.org</email>
 	</maintainer>
@@ -12,6 +10,14 @@
 		<description>Third party maintainer, through the gnome-office herd 
     as a proxy</description>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">grisbi</remote-id>
 	</upstream>
diff --git a/app-office/gtimelog/metadata.xml b/app-office/gtimelog/metadata.xml
index 9ffd1e3ec8f8..362638c5ba0b 100644
--- a/app-office/gtimelog/metadata.xml
+++ b/app-office/gtimelog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gtimelog</remote-id>
 	</upstream>
diff --git a/app-office/hourglass/metadata.xml b/app-office/hourglass/metadata.xml
index f1b964a74950..d056080d339b 100644
--- a/app-office/hourglass/metadata.xml
+++ b/app-office/hourglass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hourglass</remote-id>
 	</upstream>
diff --git a/app-office/impressive/metadata.xml b/app-office/impressive/metadata.xml
index 0321bffa6d51..aa93f0e9cef1 100644
--- a/app-office/impressive/metadata.xml
+++ b/app-office/impressive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">impressive</remote-id>
 	</upstream>
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 4563e6581382..0a69ddc8ae2c 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
diff --git a/app-office/kraft/metadata.xml b/app-office/kraft/metadata.xml
index 218d86983c07..3d6d1b5e9fa9 100644
--- a/app-office/kraft/metadata.xml
+++ b/app-office/kraft/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kraft</remote-id>
 	</upstream>
diff --git a/app-office/libalkimia/metadata.xml b/app-office/libalkimia/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/app-office/libalkimia/metadata.xml
+++ b/app-office/libalkimia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/libreoffice-bin-debug/metadata.xml b/app-office/libreoffice-bin-debug/metadata.xml
index 1cca59730e1c..d5d27745441f 100644
--- a/app-office/libreoffice-bin-debug/metadata.xml
+++ b/app-office/libreoffice-bin-debug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>LibreOffice is a free office suite.
 This is debug info for the binary version of Libreoffice. Use this if you don't want to wait for the source version to build, but still debug crashes etc</longdescription>
 </pkgmetadata>
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index 746a55799a0f..a45ed37c0c2f 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
 	<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+	<maintainer>
+<email>office@gentoo.org</email>
+<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>LibreOffice is a free office suite.
 This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.</longdescription>
 </pkgmetadata>
diff --git a/app-office/libreoffice-l10n/metadata.xml b/app-office/libreoffice-l10n/metadata.xml
index a1786408cf57..13536eb90ed9 100644
--- a/app-office/libreoffice-l10n/metadata.xml
+++ b/app-office/libreoffice-l10n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="offlinehelp">Install help files locally instead of using the LibreOffice Wiki</flag>
 		<flag name="linguas_ca_valencia">Catalan locale (Valencia)</flag>
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 4461ef6b90fc..6bc45ee454a3 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>office</herd>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <longdescription>LibreOffice is the successor of OpenOffice.org. 
 This ebuild allows you to compile it yourself. Unfortunately this 
 compilation can take up to a day depending on the speed of your 
diff --git a/app-office/lotus-notes/metadata.xml b/app-office/lotus-notes/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-office/lotus-notes/metadata.xml
+++ b/app-office/lotus-notes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index 0d64a133d29f..030d146e8ce3 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
-<herd>cjk</herd>
 <maintainer>
   <email>ps@twin.jikos.cz</email>
   <name>Pavel Sanda</name>
@@ -14,6 +11,18 @@
   <name>Alexis Ballier</name>
   <description>Proxy Maintainer, CC bugs</description>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <use>
   <flag name="docbook">Add support for docbook export</flag>
   <flag name="dia">Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
diff --git a/app-office/magicpoint/metadata.xml b/app-office/magicpoint/metadata.xml
index 042564f391bc..c69add79ce3b 100644
--- a/app-office/magicpoint/metadata.xml
+++ b/app-office/magicpoint/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>peter@stuge.se</email>
 		<name> Peter Stuger</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Magic Point is an X11 based presentation tool. It is designed to make
 		simple presentations easy while to make complicated presentations
diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index 0b894592894a..83ea9bb3cb09 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>chris.kerr@mykolab.ch</email>
     <name>Chris Kerr</name>
@@ -12,6 +11,10 @@
     <name>Sergey Popov</name>
     <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brianb/mdbtools</remote-id>
     <remote-id type="sourceforge">mdbtools</remote-id>
diff --git a/app-office/ooextras/metadata.xml b/app-office/ooextras/metadata.xml
index 7dd3b54df112..c68f405ab499 100644
--- a/app-office/ooextras/metadata.xml
+++ b/app-office/ooextras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>OOExtras is a set of community generated templates and sample files. For it to do anything useful, you also have to install one of the different flavours of OpenOffice.org that Gentoo provides</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ooextras</remote-id>
diff --git a/app-office/pinpoint/metadata.xml b/app-office/pinpoint/metadata.xml
index 64407e75421f..98f81c4327a2 100644
--- a/app-office/pinpoint/metadata.xml
+++ b/app-office/pinpoint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		Pinpoint is a simple presentation tool that hopes to avoid audience
 		death by bullet point and instead encourage presentations containing
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index 20d13ee7e217..f0f559a46623 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-office</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-office/pybliographer/metadata.xml b/app-office/pybliographer/metadata.xml
index 15047be8bef5..adf347cf02c9 100644
--- a/app-office/pybliographer/metadata.xml
+++ b/app-office/pybliographer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Pybliographer is a tool for managing bibliographic databases, with
   the following features:
diff --git a/app-office/qcharselect/metadata.xml b/app-office/qcharselect/metadata.xml
index 3b7d2294a6d3..fdfe9e152aa1 100644
--- a/app-office/qcharselect/metadata.xml
+++ b/app-office/qcharselect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qcharselect</remote-id>
 	</upstream>
diff --git a/app-office/rubrica/metadata.xml b/app-office/rubrica/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/app-office/rubrica/metadata.xml
+++ b/app-office/rubrica/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index c01facd90405..ff6cf27fd753 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 4febf40e24b2..a7bb83ce898d 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="crypt">Enable encryption using <pkg>dev-db/sqlcipher</pkg></flag>
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index 116f8418632e..8030077f4d6a 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="netpbm">Add support for <pkg>media-libs/netpbm</pkg></flag>
     <flag name="pdf">Add the experimental native pdf export</flag>
diff --git a/app-office/texmaker/metadata.xml b/app-office/texmaker/metadata.xml
index 173297b1afdf..0e398caf925a 100644
--- a/app-office/texmaker/metadata.xml
+++ b/app-office/texmaker/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
   <maintainer>
     <email>k_f@gentoo.org</email>
     <name>Kristian Fiskerstrand</name>
   </maintainer>
+<maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-office/texstudio/metadata.xml b/app-office/texstudio/metadata.xml
index b605075279dd..2131ab648683 100644
--- a/app-office/texstudio/metadata.xml
+++ b/app-office/texstudio/metadata.xml
@@ -5,7 +5,10 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<use>
 		<flag name="video">Use phonon for video embedding</flag>
 	</use>
diff --git a/app-office/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
index 0d2d972433d7..d3da362dddf2 100644
--- a/app-office/unoconv/metadata.xml
+++ b/app-office/unoconv/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>office</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dagwieers/unoconv</remote-id>
   </upstream>
diff --git a/app-officeext/barcode/metadata.xml b/app-officeext/barcode/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/barcode/metadata.xml
+++ b/app-officeext/barcode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/ct2n/metadata.xml b/app-officeext/ct2n/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/ct2n/metadata.xml
+++ b/app-officeext/ct2n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/dmaths/metadata.xml b/app-officeext/dmaths/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/dmaths/metadata.xml
+++ b/app-officeext/dmaths/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/languagetool/metadata.xml b/app-officeext/languagetool/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/languagetool/metadata.xml
+++ b/app-officeext/languagetool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/ooo2gd/metadata.xml b/app-officeext/ooo2gd/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/ooo2gd/metadata.xml
+++ b/app-officeext/ooo2gd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/ooofbtools/metadata.xml b/app-officeext/ooofbtools/metadata.xml
index b6c0809893ab..8e18782a7f7a 100644
--- a/app-officeext/ooofbtools/metadata.xml
+++ b/app-officeext/ooofbtools/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
 		<description>Proxied maintainer. Assign bugs on him</description>
 	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fbtools</remote-id>
 	</upstream>
diff --git a/app-officeext/sun-templates/metadata.xml b/app-officeext/sun-templates/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-officeext/sun-templates/metadata.xml
+++ b/app-officeext/sun-templates/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-officeext/texmaths/metadata.xml b/app-officeext/texmaths/metadata.xml
index 75a3bf6abddb..5aa14b8b68d6 100644
--- a/app-officeext/texmaths/metadata.xml
+++ b/app-officeext/texmaths/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">texmaths</remote-id>
 	</upstream>
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index a6931b40bf82..076be57ce2bc 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -5,7 +5,6 @@
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
-	<herd>pda</herd>
 	<longdescription lang="en">
 		Barry is a utility for synchronization, backup, restore,
 		program management, and charging of BlackBerry devices.
diff --git a/app-pda/coldsync/metadata.xml b/app-pda/coldsync/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/coldsync/metadata.xml
+++ b/app-pda/coldsync/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/dynamite/metadata.xml b/app-pda/dynamite/metadata.xml
index e64f97b63d75..b1704fba460b 100644
--- a/app-pda/dynamite/metadata.xml
+++ b/app-pda/dynamite/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pda</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
diff --git a/app-pda/fusepod/metadata.xml b/app-pda/fusepod/metadata.xml
index 30ba2a1c53fd..23a5f26f035e 100644
--- a/app-pda/fusepod/metadata.xml
+++ b/app-pda/fusepod/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<upstream>
 		<remote-id type="sourceforge">fusepod</remote-id>
 	</upstream>
diff --git a/app-pda/gnupod/metadata.xml b/app-pda/gnupod/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/gnupod/metadata.xml
+++ b/app-pda/gnupod/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
index cb7708a4a1eb..bf968968240e 100644
--- a/app-pda/gtkpod/metadata.xml
+++ b/app-pda/gtkpod/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<use>
 		<flag name="clutter">Enable clutter support for displaying coverart</flag>
 		<flag name="webkit">Enable webkit support for finding coverart</flag>
diff --git a/app-pda/ideviceinstaller/metadata.xml b/app-pda/ideviceinstaller/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/ideviceinstaller/metadata.xml
+++ b/app-pda/ideviceinstaller/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml
index c21e5dabbb40..097975e3adc2 100644
--- a/app-pda/ifuse/metadata.xml
+++ b/app-pda/ifuse/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/jpilot-backup/metadata.xml b/app-pda/jpilot-backup/metadata.xml
index c21e5dabbb40..097975e3adc2 100644
--- a/app-pda/jpilot-backup/metadata.xml
+++ b/app-pda/jpilot-backup/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/jpilot-mail/metadata.xml b/app-pda/jpilot-mail/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/jpilot-mail/metadata.xml
+++ b/app-pda/jpilot-mail/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/jpilot-plucker/metadata.xml b/app-pda/jpilot-plucker/metadata.xml
index c21e5dabbb40..097975e3adc2 100644
--- a/app-pda/jpilot-plucker/metadata.xml
+++ b/app-pda/jpilot-plucker/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/jpilot-syncmal/metadata.xml b/app-pda/jpilot-syncmal/metadata.xml
index c21e5dabbb40..097975e3adc2 100644
--- a/app-pda/jpilot-syncmal/metadata.xml
+++ b/app-pda/jpilot-syncmal/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/jpilot/metadata.xml b/app-pda/jpilot/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/jpilot/metadata.xml
+++ b/app-pda/jpilot/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/libimobiledevice/metadata.xml b/app-pda/libimobiledevice/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/libimobiledevice/metadata.xml
+++ b/app-pda/libimobiledevice/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/libplist/metadata.xml b/app-pda/libplist/metadata.xml
index c21e5dabbb40..097975e3adc2 100644
--- a/app-pda/libplist/metadata.xml
+++ b/app-pda/libplist/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/libusbmuxd/metadata.xml b/app-pda/libusbmuxd/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/libusbmuxd/metadata.xml
+++ b/app-pda/libusbmuxd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/orange/metadata.xml b/app-pda/orange/metadata.xml
index b5cb338a8f87..da10555ddd36 100644
--- a/app-pda/orange/metadata.xml
+++ b/app-pda/orange/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<longdescription>
     Orange is a tool and library for squeezing out juicy installable Microsoft
     Cabinet Files from self-extracting installers for Microsoft Windows
diff --git a/app-pda/p3nfs/metadata.xml b/app-pda/p3nfs/metadata.xml
index d076de9dd32d..6d7d003ea9dc 100644
--- a/app-pda/p3nfs/metadata.xml
+++ b/app-pda/p3nfs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-pda/pilot-link/metadata.xml b/app-pda/pilot-link/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/pilot-link/metadata.xml
+++ b/app-pda/pilot-link/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/synce-core/metadata.xml b/app-pda/synce-core/metadata.xml
index ba58102c22c2..5cc3b241b374 100644
--- a/app-pda/synce-core/metadata.xml
+++ b/app-pda/synce-core/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<upstream>
 		<remote-id type="sourceforge">synce</remote-id>
 	</upstream>
diff --git a/app-pda/synce-sync-engine/metadata.xml b/app-pda/synce-sync-engine/metadata.xml
index ba58102c22c2..5cc3b241b374 100644
--- a/app-pda/synce-sync-engine/metadata.xml
+++ b/app-pda/synce-sync-engine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<upstream>
 		<remote-id type="sourceforge">synce</remote-id>
 	</upstream>
diff --git a/app-pda/usbmuxd/metadata.xml b/app-pda/usbmuxd/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/app-pda/usbmuxd/metadata.xml
+++ b/app-pda/usbmuxd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
index be71b71476c4..ab827fb9fbfc 100644
--- a/app-portage/deltup/metadata.xml
+++ b/app-portage/deltup/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>Ameretat.Reith@gmail.com</email>
     <name>Ameretat 'reith' Reith</name>
     <description>Primary Maintainer, Assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jjwhitney/Deltup</remote-id>
     <remote-id type="sourceforge">deltup</remote-id>
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
index 584ce61c0c44..6b09fadba8d5 100644
--- a/app-portage/eclass-manpages/metadata.xml
+++ b/app-portage/eclass-manpages/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 9d4aeae6f1b0..582e60407a41 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
@@ -14,6 +13,10 @@
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
     <flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
index f23267d7a058..f9d0c9d105ac 100644
--- a/app-portage/elogv/metadata.xml
+++ b/app-portage/elogv/metadata.xml
@@ -9,7 +9,10 @@
     <email>sping@gentoo.org</email>
     <name>Sebastian Pipping</name>
   </maintainer>
-  <herd>tools-portage</herd>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gentoo/elogv</remote-id>
   </upstream>
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
index 9a39c39cdb18..51857b31b424 100644
--- a/app-portage/elogviewer/metadata.xml
+++ b/app-portage/elogviewer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>fuzzyray@gentoo.org</email>
 		<name>Paul Varner</name>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elogviewer</remote-id>
 	</upstream>
diff --git a/app-portage/epm/metadata.xml b/app-portage/epm/metadata.xml
index 29a0e89cb376..7e49fa6c3d56 100644
--- a/app-portage/epm/metadata.xml
+++ b/app-portage/epm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gentoo@weilbacher.org</email>
     <name>Peter Weilbacher</name>
@@ -11,6 +10,10 @@
     <email>fuzzyray@gentoo.org</email>
     <description>Proxy committer, CC bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fuzzyray/epm</remote-id>
   </upstream>
diff --git a/app-portage/esearch/metadata.xml b/app-portage/esearch/metadata.xml
index 953e5243999c..175538e48e89 100644
--- a/app-portage/esearch/metadata.xml
+++ b/app-portage/esearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tools-portage</herd>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fuzzyray/esearch</remote-id>
   </upstream>
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
index b475efa0bdea..09c35ae7717e 100644
--- a/app-portage/etc-proposals/metadata.xml
+++ b/app-portage/etc-proposals/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">etc-proposals.berlios</remote-id>
 	</upstream>
diff --git a/app-portage/euses/metadata.xml b/app-portage/euses/metadata.xml
index 0b3d691dc329..0920c6ffec98 100644
--- a/app-portage/euses/metadata.xml
+++ b/app-portage/euses/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tools-portage</herd>
 <maintainer>
 	<email>jer@gentoo.org</email>
 	<name>Jeroen Roovers</name>
 </maintainer>
+<maintainer>
+	<email>tools-portage@gentoo.org</email>
+	<name>Gentoo Portage tools team</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-portage/fquery/metadata.xml b/app-portage/fquery/metadata.xml
index f8069e8c576b..e1d9b6917685 100644
--- a/app-portage/fquery/metadata.xml
+++ b/app-portage/fquery/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/app-portage/g-cpan/metadata.xml b/app-portage/g-cpan/metadata.xml
index 056ad389507d..36e5c8d05707 100644
--- a/app-portage/g-cpan/metadata.xml
+++ b/app-portage/g-cpan/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index e274a6c4c8a2..c9ad833aa9e1 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>rafaelmartins@gentoo.org</email>
     <name>Rafael G. Martins</name>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
         g-octave is a tool that generates and installs ebuilds for Octave-Forge
         packages "on-the-fly" to Gentoo Linux, using Portage. It's capable to
diff --git a/app-portage/genlop/metadata.xml b/app-portage/genlop/metadata.xml
index f82c90f1e8c4..3962de96546c 100644
--- a/app-portage/genlop/metadata.xml
+++ b/app-portage/genlop/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
-	<herd>perl</herd>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
index 625509fbfad5..a59525e6b4c3 100644
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ b/app-portage/gentoolkit-dev/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tools-portage</herd>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <longdescription>
 		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
 	</longdescription>
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
index 26a333ce8632..a5327be44ada 100644
--- a/app-portage/gentoolkit/metadata.xml
+++ b/app-portage/gentoolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tools-portage</herd>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <longdescription>
 Gentoolkit is a collection of useful adminstration scripts particular to
 the Gentoo Linux distribution. It contains rough drafts and
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
index 1f987434f823..33cb77575aa1 100644
--- a/app-portage/getdelta/metadata.xml
+++ b/app-portage/getdelta/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
@@ -10,4 +9,8 @@
     <email>nlissne@linux01.gwdg.de</email>
     <name>Nicolai Lissner</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
index 39d9baaf7e8d..5632707abd4f 100644
--- a/app-portage/gpytage/metadata.xml
+++ b/app-portage/gpytage/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/kuroo4/metadata.xml b/app-portage/kuroo4/metadata.xml
index ce405f1b6efe..3372e6ba3f40 100644
--- a/app-portage/kuroo4/metadata.xml
+++ b/app-portage/kuroo4/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
-	<herd>proxy-maintainers</herd>
-	<herd>kde</herd>
 	<longdescription lang="en">Graphical Portage frontend based on KDE4/Qt4</longdescription>
 	<maintainer>
 		<email>galiven@users.sourceforge.net</email>
 		<name>Andrew Schenck</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kuroo</remote-id>
 	</upstream>
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index 27be816ae8b8..c7c98f43c109 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
@@ -10,6 +9,10 @@
 		<email>twitch153@gentoo.org</email>
 		<name>Devan Franchini</name>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
 		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
diff --git a/app-portage/mirrorselect/metadata.xml b/app-portage/mirrorselect/metadata.xml
index 413349cad7cb..13fb8e6cdba0 100644
--- a/app-portage/mirrorselect/metadata.xml
+++ b/app-portage/mirrorselect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<longdescription lang="en">
 		This utility is used to select the fastest mirror (distfiles) and
 		provide a nicer front-end for mirror selection
diff --git a/app-portage/perl-info/metadata.xml b/app-portage/perl-info/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/app-portage/perl-info/metadata.xml
+++ b/app-portage/perl-info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
index 7b77e0fe7005..74dd112cf918 100644
--- a/app-portage/porthole/metadata.xml
+++ b/app-portage/porthole/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">porthole</remote-id>
 	</upstream>
diff --git a/app-portage/pqlop/metadata.xml b/app-portage/pqlop/metadata.xml
index eaa80b067831..5e849f55fb2c 100644
--- a/app-portage/pqlop/metadata.xml
+++ b/app-portage/pqlop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lk4d4math@gmail.com</email>
     <name>Alexandr Morozov</name>
@@ -11,6 +10,10 @@
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">LK4D4/pqlop</remote-id>
   </upstream>
diff --git a/app-portage/prefix-chain-setup/metadata.xml b/app-portage/prefix-chain-setup/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/app-portage/prefix-chain-setup/metadata.xml
+++ b/app-portage/prefix-chain-setup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
index c65e3908712f..1a29b2d80b5a 100644
--- a/app-portage/ufed/metadata.xml
+++ b/app-portage/ufed/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>yamakuzure@gmx.net</email>
 		<name>Sven Eden</name>
@@ -11,4 +10,8 @@
 		<email>fuzzyray@gentoo.org</email>
 		<description>Proxy committer, CC bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 3b6711241595..12406d266d6f 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
 <maintainer>
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
 </maintainer>
+<maintainer>
+	<email>shell-tools@gentoo.org</email>
+	<name>Gentoo Shell Tools Project</name>
+</maintainer>
 <longdescription>
   Since v2.04, bash has allowed you to intelligently program and extend its
   standard completion behavior to achieve complex command lines with just a
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index a35daa8bc6d8..1dcaaef97e30 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <use>
   <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
     used in restricted environments such as honeypots</flag>
diff --git a/app-shells/bashdb/metadata.xml b/app-shells/bashdb/metadata.xml
index cd565ccf05d4..2d59bec34fa7 100644
--- a/app-shells/bashdb/metadata.xml
+++ b/app-shells/bashdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bashdb</remote-id>
 	</upstream>
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index 54de097c10aa..3c9a5032f8bb 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
 	</upstream>
diff --git a/app-shells/dsh/metadata.xml b/app-shells/dsh/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/app-shells/dsh/metadata.xml
+++ b/app-shells/dsh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-shells/gentoo-bashcomp/metadata.xml b/app-shells/gentoo-bashcomp/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-shells/gentoo-bashcomp/metadata.xml
+++ b/app-shells/gentoo-bashcomp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/hstr/metadata.xml b/app-shells/hstr/metadata.xml
index d96b6993b806..841839c88ab1 100644
--- a/app-shells/hstr/metadata.xml
+++ b/app-shells/hstr/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">dvorka/hstr</remote-id>
 	</upstream>
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 519354940f17..eef19fd3a3da 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">losalamos/MPI-Bash</remote-id>
   </upstream>
diff --git a/app-shells/pdsh/metadata.xml b/app-shells/pdsh/metadata.xml
index a2891d928476..1d65aa27b25c 100644
--- a/app-shells/pdsh/metadata.xml
+++ b/app-shells/pdsh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 Pdsh is a high-performance, parallel remote shell utility. It has built-in,
 thread-safe clients for Berkeley and Kerberos V4 rsh, and can call SSH
diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
index 904fe4e422c6..7c9a1dcc313b 100644
--- a/app-shells/push/metadata.xml
+++ b/app-shells/push/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
@@ -11,6 +10,10 @@
     <email>axs@gentoo.org</email>
     <description>Proxy committer, CC bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>martin@mvath.de</email>
diff --git a/app-shells/rc/metadata.xml b/app-shells/rc/metadata.xml
index bee9f9ae6f02..aff39ca735f4 100644
--- a/app-shells/rc/metadata.xml
+++ b/app-shells/rc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-shells/scsh-install-lib/metadata.xml b/app-shells/scsh-install-lib/metadata.xml
index 5a56f6e7a85a..ab856c5af1f0 100644
--- a/app-shells/scsh-install-lib/metadata.xml
+++ b/app-shells/scsh-install-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+  <email>scheme@gentoo.org</email>
+  <name>Gentoo Scheme Project</name>
+</maintainer>
 <use>
   <flag name="scsh">Use a non-FHS directory layout</flag>
 </use>
diff --git a/app-shells/scsh/metadata.xml b/app-shells/scsh/metadata.xml
index 6b82e4519c9d..93ab0784d915 100644
--- a/app-shells/scsh/metadata.xml
+++ b/app-shells/scsh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription>
 Scsh has two main components: a process notation for running programs
 and setting up pipelines and redirections, and a complete syscall
diff --git a/app-shells/smrsh/metadata.xml b/app-shells/smrsh/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/app-shells/smrsh/metadata.xml
+++ b/app-shells/smrsh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index c050a28d58f9..01872ccf67c9 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/acroread/metadata.xml b/app-text/acroread/metadata.xml
index a799f700d3b0..4620cd7d0bec 100644
--- a/app-text/acroread/metadata.xml
+++ b/app-text/acroread/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 <use>
 	<flag name="html">HTML support and help reading capability (only for x86).</flag>
 </use>
diff --git a/app-text/active-dvi/metadata.xml b/app-text/active-dvi/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/active-dvi/metadata.xml
+++ b/app-text/active-dvi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-text/agrep/metadata.xml
+++ b/app-text/agrep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml
index 70f95901f8de..99abbffa2861 100644
--- a/app-text/aiksaurus/metadata.xml
+++ b/app-text/aiksaurus/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mg_gentoo@yahoo.com</email>
 		<name>Mark Gilbert</name>
 		<description>Third-party maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aiksaurus</remote-id>
 	</upstream>
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index aaaf98dcc446..b037ee73fc56 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 		<name>Fabian Groffen</name>
@@ -11,6 +10,10 @@
 		<name>LABBE Corentin (Montjoie)</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
 	</upstream>
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 65b9a64fce6b..2e57b8c15725 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>marcec@gmx.de</email>
 		<name>Marc Joliet</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="highlight">Enable source code highlighting</flag>
 	</use>
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index 2cfa7063165c..531e4546cdce 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>elizabeth@interlinked.me</email>
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 57e299e777c3..0660b01d6baa 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mate</herd>
+	<maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="caja">Enable property page extension in 
 			<pkg>mate-base/mate-file-manager</pkg></flag>
diff --git a/app-text/bibclean/metadata.xml b/app-text/bibclean/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/bibclean/metadata.xml
+++ b/app-text/bibclean/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index 9d025d57a4a1..587618a123dd 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>theology</herd>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
 	<longdescription>
 BibleTime is a Bible study application for Linux. It is based on the 
 K Desktop Environment and uses the SWORD programming library to work 
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
index 3786591536b4..3ea9b6db54c8 100644
--- a/app-text/bibus/metadata.xml
+++ b/app-text/bibus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bibus-biblio</remote-id>
 	</upstream>
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/app-text/bibutils/metadata.xml
+++ b/app-text/bibutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/bogosort/metadata.xml b/app-text/bogosort/metadata.xml
index 190b1c47c939..d13e124cb0c7 100644
--- a/app-text/bogosort/metadata.xml
+++ b/app-text/bogosort/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription lang="en">
 		The bogosort will sort a file in a similar way to sort(1), but using
 		the bogosort algorithm rather than the conventional qsort. The tool
diff --git a/app-text/c2ps/metadata.xml b/app-text/c2ps/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/app-text/c2ps/metadata.xml
+++ b/app-text/c2ps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
index 0452c21ae39c..a2abd80daf91 100644
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>webmaster@molspaces.com</bugs-to>
 	</upstream>
diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml
index 92a7b59f3647..ca749c5ff990 100644
--- a/app-text/chasen/metadata.xml
+++ b/app-text/chasen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">chasen-legacy</remote-id>
 	</upstream>
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index aef01fc3d591..c746f2860f8d 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 83e476cf4da9..e4cacc3562fc 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription lang="en">
 		CRF++ is a simple, customizable, and open source implementation
 		of Conditional Random Fields (CRFs) for segmenting/labeling
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index 60f90ea435e9..2ca549fe7d81 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>steev@gentoo.org</email>
     <name>Steev Klimaszewski</name>
@@ -14,6 +12,14 @@
     <description>Consider him the user-maintainer of this package, and please
   CC him on bug reports (if he's not the reporter).</description>
   </maintainer>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="mew">Add support for using the mewdecode mime decoder
     (<pkg>app-emacs/mew</pkg>)</flag>
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index bcd97db18036..fef8a746158b 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>yaleks@gmail.com</email>
 		<name>Aleksandr Yakimov</name>
@@ -10,6 +9,10 @@
 		<email>rich0@gentoo.org</email>
 		<name>Richard Freeman</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cuneiform is an multi-language OCR system.
 	</longdescription>
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 83266c0907a3..65c2fee21dd9 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>zoltan@sinustrom.info</email>
         <name>Zoltan Puskas</name>
         <description>Proxied maintainer. Assign bugs to him.</description>
     </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <longdescription>
                dbaltex is an opensource DocBook to LaTeX publishing software 
                that originally started as DB2LaTeX clone, but now is more
diff --git a/app-text/delta/metadata.xml b/app-text/delta/metadata.xml
index b3b3c56d65a2..dcdba3203b8b 100644
--- a/app-text/delta/metadata.xml
+++ b/app-text/delta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<longdescription>
 		Delta assists you in minimizing "interesting" files
 		subject to a test of their interestingness. A common such situation
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 237f17d365d1..95cb6f2a9d25 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
@@ -10,6 +9,10 @@
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		GNU diction and style are free implementations of old standard unix
 		commands, that are not available on many modern systems, because they
diff --git a/app-text/djview/metadata.xml b/app-text/djview/metadata.xml
index d15d5065b155..e92753839260 100644
--- a/app-text/djview/metadata.xml
+++ b/app-text/djview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">djvu</remote-id>
 	</upstream>
diff --git a/app-text/djvu/metadata.xml b/app-text/djvu/metadata.xml
index b485c3124aa0..a38d6186c111 100644
--- a/app-text/djvu/metadata.xml
+++ b/app-text/djvu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<longdescription>
 DjVu is a web-centric format and software platform for distributing documents
 and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
diff --git a/app-text/dos2unix/metadata.xml b/app-text/dos2unix/metadata.xml
index 60f3692a5779..7744d6af5c3d 100644
--- a/app-text/dos2unix/metadata.xml
+++ b/app-text/dos2unix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dos2unix</remote-id>
 	</upstream>
diff --git a/app-text/dvibook/metadata.xml b/app-text/dvibook/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/dvibook/metadata.xml
+++ b/app-text/dvibook/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/dvipdfm/metadata.xml b/app-text/dvipdfm/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/dvipdfm/metadata.xml
+++ b/app-text/dvipdfm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/dvipdfmx/metadata.xml b/app-text/dvipdfmx/metadata.xml
index 084e4884bf3a..64b4da4fbd98 100644
--- a/app-text/dvipdfmx/metadata.xml
+++ b/app-text/dvipdfmx/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>tex</herd>
-	<herd>printing</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		The DVIPDFMx (formerly dvipdfm-cjk) project provides an eXtended
 		version of the dvipdfm, a DVI to PDF translator developed by Mark A.
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index dda183467782..6d75c13e024a 100644
--- a/app-text/dvipng/metadata.xml
+++ b/app-text/dvipng/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>emacs</herd>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>emacs@gentoo.org</email>
+  <name>Gentoo Emacs project</name>
+</maintainer>
 <longdescription>
   This program makes PNG and/or GIF graphics from DVI files as obtained
   from TeX and its relatives.
diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
index 4c5b18fe19e5..0c43c99fb889 100644
--- a/app-text/dvipsk/metadata.xml
+++ b/app-text/dvipsk/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
index cdb4a49863d0..0245762ce86c 100644
--- a/app-text/dvisvgm/metadata.xml
+++ b/app-text/dvisvgm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dvisvgm</remote-id>
 	</upstream>
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
index 5f9aaf4ba85b..c9ec4630830e 100644
--- a/app-text/ebook-tools/metadata.xml
+++ b/app-text/ebook-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ebook-tools</remote-id>
 	</upstream>
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index d74743a19905..430ac6d264c6 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
 		<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/epspdf/metadata.xml b/app-text/epspdf/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/epspdf/metadata.xml
+++ b/app-text/epspdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index fb5b2ec52786..085209dbae3b 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="dvi">Enable the built-in DVI viewer</flag>
 		<flag name="libsecret">Enable support for credentials store</flag>
diff --git a/app-text/fdftk/metadata.xml b/app-text/fdftk/metadata.xml
index fc9b2c132a67..f6ce145803a3 100644
--- a/app-text/fdftk/metadata.xml
+++ b/app-text/fdftk/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/flpsed/metadata.xml b/app-text/flpsed/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/flpsed/metadata.xml
+++ b/app-text/flpsed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index cfe6470e77d0..d0f38b1d38f9 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">djvu</remote-id>
 	</upstream>
diff --git a/app-text/glark/metadata.xml b/app-text/glark/metadata.xml
index 833edc26e0fb..fa5b554a8522 100644
--- a/app-text/glark/metadata.xml
+++ b/app-text/glark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <use>
     <flag name="zip">Support for ZIP files using <pkg>dev-ruby/rubyzip</pkg></flag>
   </use>
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
index 9d0a422b1f4d..d15589132633 100644
--- a/app-text/glosung/metadata.xml
+++ b/app-text/glosung/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>theology</herd>
 	<maintainer>
 		<email>theology@gentoo.org</email>
 	</maintainer>
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
index e207110b3745..722089cc18af 100644
--- a/app-text/gocr/metadata.xml
+++ b/app-text/gocr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jocr</remote-id>
 	</upstream>
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index c438ed871d3a..7029bead40a9 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">goldendict</remote-id>
 	</upstream>
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-text/gspell/metadata.xml
+++ b/app-text/gspell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/gtkspell/metadata.xml b/app-text/gtkspell/metadata.xml
index d38dbc1104a9..9a3239b96aef 100644
--- a/app-text/gtkspell/metadata.xml
+++ b/app-text/gtkspell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index cb4aa7042301..780b0b88bff1 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtranslator</remote-id>
 	</upstream>
diff --git a/app-text/gv/metadata.xml b/app-text/gv/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/app-text/gv/metadata.xml
+++ b/app-text/gv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/hd2u/metadata.xml b/app-text/hd2u/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/app-text/hd2u/metadata.xml
+++ b/app-text/hd2u/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/highlight/metadata.xml b/app-text/highlight/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/app-text/highlight/metadata.xml
+++ b/app-text/highlight/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htag/metadata.xml b/app-text/htag/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-text/htag/metadata.xml
+++ b/app-text/htag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
index 7b03face72e4..d28266903048 100644
--- a/app-text/html2text/metadata.xml
+++ b/app-text/html2text/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jazzoslav@gmail.com</email>
 		<name>Jaroslav Rakhmatoullin</name>
 		<description>Proxied maintainer, assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/app-text/htmlc/metadata.xml
+++ b/app-text/htmlc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htp/metadata.xml b/app-text/htp/metadata.xml
index 5920e0eee87f..94b0f78dd40d 100644
--- a/app-text/htp/metadata.xml
+++ b/app-text/htp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">htp</remote-id>
 	</upstream>
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 599d7cff92d2..082916451535 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>elizabeth@interlinked.me</email>
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hunspell</remote-id>
 	</upstream>
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index fab2b827ef71..037cd9f5ca08 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
 <maintainer>
   <email>hattya@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <use>
   <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support
     for Estraier</flag>
diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml
index 725dac8e56c4..2b94e1e88d63 100644
--- a/app-text/info2html/metadata.xml
+++ b/app-text/info2html/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">info2html</remote-id>
 	</upstream>
diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml
index e98e18570ec1..3bfad8a9653c 100644
--- a/app-text/iso-codes/metadata.xml
+++ b/app-text/iso-codes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides the ISO-639 Language code list, the ISO-3166
 		Territory code list, and ISO-3166-2 sub-territory lists, and all their
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index ac4685933be7..4e01abc43bbb 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		JabRef is an open source bibliography reference manager. The native
 		file format used by JabRef is BibTeX, the standard LaTeX bibliography
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
index 1e25d5f01ac8..5b4638dec610 100644
--- a/app-text/jabref/metadata.xml
+++ b/app-text/jabref/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jabref</remote-id>
 	</upstream>
diff --git a/app-text/jadetex/metadata.xml b/app-text/jadetex/metadata.xml
index 0e2778e9301f..f62e7a58bdc0 100644
--- a/app-text/jadetex/metadata.xml
+++ b/app-text/jadetex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jadetex</remote-id>
 	</upstream>
diff --git a/app-text/jist/metadata.xml b/app-text/jist/metadata.xml
index 5cf15b097572..065ed30d15d5 100644
--- a/app-text/jist/metadata.xml
+++ b/app-text/jist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ConradIrwin/jist</remote-id>
   </upstream>
diff --git a/app-text/jmupdf/metadata.xml b/app-text/jmupdf/metadata.xml
index 1e6990819e10..776d82dca67c 100644
--- a/app-text/jmupdf/metadata.xml
+++ b/app-text/jmupdf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <use>
 	<flag name="system-mupdf">Link against system version of app-text/mupdf</flag>
 </use>
diff --git a/app-text/jpdftweak/metadata.xml b/app-text/jpdftweak/metadata.xml
index 554ee22ae343..4f5fc692975f 100644
--- a/app-text/jpdftweak/metadata.xml
+++ b/app-text/jpdftweak/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		jPDF Tweak is a Java Swing application that can combine, split, rotate, 
 		reorder, watermark, encrypt, sign, and otherwise tweak PDF files.
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/app-text/kbibtex/metadata.xml
+++ b/app-text/kbibtex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
index 49db28713e39..2508f3337ffd 100644
--- a/app-text/kchmviewer/metadata.xml
+++ b/app-text/kchmviewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
 		widget library with optional KDE libraries. It does not require KDE, but may
diff --git a/app-text/kding/metadata.xml b/app-text/kding/metadata.xml
index ce6f882a6f4b..8b38474b3ea1 100644
--- a/app-text/kding/metadata.xml
+++ b/app-text/kding/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>tgurr@gentoo.org</email>
 		<name>Timo Gurr</name>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		KDing is a KDE port of Ding, a dictionary lookup program. It is
 		a simple program sitting in KDE's system tray that can translate
diff --git a/app-text/kpaste/metadata.xml b/app-text/kpaste/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/app-text/kpaste/metadata.xml
+++ b/app-text/kpaste/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/krop/metadata.xml b/app-text/krop/metadata.xml
index bdb617ccf698..dd951012ca34 100644
--- a/app-text/krop/metadata.xml
+++ b/app-text/krop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
 <maintainer>
 	<email>dilfridge@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
index 6b0490c2200c..17c3ac3d48a2 100644
--- a/app-text/lcdf-typetools/metadata.xml
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
 <maintainer>
   <email>aballier@gentoo.org</email>
   <name>Alexis Ballier</name>
 </maintainer>
+<maintainer>
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+</maintainer>
 <longdescription lang="en">
   The LCDF Typetools package contains several programs for manipulating
   PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType
diff --git a/app-text/letterize/metadata.xml b/app-text/letterize/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/letterize/metadata.xml
+++ b/app-text/letterize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-text/libabw/metadata.xml
+++ b/app-text/libabw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
index 1677302f1b19..618e1373ac0d 100644
--- a/app-text/libebook/metadata.xml
+++ b/app-text/libebook/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libebook</remote-id>
 	</upstream>
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 254a397ff975..6766c67a7ae2 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>office</herd>
+<maintainer>
+	<email>office@gentoo.org</email>
+	<name>Gentoo Office project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/libexttextcat/metadata.xml b/app-text/libexttextcat/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-text/libexttextcat/metadata.xml
+++ b/app-text/libexttextcat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index 8146c52742bf..3c18f1872186 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>office</herd>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/app-text/libmspub/metadata.xml
+++ b/app-text/libmspub/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
index 8741eba6fb9a..2d9fd0c56f03 100644
--- a/app-text/libmwaw/metadata.xml
+++ b/app-text/libmwaw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmwaw</remote-id>
 	</upstream>
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
index 78ef25a46b5c..f1a4a4e28cf4 100644
--- a/app-text/libodfgen/metadata.xml
+++ b/app-text/libodfgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libwpd</remote-id>
 	</upstream>
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/app-text/libpaper/metadata.xml
+++ b/app-text/libpaper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/libspectre/metadata.xml b/app-text/libspectre/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/app-text/libspectre/metadata.xml
+++ b/app-text/libspectre/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 58ead25eaa3c..66bc549b5ec3 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Build miscellaneous tools</flag>
 	</use>
diff --git a/app-text/libwpg/metadata.xml b/app-text/libwpg/metadata.xml
index 9cca31d99190..5b38bd380159 100644
--- a/app-text/libwpg/metadata.xml
+++ b/app-text/libwpg/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libwpg</remote-id>
 	</upstream>
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
index 95c395ce4409..a0d42ded2c4a 100644
--- a/app-text/libwps/metadata.xml
+++ b/app-text/libwps/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libwps</remote-id>
 	</upstream>
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
index 3eae0091b614..c00fc644898c 100644
--- a/app-text/linuxdoc-tools/metadata.xml
+++ b/app-text/linuxdoc-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9,
 		and is a toolset for processing LinuxDoc DTD SGML files.
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
index cb36a2fd8c76..a694eb49aaa5 100644
--- a/app-text/lv/metadata.xml
+++ b/app-text/lv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/manpager/metadata.xml b/app-text/manpager/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/app-text/manpager/metadata.xml
+++ b/app-text/manpager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
index ed7f2d4ce9af..3fa5e363aed3 100644
--- a/app-text/mecab/metadata.xml
+++ b/app-text/mecab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
index f967eaf5ae9c..f0ba0a6403cc 100644
--- a/app-text/mftrace/metadata.xml
+++ b/app-text/mftrace/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>tex</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 68d82602a73d..5eb59b01be3a 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>wschlich@gentoo.org</email>
     <name>Wolfram Schlich</name>
     <description>Primary maintainer</description>
   </maintainer>
+<maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
index 7cc81f65d94e..436358886ba2 100644
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hunspell</remote-id>
 	</upstream>
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index 561e1ecf38b0..bfca2c2e7834 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/noweb/metadata.xml b/app-text/noweb/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/noweb/metadata.xml
+++ b/app-text/noweb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 860a5b48290e..7bb8dafa0c51 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
 program impleme nted as a filter and based on a feature extraction
 method. It reads a bitmap ima ge in pbm format and outputs text in
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index be1fa93cdfbe..05bc5ddeb1a9 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>clabbe.montjoie@gmail.com</email>
 <name>LABBE Corentin (Montjoie)</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 72bbcbf76c85..62a3a03cb1d1 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/passivetex/metadata.xml
+++ b/app-text/passivetex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
index 43d330322fdb..3f1c9eff3388 100644
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
   </use>
diff --git a/app-text/pdf2html/metadata.xml b/app-text/pdf2html/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/pdf2html/metadata.xml
+++ b/app-text/pdf2html/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index e77acea2191a..121a7b941df6 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jlec@gentoo.org</email>
 		<description>Tree Proxy</description>
@@ -10,6 +9,10 @@
 		<email>flo@geekplace.eu</email>
 		<description>Maintainer, CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="unac">Removing accents and ligatures before search</flag>
 	</use>
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/app-text/pdfjam/metadata.xml
+++ b/app-text/pdfjam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
index 6814ae17fc95..bd2c25c68efb 100644
--- a/app-text/pdfminer/metadata.xml
+++ b/app-text/pdfminer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pdfminer</remote-id>
 	</upstream>
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index a8a5788d684c..5b39289541dd 100644
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<herd>java</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index c75fe577173e..a69e3149dcf8 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>fatzer2@gmail.com</email>
 	<name>Alexander Golubev</name>
 	<description>Proxu maintainer. Assign bugs on him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/app-text/poppler-data/metadata.xml
+++ b/app-text/poppler-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 2c2e86c2545b..1fbf81c0b7c4 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>printing</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 <use>
 	<flag name="introspection">Enable GObject introspection.</flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index 7898eff46435..f6aab4cd6a3a 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		 Tool for generating Encapsulated Postscript Format (EPS,EPSF) files
 		 from one-page Postscript documents
diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
index 4c5b18fe19e5..0c43c99fb889 100644
--- a/app-text/ps2pkm/metadata.xml
+++ b/app-text/ps2pkm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/pstotext/metadata.xml b/app-text/pstotext/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/app-text/pstotext/metadata.xml
+++ b/app-text/pstotext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/psutils/metadata.xml
+++ b/app-text/psutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
index 280f01f0e4ad..3ffca77bf0c7 100644
--- a/app-text/pylize/metadata.xml
+++ b/app-text/pylize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 pylize is a Python script that generates a set of HTML files that
 make up an on-screen presentation from a master file. The HTML files
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
index 6c8bf0f9e05b..384e2a7eb6d8 100644
--- a/app-text/pytextile/metadata.xml
+++ b/app-text/pytextile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator. 
   Textile simplifies the work of creating (X)HTML.</longdescription>
   <upstream>
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index 7db5520ddbda..2bc27f944fca 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qpdf</remote-id>
 	</upstream>
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 40dcf6c24c57..308560ee4159 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="fitz">
       Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
index db1b3ad443af..a95b2d0072b4 100644
--- a/app-text/queequeg/metadata.xml
+++ b/app-text/queequeg/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
 	<maintainer>
 		<email>hattya@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">queequeg</remote-id>
 	</upstream>
diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-text/rarian/metadata.xml
+++ b/app-text/rarian/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/refbase/metadata.xml b/app-text/refbase/metadata.xml
index 1dfe25bebf19..e26514a5909b 100644
--- a/app-text/refbase/metadata.xml
+++ b/app-text/refbase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">refbase</remote-id>
 	</upstream>
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
index c56f26420c85..b57f98c88ae0 100644
--- a/app-text/referencer/metadata.xml
+++ b/app-text/referencer/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dominik.kriegner+gentoo@gmail.com</email>
 		<name>Dominik Kriegner</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/app-text/rman/metadata.xml b/app-text/rman/metadata.xml
index 1acf6907a670..a10cc10e30b1 100644
--- a/app-text/rman/metadata.xml
+++ b/app-text/rman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">polyglotman</remote-id>
 	</upstream>
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 64bd34360c45..a57198f756c3 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>l.valerimanera@gmail.com</email>
 	</maintainer>
 	<maintainer>
 		<email>dma05@web.de</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rnv</remote-id>
 	</upstream>
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
index ae24f128b707..4dcb1ffaf331 100644
--- a/app-text/ronn/metadata.xml
+++ b/app-text/ronn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/ronn</remote-id>
   </upstream>
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
index 6a90974eb087..a7be41a038f2 100644
--- a/app-text/rpl/metadata.xml
+++ b/app-text/rpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rpl</remote-id>
 	</upstream>
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
index ef93e4b86134..6cc7031e0e65 100644
--- a/app-text/sary/metadata.xml
+++ b/app-text/sary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<longdescription>Sary is a suffix array library and tools. It provides
 fast full-text search facilities for text files on the order of 10 to
 100 MB using a data structure called a suffix array. It can also
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
index 341ceba9651d..7229a10f612b 100644
--- a/app-text/scrollkeeper-dtd/metadata.xml
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scrollkeeper</remote-id>
 	</upstream>
diff --git a/app-text/scrollkeeper/metadata.xml b/app-text/scrollkeeper/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-text/scrollkeeper/metadata.xml
+++ b/app-text/scrollkeeper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 384cf8e3576d..54b57679f84a 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tomboy64@sina.cn</email>
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
 		It is designed to edit books in ePub format.</longdescription>
 	<upstream>
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
index cd6ea64ec5c6..0762c2e8d518 100644
--- a/app-text/silvercity/metadata.xml
+++ b/app-text/silvercity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">silvercity</remote-id>
 	</upstream>
diff --git a/app-text/skribe/metadata.xml b/app-text/skribe/metadata.xml
index 08fe6cdd1407..1e578658f239 100644
--- a/app-text/skribe/metadata.xml
+++ b/app-text/skribe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription lang="en">
 	Skribe is a text processor. Even if it is a general purpose tool, it best
 	suits the writing of technical documents such as web pages or technical
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index fa2785e61cc3..6a725874c667 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
 <maintainer>
   <email>theology@gentoo.org</email>
 </maintainer>
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index 212f74428c43..7c26978734b2 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
 <maintainer>
   <email>theology@gentoo.org</email>
 </maintainer>
diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml
index 8c5d39f263d0..1caaf1d84e64 100644
--- a/app-text/t1utils/metadata.xml
+++ b/app-text/t1utils/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/talkfilters/metadata.xml b/app-text/talkfilters/metadata.xml
index 371398706167..a4a931385f0d 100644
--- a/app-text/talkfilters/metadata.xml
+++ b/app-text/talkfilters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription lang="en">
   The GNU Talk Filters are filter programs that convert ordinary English text
   into text that mimics a stereotyped or otherwise humorous dialect. These
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/teckit/metadata.xml
+++ b/app-text/teckit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index d96b59371a08..568387271111 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
   <longdescription lang="en">
 		TeXLive core binaries
 	</longdescription>
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index 0d7a5f3371e8..4cee8f4efb98 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <use>
   <flag name="context">Add support for the ConTeXt format
     (<pkg>dev-texlive/texlive-context</pkg>)</flag>
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 8c6a042450d3..5aa9bbd4e5cf 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">jing-trang</remote-id>
 	</upstream>
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/ttf2pk2/metadata.xml
+++ b/app-text/ttf2pk2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
index 385e589278eb..eddf8212b756 100644
--- a/app-text/ttf2pt1/metadata.xml
+++ b/app-text/ttf2pt1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ttf2pt1</remote-id>
 	</upstream>
diff --git a/app-text/uvconv/metadata.xml b/app-text/uvconv/metadata.xml
index c225088eb91e..f0711335fbe9 100644
--- a/app-text/uvconv/metadata.xml
+++ b/app-text/uvconv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">unikey</remote-id>
 	</upstream>
diff --git a/app-text/vilistextum/metadata.xml b/app-text/vilistextum/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/app-text/vilistextum/metadata.xml
+++ b/app-text/vilistextum/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
index 040f708c8404..d616bd8d783c 100644
--- a/app-text/vlna/metadata.xml
+++ b/app-text/vlna/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>malenko@email.cz</email>
   <name>Jaromir Malenko</name>
   <description>Jaromir is helping us with Czeck and Slovak support in
   Gentoo. He is also a maintainer of cstetex. See bug #31657</description>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index 4fb185fbe049..a0a347f151cb 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <use>
     <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
   </use>
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
index c2054050ea94..426cb5bc99ed 100644
--- a/app-text/webgen/metadata.xml
+++ b/app-text/webgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="builder">Enable programmatic HTML/XML generation</flag>
     <flag name="highlight">Enable syntax highlighting for certain plugins</flag>
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/app-text/winefish/metadata.xml
+++ b/app-text/winefish/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
index abbd11198e8f..62052936e887 100644
--- a/app-text/writerperfect/metadata.xml
+++ b/app-text/writerperfect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="abiword">Add support for abiword format using <pkg>app-text/libabw</pkg></flag>
 		<flag name="ebook">Add support for various ebook formats using <pkg>app-text/libebook</pkg></flag>
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
index 67ba29b6ddbc..3a453f11dae2 100644
--- a/app-text/wv/metadata.xml
+++ b/app-text/wv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Install optional utilities considered deprecated in favor of using AbiWord.</flag>
 	</use>
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index f931fd09f05a..c310a7b45953 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wvware</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=10501</bugs-to>
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index 0441f1355104..530e27530e1a 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index 7f7a22253038..390910dcd05a 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xchm</remote-id>
 	</upstream>
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index 1de599fc5b27..23dab7b804b2 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		XDVIK is a dvi previewer on X with kpathsea support.  It also supports
 		multibyte character rendering via Xft2 (or VFlib2).
diff --git a/app-text/xdvipdfmx/metadata.xml b/app-text/xdvipdfmx/metadata.xml
index 5f5d6bb2fac8..8f86268a39c4 100644
--- a/app-text/xdvipdfmx/metadata.xml
+++ b/app-text/xdvipdfmx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
   <longdescription lang="en">
     This package provides the extended xdvi to pdf converter
     needed to deal with unicode enabled TeX's.
diff --git a/app-text/xindy/metadata.xml b/app-text/xindy/metadata.xml
index b206ed83dc2d..8d9511b0c5d1 100644
--- a/app-text/xindy/metadata.xml
+++ b/app-text/xindy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription lang="en">
 	 xindy is an index processor that can be used to generate book-like indexes
 	 for arbitrary document-preparation systems. This includes systems such as
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 02263c72542d..88f97f94958a 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>theology</herd>
 	<maintainer>
 		<email>theology@gentoo.org</email>
 	</maintainer>
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
index af56acd79408..9f4a68ff06b1 100644
--- a/app-text/yagf/metadata.xml
+++ b/app-text/yagf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>yaleks@gmail.com</email>
 	<name>Aleksandr Yakimov</name>
@@ -12,6 +11,10 @@
 	<name>Sergey Popov</name>
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
 		With YAGF you can open already scanned image files or obtain new images
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
index 1484b932b98d..a367f385a8e5 100644
--- a/app-text/zemberek-server/metadata.xml
+++ b/app-text/zemberek-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">zemberek</remote-id>
 		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
diff --git a/app-vim/airline/metadata.xml b/app-vim/airline/metadata.xml
index 1a599380e832..80f6ad2a739c 100644
--- a/app-vim/airline/metadata.xml
+++ b/app-vim/airline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bling/vim-airline</remote-id>
   </upstream>
diff --git a/app-vim/align/metadata.xml b/app-vim/align/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/align/metadata.xml
+++ b/app-vim/align/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/alternate/metadata.xml b/app-vim/alternate/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/alternate/metadata.xml
+++ b/app-vim/alternate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/ansiesc/metadata.xml b/app-vim/ansiesc/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ansiesc/metadata.xml
+++ b/app-vim/ansiesc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/ant_menu/metadata.xml b/app-vim/ant_menu/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ant_menu/metadata.xml
+++ b/app-vim/ant_menu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/autoalign/metadata.xml b/app-vim/autoalign/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/autoalign/metadata.xml
+++ b/app-vim/autoalign/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/automatictexplugin/metadata.xml b/app-vim/automatictexplugin/metadata.xml
index 113d72d576ee..bef604b6570f 100644
--- a/app-vim/automatictexplugin/metadata.xml
+++ b/app-vim/automatictexplugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">atp-vim</remote-id>
 	</upstream>
diff --git a/app-vim/bash-support/metadata.xml b/app-vim/bash-support/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/bash-support/metadata.xml
+++ b/app-vim/bash-support/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/bnf-syntax/metadata.xml b/app-vim/bnf-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/bnf-syntax/metadata.xml
+++ b/app-vim/bnf-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/brainfuck-syntax/metadata.xml b/app-vim/brainfuck-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/brainfuck-syntax/metadata.xml
+++ b/app-vim/brainfuck-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/breakpts/metadata.xml b/app-vim/breakpts/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/breakpts/metadata.xml
+++ b/app-vim/breakpts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/bufexplorer/metadata.xml b/app-vim/bufexplorer/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/bufexplorer/metadata.xml
+++ b/app-vim/bufexplorer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/c-support/metadata.xml b/app-vim/c-support/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/c-support/metadata.xml
+++ b/app-vim/c-support/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/calendar/metadata.xml b/app-vim/calendar/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/calendar/metadata.xml
+++ b/app-vim/calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
index 2e444c687450..71cf04ab3fd9 100644
--- a/app-vim/cctree/metadata.xml
+++ b/app-vim/cctree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim-scripts/CCTree</remote-id>
 	</upstream>
diff --git a/app-vim/cecutil/metadata.xml b/app-vim/cecutil/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/cecutil/metadata.xml
+++ b/app-vim/cecutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/cfengine-syntax/metadata.xml b/app-vim/cfengine-syntax/metadata.xml
index 9bbec758b044..fcf4253fb57e 100644
--- a/app-vim/cfengine-syntax/metadata.xml
+++ b/app-vim/cfengine-syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides Vim syntax highlighting for Cfengine configuration
 		files, and automatic filetype detection for these files based upon
diff --git a/app-vim/checkattach/metadata.xml b/app-vim/checkattach/metadata.xml
index e9ad44f03af6..492bab3cc051 100644
--- a/app-vim/checkattach/metadata.xml
+++ b/app-vim/checkattach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chrisbra/CheckAttach</remote-id>
   </upstream>
diff --git a/app-vim/closetag/metadata.xml b/app-vim/closetag/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/closetag/metadata.xml
+++ b/app-vim/closetag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/cmdalias/metadata.xml b/app-vim/cmdalias/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/cmdalias/metadata.xml
+++ b/app-vim/cmdalias/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/colorschemes/metadata.xml b/app-vim/colorschemes/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/colorschemes/metadata.xml
+++ b/app-vim/colorschemes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/colorsel/metadata.xml b/app-vim/colorsel/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/colorsel/metadata.xml
+++ b/app-vim/colorsel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
index d760cd84e35c..253e215fc6df 100644
--- a/app-vim/colorv/metadata.xml
+++ b/app-vim/colorv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim-scripts/ColorV</remote-id>
 	</upstream>
diff --git a/app-vim/command-t/metadata.xml b/app-vim/command-t/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/command-t/metadata.xml
+++ b/app-vim/command-t/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/conque/metadata.xml b/app-vim/conque/metadata.xml
index b00e0178977a..e794f9770580 100644
--- a/app-vim/conque/metadata.xml
+++ b/app-vim/conque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">conque</remote-id>
 	</upstream>
diff --git a/app-vim/cream/metadata.xml b/app-vim/cream/metadata.xml
index b415c9037a01..5492c3c5ca11 100644
--- a/app-vim/cream/metadata.xml
+++ b/app-vim/cream/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
 	<maintainer>
 		<email>degrenier@easyconnect.fr</email>
 		<description>Please Cc: Thomas de Grenier de Latour (not a Gentoo
 			developer) on any bugs, as he knows lots about the package and I'd
 			like his opinion before I make any big changes.</description>
 	</maintainer>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cream</remote-id>
 	</upstream>
diff --git a/app-vim/csound-syntax/metadata.xml b/app-vim/csound-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/csound-syntax/metadata.xml
+++ b/app-vim/csound-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/csv/metadata.xml b/app-vim/csv/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/csv/metadata.xml
+++ b/app-vim/csv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/ctrlp/metadata.xml b/app-vim/ctrlp/metadata.xml
index 00b6952806c9..f62fef5977c4 100644
--- a/app-vim/ctrlp/metadata.xml
+++ b/app-vim/ctrlp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kien/ctrlp.vim</remote-id>
   </upstream>
diff --git a/app-vim/ctx/metadata.xml b/app-vim/ctx/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ctx/metadata.xml
+++ b/app-vim/ctx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/curcmdmode/metadata.xml b/app-vim/curcmdmode/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/curcmdmode/metadata.xml
+++ b/app-vim/curcmdmode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/cvsmenu/metadata.xml b/app-vim/cvsmenu/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/cvsmenu/metadata.xml
+++ b/app-vim/cvsmenu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/dbext/metadata.xml b/app-vim/dbext/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/dbext/metadata.xml
+++ b/app-vim/dbext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/detectindent/metadata.xml b/app-vim/detectindent/metadata.xml
index 98133bbba173..987b4f8a8e93 100644
--- a/app-vim/detectindent/metadata.xml
+++ b/app-vim/detectindent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim plugin which automatically detects indent settings for files which
 		do not have modelines.
diff --git a/app-vim/dhcpd-syntax/metadata.xml b/app-vim/dhcpd-syntax/metadata.xml
index d0d2d472331a..8563ccf26585 100644
--- a/app-vim/dhcpd-syntax/metadata.xml
+++ b/app-vim/dhcpd-syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides Vim syntax highlighting for dhcpd configuration
 		files, and automatic filetype detection for these files based upon
diff --git a/app-vim/dirdiff/metadata.xml b/app-vim/dirdiff/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/dirdiff/metadata.xml
+++ b/app-vim/dirdiff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/easy-align/metadata.xml b/app-vim/easy-align/metadata.xml
index d49628a1bb96..be3a768c393b 100644
--- a/app-vim/easy-align/metadata.xml
+++ b/app-vim/easy-align/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">junegunn/vim-easy-align</remote-id>
   </upstream>
diff --git a/app-vim/easytags/metadata.xml b/app-vim/easytags/metadata.xml
index fbd9a55b8107..bd05bc6a9f00 100644
--- a/app-vim/easytags/metadata.xml
+++ b/app-vim/easytags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xolox/vim-easytags</remote-id>
   </upstream>
diff --git a/app-vim/ebnf-syntax/metadata.xml b/app-vim/ebnf-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ebnf-syntax/metadata.xml
+++ b/app-vim/ebnf-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/emmet/metadata.xml b/app-vim/emmet/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-vim/emmet/metadata.xml
+++ b/app-vim/emmet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-vim/enhancedcommentify/metadata.xml b/app-vim/enhancedcommentify/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/enhancedcommentify/metadata.xml
+++ b/app-vim/enhancedcommentify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/errsign/metadata.xml b/app-vim/errsign/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/errsign/metadata.xml
+++ b/app-vim/errsign/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/eruby-syntax/metadata.xml b/app-vim/eruby-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/eruby-syntax/metadata.xml
+++ b/app-vim/eruby-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/eselect-syntax/metadata.xml b/app-vim/eselect-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/eselect-syntax/metadata.xml
+++ b/app-vim/eselect-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/exheres-syntax/metadata.xml b/app-vim/exheres-syntax/metadata.xml
index 3b9019c0cc6f..1b54a8398bff 100644
--- a/app-vim/exheres-syntax/metadata.xml
+++ b/app-vim/exheres-syntax/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
-  <herd>proxy-maintainers</herd>
-<maintainer>
+  <maintainer>
     <email>ahf@0x90.dkg</email>
     <name>Alexander Faeroy</name>
     <description>Proxied upstream</description>
   </maintainer>
+<maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-vim/extra-syntax/metadata.xml b/app-vim/extra-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/extra-syntax/metadata.xml
+++ b/app-vim/extra-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/fluxbox-syntax/metadata.xml b/app-vim/fluxbox-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/fluxbox-syntax/metadata.xml
+++ b/app-vim/fluxbox-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/foldutil/metadata.xml b/app-vim/foldutil/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/foldutil/metadata.xml
+++ b/app-vim/foldutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/fugitive/metadata.xml b/app-vim/fugitive/metadata.xml
index bab7c3c6e755..52b9679e70cf 100644
--- a/app-vim/fugitive/metadata.xml
+++ b/app-vim/fugitive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tpope/vim-fugitive</remote-id>
   </upstream>
diff --git a/app-vim/fuzzyfinder/metadata.xml b/app-vim/fuzzyfinder/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/fuzzyfinder/metadata.xml
+++ b/app-vim/fuzzyfinder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/genindent/metadata.xml b/app-vim/genindent/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/genindent/metadata.xml
+++ b/app-vim/genindent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/gentoo-syntax/metadata.xml b/app-vim/gentoo-syntax/metadata.xml
index 2a37aee0f5fe..77aae089dad1 100644
--- a/app-vim/gentoo-syntax/metadata.xml
+++ b/app-vim/gentoo-syntax/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="ignore-glep31">Remove GLEP 31 (UTF-8 file encodings) settings</flag>
   </use>
diff --git a/app-vim/genutils/metadata.xml b/app-vim/genutils/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/genutils/metadata.xml
+++ b/app-vim/genutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/gist/metadata.xml b/app-vim/gist/metadata.xml
index 91d3e2df1459..132553b25d2f 100644
--- a/app-vim/gist/metadata.xml
+++ b/app-vim/gist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mattn/gist-vim</remote-id>
 	</upstream>
diff --git a/app-vim/git-patch-tags/metadata.xml b/app-vim/git-patch-tags/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-vim/git-patch-tags/metadata.xml
+++ b/app-vim/git-patch-tags/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-vim/gitgutter/metadata.xml b/app-vim/gitgutter/metadata.xml
index e71469e00028..ac7bc14bc555 100644
--- a/app-vim/gitgutter/metadata.xml
+++ b/app-vim/gitgutter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">airblade/vim-gitgutter</remote-id>
   </upstream>
diff --git a/app-vim/gitolite-syntax/metadata.xml b/app-vim/gitolite-syntax/metadata.xml
index 9f56bdbdc857..c8a2457ad7c0 100644
--- a/app-vim/gitolite-syntax/metadata.xml
+++ b/app-vim/gitolite-syntax/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
   <maintainer>
     <email>idl0r@gentoo.org</email>
     <name>Christian Ruppert</name>
   </maintainer>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tmatilai/gitolite.vim</remote-id>
   </upstream>
diff --git a/app-vim/gitv/metadata.xml b/app-vim/gitv/metadata.xml
index 178aec9074a1..9cbe2bf98d38 100644
--- a/app-vim/gitv/metadata.xml
+++ b/app-vim/gitv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gregsexton/gitv</remote-id>
   </upstream>
diff --git a/app-vim/gnupg/metadata.xml b/app-vim/gnupg/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/gnupg/metadata.xml
+++ b/app-vim/gnupg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/greputils/metadata.xml b/app-vim/greputils/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/greputils/metadata.xml
+++ b/app-vim/greputils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/gtk-syntax/metadata.xml b/app-vim/gtk-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/gtk-syntax/metadata.xml
+++ b/app-vim/gtk-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/gundo/metadata.xml b/app-vim/gundo/metadata.xml
index 77a343a48394..8fbda3bab8b7 100644
--- a/app-vim/gundo/metadata.xml
+++ b/app-vim/gundo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sjl/gundo.vim</remote-id>
   </upstream>
diff --git a/app-vim/help-extra-syntax/metadata.xml b/app-vim/help-extra-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/help-extra-syntax/metadata.xml
+++ b/app-vim/help-extra-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/increment/metadata.xml b/app-vim/increment/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/increment/metadata.xml
+++ b/app-vim/increment/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/info/metadata.xml b/app-vim/info/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/info/metadata.xml
+++ b/app-vim/info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/json/metadata.xml b/app-vim/json/metadata.xml
index 8c75be499238..68f6bf53bd8b 100644
--- a/app-vim/json/metadata.xml
+++ b/app-vim/json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">elzr/vim-json</remote-id>
   </upstream>
diff --git a/app-vim/l9/metadata.xml b/app-vim/l9/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/l9/metadata.xml
+++ b/app-vim/l9/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/locateopen/metadata.xml b/app-vim/locateopen/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/locateopen/metadata.xml
+++ b/app-vim/locateopen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/lustyexplorer/metadata.xml b/app-vim/lustyexplorer/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/lustyexplorer/metadata.xml
+++ b/app-vim/lustyexplorer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/matrix/metadata.xml b/app-vim/matrix/metadata.xml
index a641bbd32139..e5331f573e44 100644
--- a/app-vim/matrix/metadata.xml
+++ b/app-vim/matrix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A Vim plugin which displays a screensaver based upon the falling green
 		symbols seen in the Matrix.
diff --git a/app-vim/minibufexpl/metadata.xml b/app-vim/minibufexpl/metadata.xml
index 7b111b50bc45..ec76fd2b2d01 100644
--- a/app-vim/minibufexpl/metadata.xml
+++ b/app-vim/minibufexpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fholgado/minibufexpl.vim</remote-id>
   </upstream>
diff --git a/app-vim/multiplesearch/metadata.xml b/app-vim/multiplesearch/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/multiplesearch/metadata.xml
+++ b/app-vim/multiplesearch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/multvals/metadata.xml b/app-vim/multvals/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/multvals/metadata.xml
+++ b/app-vim/multvals/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/nagios-syntax/metadata.xml b/app-vim/nagios-syntax/metadata.xml
index ff9d6ae9fc80..7a4ca1e934c7 100644
--- a/app-vim/nagios-syntax/metadata.xml
+++ b/app-vim/nagios-syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides Vim syntax highlighting for Nagios configuration
 		files, and automatic filetype detection for these files based upon
diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
index 78c83b3a20c4..e44ae04c874c 100644
--- a/app-vim/neocomplcache/metadata.xml
+++ b/app-vim/neocomplcache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vim-scripts/neocomplcache</remote-id>
   </upstream>
diff --git a/app-vim/nerdcommenter/metadata.xml b/app-vim/nerdcommenter/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/nerdcommenter/metadata.xml
+++ b/app-vim/nerdcommenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/nerdtree/metadata.xml b/app-vim/nerdtree/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/nerdtree/metadata.xml
+++ b/app-vim/nerdtree/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/nginx-syntax/metadata.xml b/app-vim/nginx-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/nginx-syntax/metadata.xml
+++ b/app-vim/nginx-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/notes/metadata.xml b/app-vim/notes/metadata.xml
index 309e59933820..56ff84dd7a4a 100644
--- a/app-vim/notes/metadata.xml
+++ b/app-vim/notes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xolox/vim-notes</remote-id>
   </upstream>
diff --git a/app-vim/ntp-syntax/metadata.xml b/app-vim/ntp-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ntp-syntax/metadata.xml
+++ b/app-vim/ntp-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/omnicppcomplete/metadata.xml b/app-vim/omnicppcomplete/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/omnicppcomplete/metadata.xml
+++ b/app-vim/omnicppcomplete/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/pam-syntax/metadata.xml b/app-vim/pam-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/pam-syntax/metadata.xml
+++ b/app-vim/pam-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/pathogen/metadata.xml b/app-vim/pathogen/metadata.xml
index d6a3a74a31b0..3f7903e13a21 100644
--- a/app-vim/pathogen/metadata.xml
+++ b/app-vim/pathogen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tpope/vim-pathogen</remote-id>
   </upstream>
diff --git a/app-vim/pdv/metadata.xml b/app-vim/pdv/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/pdv/metadata.xml
+++ b/app-vim/pdv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
index dd8ad5f3a094..c507bba2d981 100644
--- a/app-vim/perl-support/metadata.xml
+++ b/app-vim/perl-support/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim-scripts/perl-support.vim</remote-id>
 	</upstream>
diff --git a/app-vim/pgn-syntax/metadata.xml b/app-vim/pgn-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/pgn-syntax/metadata.xml
+++ b/app-vim/pgn-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/phpdocs/metadata.xml b/app-vim/phpdocs/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/phpdocs/metadata.xml
+++ b/app-vim/phpdocs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/project/metadata.xml b/app-vim/project/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/project/metadata.xml
+++ b/app-vim/project/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/puppet-syntax/metadata.xml b/app-vim/puppet-syntax/metadata.xml
index 8081449d6e29..1cde7d6a80c3 100644
--- a/app-vim/puppet-syntax/metadata.xml
+++ b/app-vim/puppet-syntax/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+<maintainer>
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-vim/pushpop/metadata.xml b/app-vim/pushpop/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/pushpop/metadata.xml
+++ b/app-vim/pushpop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/pyclewn/metadata.xml b/app-vim/pyclewn/metadata.xml
index 498749125c5b..5a5d1b7dcb76 100644
--- a/app-vim/pyclewn/metadata.xml
+++ b/app-vim/pyclewn/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
   <maintainer>
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyclewn</remote-id>
     <remote-id type="sourceforge">pyclewn</remote-id>
diff --git a/app-vim/python-mode/metadata.xml b/app-vim/python-mode/metadata.xml
index a67e512c05d7..ae832e9a6ea4 100644
--- a/app-vim/python-mode/metadata.xml
+++ b/app-vim/python-mode/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
 	<maintainer>
 		<email>xarthisius@gentoo.org</email>
 		<name>Kacper Kowalik</name>
 	</maintainer>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Python-mode is a vim plugin that allows you to use the pylint, rope,
 		pydoc, pyflakes, pep8, mccabe libraries in vim to provide features like
diff --git a/app-vim/rails/metadata.xml b/app-vim/rails/metadata.xml
index e4ba72cf7cee..5a45958ec726 100644
--- a/app-vim/rails/metadata.xml
+++ b/app-vim/rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tpope/vim-rails</remote-id>
   </upstream>
diff --git a/app-vim/recover/metadata.xml b/app-vim/recover/metadata.xml
index 4fc7250111cd..668a8a200375 100644
--- a/app-vim/recover/metadata.xml
+++ b/app-vim/recover/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chrisbra/Recover.vim</remote-id>
   </upstream>
diff --git a/app-vim/reload/metadata.xml b/app-vim/reload/metadata.xml
index 5eb0db4f75db..40352144938f 100644
--- a/app-vim/reload/metadata.xml
+++ b/app-vim/reload/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xolox/vim-reload</remote-id>
   </upstream>
diff --git a/app-vim/repeat/metadata.xml b/app-vim/repeat/metadata.xml
index df6613320687..8d89f73d1ad7 100644
--- a/app-vim/repeat/metadata.xml
+++ b/app-vim/repeat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tpope/vim-repeat</remote-id>
   </upstream>
diff --git a/app-vim/ri-browser/metadata.xml b/app-vim/ri-browser/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/ri-browser/metadata.xml
+++ b/app-vim/ri-browser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
index df7ea026735e..905231bbb5c1 100644
--- a/app-vim/salt-vim/metadata.xml
+++ b/app-vim/salt-vim/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">saltstack/salt-vim</remote-id>
 	</upstream>
diff --git a/app-vim/screen/metadata.xml b/app-vim/screen/metadata.xml
index f834882c8236..8774955c0b6a 100644
--- a/app-vim/screen/metadata.xml
+++ b/app-vim/screen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vim-scripts/Screen-vim---gnu-screentmux</remote-id>
   </upstream>
diff --git a/app-vim/searchcomplete/metadata.xml b/app-vim/searchcomplete/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/searchcomplete/metadata.xml
+++ b/app-vim/searchcomplete/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/securemodelines/metadata.xml b/app-vim/securemodelines/metadata.xml
index ca454fc3ec40..4c3116fd9900 100644
--- a/app-vim/securemodelines/metadata.xml
+++ b/app-vim/securemodelines/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim's internal modeline support allows all sorts of annoying and
 		potentially insecure options to be set. This script implements a much
diff --git a/app-vim/selinux-syntax/metadata.xml b/app-vim/selinux-syntax/metadata.xml
index 3be0b0323f96..5d811607d0b1 100644
--- a/app-vim/selinux-syntax/metadata.xml
+++ b/app-vim/selinux-syntax/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
-	<herd>hardened</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/session/metadata.xml b/app-vim/session/metadata.xml
index 728907a6f75a..754322c9154a 100644
--- a/app-vim/session/metadata.xml
+++ b/app-vim/session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xolox/vim-session</remote-id>
   </upstream>
diff --git a/app-vim/showmarks/metadata.xml b/app-vim/showmarks/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/showmarks/metadata.xml
+++ b/app-vim/showmarks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/sleuth/metadata.xml b/app-vim/sleuth/metadata.xml
index 9a7aa0bf9c64..453cbfd77d0b 100644
--- a/app-vim/sleuth/metadata.xml
+++ b/app-vim/sleuth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tpope/vim-sleuth</remote-id>
   </upstream>
diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
index c9ec462e5573..871e37a96577 100644
--- a/app-vim/slimv/metadata.xml
+++ b/app-vim/slimv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Slimv tries to mimic a subset of SLIME's (Superior Lisp Interaction Mode
 		for Emacs) functionality inside Vim. The script defines functions and
diff --git a/app-vim/snipmate/metadata.xml b/app-vim/snipmate/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/snipmate/metadata.xml
+++ b/app-vim/snipmate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
index ec4a0e2e6abf..9bc66001ff92 100644
--- a/app-vim/splice/metadata.xml
+++ b/app-vim/splice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vim</remote-id>
 	</upstream>
diff --git a/app-vim/sudoedit/metadata.xml b/app-vim/sudoedit/metadata.xml
index 21a3d28e47f3..5ab2deb9dee0 100644
--- a/app-vim/sudoedit/metadata.xml
+++ b/app-vim/sudoedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chrisbra/SudoEdit.vim</remote-id>
   </upstream>
diff --git a/app-vim/supertab/metadata.xml b/app-vim/supertab/metadata.xml
index b4ec7dcae796..11cde96bfb50 100644
--- a/app-vim/supertab/metadata.xml
+++ b/app-vim/supertab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ervandew/supertab</remote-id>
   </upstream>
diff --git a/app-vim/surround/metadata.xml b/app-vim/surround/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/surround/metadata.xml
+++ b/app-vim/surround/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/syntastic/metadata.xml b/app-vim/syntastic/metadata.xml
index 847bbf0fce2c..f7f694002565 100644
--- a/app-vim/syntastic/metadata.xml
+++ b/app-vim/syntastic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">scrooloose/syntastic</remote-id>
   </upstream>
diff --git a/app-vim/tagbar/metadata.xml b/app-vim/tagbar/metadata.xml
index af364a726fc2..c374f6d59dee 100644
--- a/app-vim/tagbar/metadata.xml
+++ b/app-vim/tagbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">majutsushi/tagbar</remote-id>
   </upstream>
diff --git a/app-vim/taglist/metadata.xml b/app-vim/taglist/metadata.xml
index ebae36de8394..cb32dcdafd5d 100644
--- a/app-vim/taglist/metadata.xml
+++ b/app-vim/taglist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vim-taglist</remote-id>
 	</upstream>
diff --git a/app-vim/tcomment/metadata.xml b/app-vim/tcomment/metadata.xml
index 14dde9048045..1b5bdebc750a 100644
--- a/app-vim/tcomment/metadata.xml
+++ b/app-vim/tcomment/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tomtom/tcomment_vim</remote-id>
   </upstream>
diff --git a/app-vim/thlnk/metadata.xml b/app-vim/thlnk/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/thlnk/metadata.xml
+++ b/app-vim/thlnk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/tmpl/metadata.xml b/app-vim/tmpl/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/tmpl/metadata.xml
+++ b/app-vim/tmpl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/toggle/metadata.xml b/app-vim/toggle/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/toggle/metadata.xml
+++ b/app-vim/toggle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/tt2-syntax/metadata.xml b/app-vim/tt2-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/tt2-syntax/metadata.xml
+++ b/app-vim/tt2-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/txtfmt/metadata.xml b/app-vim/txtfmt/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/txtfmt/metadata.xml
+++ b/app-vim/txtfmt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/udev-syntax/metadata.xml b/app-vim/udev-syntax/metadata.xml
index 0997f5a0c71b..715c74254f34 100644
--- a/app-vim/udev-syntax/metadata.xml
+++ b/app-vim/udev-syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim syntax highlighting for udev.rules files.
 	</longdescription>
diff --git a/app-vim/undotree/metadata.xml b/app-vim/undotree/metadata.xml
index a5d7a719ea1a..0c06406cd245 100644
--- a/app-vim/undotree/metadata.xml
+++ b/app-vim/undotree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mbbill/undotree</remote-id>
   </upstream>
diff --git a/app-vim/unite/metadata.xml b/app-vim/unite/metadata.xml
index ef7e62c357fc..c539d2537b59 100644
--- a/app-vim/unite/metadata.xml
+++ b/app-vim/unite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Unite searches and displays information from arbitrary sources like files,
 		buffers, recently used files or registers. You can run one of defined action
diff --git a/app-vim/uptime/metadata.xml b/app-vim/uptime/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/uptime/metadata.xml
+++ b/app-vim/uptime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vcscommand/metadata.xml b/app-vim/vcscommand/metadata.xml
index a3908f63d553..92f17a877576 100644
--- a/app-vim/vcscommand/metadata.xml
+++ b/app-vim/vcscommand/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 <longdescription lang="en">
 	VIM 7 plugin useful for manipulating files controlled by CVS, SVN, SVK, git,
 	bzr, and hg within VIM, including committing changes and performing diffs
diff --git a/app-vim/vim-latex/metadata.xml b/app-vim/vim-latex/metadata.xml
index 59dc87257b51..7c5a81efb530 100644
--- a/app-vim/vim-latex/metadata.xml
+++ b/app-vim/vim-latex/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
 	<maintainer>
 		<email>ferret@explodingferret.com</email>
 		<description>Please Cc: James Noble (ferret on IRC, not a Gentoo
 			developer) on any bugs related to this package as he knows more
 			about it than me.</description>
 	</maintainer>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 		<flag name="python">Enable python support which can help speed up some functionality</flag>
diff --git a/app-vim/vim-misc/metadata.xml b/app-vim/vim-misc/metadata.xml
index 66b5ce937f97..b5b5f9f4670d 100644
--- a/app-vim/vim-misc/metadata.xml
+++ b/app-vim/vim-misc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xolox/vim-misc</remote-id>
   </upstream>
diff --git a/app-vim/vim-r/metadata.xml b/app-vim/vim-r/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vim-r/metadata.xml
+++ b/app-vim/vim-r/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
index 403686e76ad9..a2939bd6f41d 100644
--- a/app-vim/vim-spell-cs/metadata.xml
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
-	<herd>proxy-maintainers</herd>
 	<!-- Proxy maintainer. Be sure to also CC vim@ on any bugs. -->
 	<maintainer>
 		<email>jkt@gentoo.org</email>
 		<name>Jan Kundrát</name>
 	</maintainer>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Czech (cs). Supported character sets are cp1250,
 		iso-8859-2, and UTF-8.
diff --git a/app-vim/vim-spell-da/metadata.xml b/app-vim/vim-spell-da/metadata.xml
index 9d3dcdc75a32..1019bc17fa46 100644
--- a/app-vim/vim-spell-da/metadata.xml
+++ b/app-vim/vim-spell-da/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Danish (da). Supported character sets are UTF-8,
 		latin-1.
diff --git a/app-vim/vim-spell-de/metadata.xml b/app-vim/vim-spell-de/metadata.xml
index d4c93c7b4ae8..9f9f03903282 100644
--- a/app-vim/vim-spell-de/metadata.xml
+++ b/app-vim/vim-spell-de/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for German (de). Supported character sets are UTF-8
 		and latin-1.
diff --git a/app-vim/vim-spell-el/metadata.xml b/app-vim/vim-spell-el/metadata.xml
index 0adf59aa9aff..e591d42cfeff 100644
--- a/app-vim/vim-spell-el/metadata.xml
+++ b/app-vim/vim-spell-el/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Vim spell files for Greek (el). Supported character sets are UTF-8 and
 		ISO-8859-7.
diff --git a/app-vim/vim-spell-en/metadata.xml b/app-vim/vim-spell-en/metadata.xml
index c80cce16cf45..8144ebd01819 100644
--- a/app-vim/vim-spell-en/metadata.xml
+++ b/app-vim/vim-spell-en/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for English (en). Supported character sets are UTF-8,
 		latin-1 and ASCII.
diff --git a/app-vim/vim-spell-es/metadata.xml b/app-vim/vim-spell-es/metadata.xml
index e7a3bc9baaf3..e32c999d0c7e 100644
--- a/app-vim/vim-spell-es/metadata.xml
+++ b/app-vim/vim-spell-es/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <longdescription lang="en">
     Vim spell files for Spanish (es). Supported character sets are UTF-8 and
     latin1.
diff --git a/app-vim/vim-spell-fr/metadata.xml b/app-vim/vim-spell-fr/metadata.xml
index 03e277596287..bc6dc607770d 100644
--- a/app-vim/vim-spell-fr/metadata.xml
+++ b/app-vim/vim-spell-fr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for French (fr). Supported character sets are UTF-8,
 		latin-1 and ASCII.
diff --git a/app-vim/vim-spell-he/metadata.xml b/app-vim/vim-spell-he/metadata.xml
index 8ec43ac57cce..13b76682e902 100644
--- a/app-vim/vim-spell-he/metadata.xml
+++ b/app-vim/vim-spell-he/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Vim spell files for Hebrew (he). Supported character sets are UTF-8 and
 		ISO-8859-8.
diff --git a/app-vim/vim-spell-hu/metadata.xml b/app-vim/vim-spell-hu/metadata.xml
index 742448c07d57..9c00f84e7b47 100644
--- a/app-vim/vim-spell-hu/metadata.xml
+++ b/app-vim/vim-spell-hu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Vim spell files for Hungarian (hu). Supported character sets are UTF-8,
 		ISO-8859-2 and CP-1250.
diff --git a/app-vim/vim-spell-it/metadata.xml b/app-vim/vim-spell-it/metadata.xml
index 91cd94894971..08bec6b91ef7 100644
--- a/app-vim/vim-spell-it/metadata.xml
+++ b/app-vim/vim-spell-it/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Vim spell files for Italian (it). Supported character sets are UTF-8 and
 		latin1.
diff --git a/app-vim/vim-spell-nl/metadata.xml b/app-vim/vim-spell-nl/metadata.xml
index baa216679bb0..812559630610 100644
--- a/app-vim/vim-spell-nl/metadata.xml
+++ b/app-vim/vim-spell-nl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Dutch (nl). Supported character sets are UTF-8,
 		and latin-1.
diff --git a/app-vim/vim-spell-pl/metadata.xml b/app-vim/vim-spell-pl/metadata.xml
index 5ea8fd8b8f83..1692556f6a81 100644
--- a/app-vim/vim-spell-pl/metadata.xml
+++ b/app-vim/vim-spell-pl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Polish (pl). Supported character sets are UTF-8,
 		ISO-8859-2 and CP1250.
diff --git a/app-vim/vim-spell-pt/metadata.xml b/app-vim/vim-spell-pt/metadata.xml
index 4ffc718da365..de3a6258e213 100644
--- a/app-vim/vim-spell-pt/metadata.xml
+++ b/app-vim/vim-spell-pt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription>
 		Vim spell files for Portuguese (pt). Supported character sets are UTF-8
 		and latin1.
diff --git a/app-vim/vim-spell-ru/metadata.xml b/app-vim/vim-spell-ru/metadata.xml
index c0b306f5efcb..48511844ed86 100644
--- a/app-vim/vim-spell-ru/metadata.xml
+++ b/app-vim/vim-spell-ru/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Russian (ru). Supported character sets are UTF-8,
 		koi8-r and cp1251.
diff --git a/app-vim/vimbuddy/metadata.xml b/app-vim/vimbuddy/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vimbuddy/metadata.xml
+++ b/app-vim/vimbuddy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vimcalc/metadata.xml b/app-vim/vimcalc/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vimcalc/metadata.xml
+++ b/app-vim/vimcalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
index 320a2b6f2cf2..5f92bd3af1f9 100644
--- a/app-vim/vimclojure/metadata.xml
+++ b/app-vim/vimclojure/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim-scripts/VimClojure</remote-id>
 	</upstream>
diff --git a/app-vim/vimcommander/metadata.xml b/app-vim/vimcommander/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vimcommander/metadata.xml
+++ b/app-vim/vimcommander/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vimoutliner/metadata.xml b/app-vim/vimoutliner/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vimoutliner/metadata.xml
+++ b/app-vim/vimoutliner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
index 8bbe5fc28c94..5acd912bffe1 100644
--- a/app-vim/vimpress/metadata.xml
+++ b/app-vim/vimpress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim-scripts/VimRepress</remote-id>
 	</upstream>
diff --git a/app-vim/vimpython/metadata.xml b/app-vim/vimpython/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/vimpython/metadata.xml
+++ b/app-vim/vimpython/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/voom/metadata.xml b/app-vim/voom/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-vim/voom/metadata.xml
+++ b/app-vim/voom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-vim/webapi/metadata.xml b/app-vim/webapi/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-vim/webapi/metadata.xml
+++ b/app-vim/webapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-vim/wikipedia-syntax/metadata.xml b/app-vim/wikipedia-syntax/metadata.xml
index 25d65657c38b..8b1601acc48b 100644
--- a/app-vim/wikipedia-syntax/metadata.xml
+++ b/app-vim/wikipedia-syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides Vim syntax highlighting for Wikipedia
 		files, and automatic filetype detection for these files based upon
diff --git a/app-vim/xquery-syntax/metadata.xml b/app-vim/xquery-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/xquery-syntax/metadata.xml
+++ b/app-vim/xquery-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/xsl-syntax/metadata.xml b/app-vim/xsl-syntax/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/xsl-syntax/metadata.xml
+++ b/app-vim/xsl-syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/yankring/metadata.xml b/app-vim/yankring/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/yankring/metadata.xml
+++ b/app-vim/yankring/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml
index b0eb4c2de986..b0adf6f41223 100644
--- a/app-vim/youcompleteme/metadata.xml
+++ b/app-vim/youcompleteme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<use>
 		<flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
 	</use>
diff --git a/app-vim/zoomwin/metadata.xml b/app-vim/zoomwin/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-vim/zoomwin/metadata.xml
+++ b/app-vim/zoomwin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ada/metadata.xml b/app-xemacs/ada/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ada/metadata.xml
+++ b/app-xemacs/ada/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/apel/metadata.xml b/app-xemacs/apel/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/apel/metadata.xml
+++ b/app-xemacs/apel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/auctex/metadata.xml b/app-xemacs/auctex/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/auctex/metadata.xml
+++ b/app-xemacs/auctex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/bbdb/metadata.xml b/app-xemacs/bbdb/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/bbdb/metadata.xml
+++ b/app-xemacs/bbdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/build/metadata.xml b/app-xemacs/build/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/build/metadata.xml
+++ b/app-xemacs/build/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/c-support/metadata.xml b/app-xemacs/c-support/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/c-support/metadata.xml
+++ b/app-xemacs/c-support/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/calc/metadata.xml b/app-xemacs/calc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/calc/metadata.xml
+++ b/app-xemacs/calc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/calendar/metadata.xml b/app-xemacs/calendar/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/calendar/metadata.xml
+++ b/app-xemacs/calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/cc-mode/metadata.xml b/app-xemacs/cc-mode/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/cc-mode/metadata.xml
+++ b/app-xemacs/cc-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/cedet-common/metadata.xml b/app-xemacs/cedet-common/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/cedet-common/metadata.xml
+++ b/app-xemacs/cedet-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/clearcase/metadata.xml b/app-xemacs/clearcase/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/clearcase/metadata.xml
+++ b/app-xemacs/clearcase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/cogre/metadata.xml b/app-xemacs/cogre/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/cogre/metadata.xml
+++ b/app-xemacs/cogre/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/cookie/metadata.xml b/app-xemacs/cookie/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/cookie/metadata.xml
+++ b/app-xemacs/cookie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/crisp/metadata.xml b/app-xemacs/crisp/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/crisp/metadata.xml
+++ b/app-xemacs/crisp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/debug/metadata.xml b/app-xemacs/debug/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/debug/metadata.xml
+++ b/app-xemacs/debug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/dictionary/metadata.xml b/app-xemacs/dictionary/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/dictionary/metadata.xml
+++ b/app-xemacs/dictionary/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/dired/metadata.xml b/app-xemacs/dired/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/dired/metadata.xml
+++ b/app-xemacs/dired/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/docbookide/metadata.xml b/app-xemacs/docbookide/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/docbookide/metadata.xml
+++ b/app-xemacs/docbookide/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/easypg/metadata.xml b/app-xemacs/easypg/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/easypg/metadata.xml
+++ b/app-xemacs/easypg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ebuild-mode/metadata.xml b/app-xemacs/ebuild-mode/metadata.xml
index 00e0c73ebee0..5d854c460243 100644
--- a/app-xemacs/ebuild-mode/metadata.xml
+++ b/app-xemacs/ebuild-mode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>emacs@gentoo.org</email>
diff --git a/app-xemacs/ecb/metadata.xml b/app-xemacs/ecb/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ecb/metadata.xml
+++ b/app-xemacs/ecb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ecrypto/metadata.xml b/app-xemacs/ecrypto/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ecrypto/metadata.xml
+++ b/app-xemacs/ecrypto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ede/metadata.xml b/app-xemacs/ede/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ede/metadata.xml
+++ b/app-xemacs/ede/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/edebug/metadata.xml b/app-xemacs/edebug/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/edebug/metadata.xml
+++ b/app-xemacs/edebug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/edict/metadata.xml b/app-xemacs/edict/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/edict/metadata.xml
+++ b/app-xemacs/edict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ediff/metadata.xml b/app-xemacs/ediff/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ediff/metadata.xml
+++ b/app-xemacs/ediff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/edit-utils/metadata.xml b/app-xemacs/edit-utils/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/edit-utils/metadata.xml
+++ b/app-xemacs/edit-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/edt/metadata.xml b/app-xemacs/edt/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/edt/metadata.xml
+++ b/app-xemacs/edt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/efs/metadata.xml b/app-xemacs/efs/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/efs/metadata.xml
+++ b/app-xemacs/efs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/egg-its/metadata.xml b/app-xemacs/egg-its/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/egg-its/metadata.xml
+++ b/app-xemacs/egg-its/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/eieio/metadata.xml b/app-xemacs/eieio/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/eieio/metadata.xml
+++ b/app-xemacs/eieio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/elib/metadata.xml b/app-xemacs/elib/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/elib/metadata.xml
+++ b/app-xemacs/elib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/emerge/metadata.xml b/app-xemacs/emerge/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/emerge/metadata.xml
+++ b/app-xemacs/emerge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/erc/metadata.xml b/app-xemacs/erc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/erc/metadata.xml
+++ b/app-xemacs/erc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/escreen/metadata.xml b/app-xemacs/escreen/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/escreen/metadata.xml
+++ b/app-xemacs/escreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/eshell/metadata.xml b/app-xemacs/eshell/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/eshell/metadata.xml
+++ b/app-xemacs/eshell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ess/metadata.xml b/app-xemacs/ess/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ess/metadata.xml
+++ b/app-xemacs/ess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/eudc/metadata.xml b/app-xemacs/eudc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/eudc/metadata.xml
+++ b/app-xemacs/eudc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/footnote/metadata.xml b/app-xemacs/footnote/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/footnote/metadata.xml
+++ b/app-xemacs/footnote/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/forms/metadata.xml b/app-xemacs/forms/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/forms/metadata.xml
+++ b/app-xemacs/forms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/fortran-modes/metadata.xml b/app-xemacs/fortran-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/fortran-modes/metadata.xml
+++ b/app-xemacs/fortran-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/frame-icon/metadata.xml b/app-xemacs/frame-icon/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/frame-icon/metadata.xml
+++ b/app-xemacs/frame-icon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/fsf-compat/metadata.xml b/app-xemacs/fsf-compat/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/fsf-compat/metadata.xml
+++ b/app-xemacs/fsf-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/games/metadata.xml b/app-xemacs/games/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/games/metadata.xml
+++ b/app-xemacs/games/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/general-docs/metadata.xml b/app-xemacs/general-docs/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/general-docs/metadata.xml
+++ b/app-xemacs/general-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/gnats/metadata.xml b/app-xemacs/gnats/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/gnats/metadata.xml
+++ b/app-xemacs/gnats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/gnus/metadata.xml b/app-xemacs/gnus/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/gnus/metadata.xml
+++ b/app-xemacs/gnus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/guided-tour/metadata.xml b/app-xemacs/guided-tour/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/guided-tour/metadata.xml
+++ b/app-xemacs/guided-tour/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/haskell-mode/metadata.xml b/app-xemacs/haskell-mode/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/haskell-mode/metadata.xml
+++ b/app-xemacs/haskell-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/hm-html-menus/metadata.xml b/app-xemacs/hm-html-menus/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/hm-html-menus/metadata.xml
+++ b/app-xemacs/hm-html-menus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/hyperbole/metadata.xml b/app-xemacs/hyperbole/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/hyperbole/metadata.xml
+++ b/app-xemacs/hyperbole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ibuffer/metadata.xml b/app-xemacs/ibuffer/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ibuffer/metadata.xml
+++ b/app-xemacs/ibuffer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/idlwave/metadata.xml b/app-xemacs/idlwave/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/idlwave/metadata.xml
+++ b/app-xemacs/idlwave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/igrep/metadata.xml b/app-xemacs/igrep/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/igrep/metadata.xml
+++ b/app-xemacs/igrep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ilisp/metadata.xml b/app-xemacs/ilisp/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ilisp/metadata.xml
+++ b/app-xemacs/ilisp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/jde/metadata.xml b/app-xemacs/jde/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/jde/metadata.xml
+++ b/app-xemacs/jde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/latin-euro-standards/metadata.xml b/app-xemacs/latin-euro-standards/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/latin-euro-standards/metadata.xml
+++ b/app-xemacs/latin-euro-standards/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/latin-unity/metadata.xml b/app-xemacs/latin-unity/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/latin-unity/metadata.xml
+++ b/app-xemacs/latin-unity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/leim/metadata.xml b/app-xemacs/leim/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/leim/metadata.xml
+++ b/app-xemacs/leim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/locale/metadata.xml b/app-xemacs/locale/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/locale/metadata.xml
+++ b/app-xemacs/locale/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/lookup/metadata.xml b/app-xemacs/lookup/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/lookup/metadata.xml
+++ b/app-xemacs/lookup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mail-lib/metadata.xml b/app-xemacs/mail-lib/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mail-lib/metadata.xml
+++ b/app-xemacs/mail-lib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mailcrypt/metadata.xml b/app-xemacs/mailcrypt/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mailcrypt/metadata.xml
+++ b/app-xemacs/mailcrypt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mew/metadata.xml b/app-xemacs/mew/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mew/metadata.xml
+++ b/app-xemacs/mew/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mh-e/metadata.xml b/app-xemacs/mh-e/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mh-e/metadata.xml
+++ b/app-xemacs/mh-e/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mine/metadata.xml b/app-xemacs/mine/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mine/metadata.xml
+++ b/app-xemacs/mine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/misc-games/metadata.xml b/app-xemacs/misc-games/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/misc-games/metadata.xml
+++ b/app-xemacs/misc-games/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mmm-mode/metadata.xml b/app-xemacs/mmm-mode/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mmm-mode/metadata.xml
+++ b/app-xemacs/mmm-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mule-base/metadata.xml b/app-xemacs/mule-base/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mule-base/metadata.xml
+++ b/app-xemacs/mule-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/mule-ucs/metadata.xml b/app-xemacs/mule-ucs/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/mule-ucs/metadata.xml
+++ b/app-xemacs/mule-ucs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/net-utils/metadata.xml b/app-xemacs/net-utils/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/net-utils/metadata.xml
+++ b/app-xemacs/net-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ocaml/metadata.xml b/app-xemacs/ocaml/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ocaml/metadata.xml
+++ b/app-xemacs/ocaml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/oo-browser/metadata.xml b/app-xemacs/oo-browser/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/oo-browser/metadata.xml
+++ b/app-xemacs/oo-browser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/os-utils/metadata.xml b/app-xemacs/os-utils/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/os-utils/metadata.xml
+++ b/app-xemacs/os-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/pc/metadata.xml b/app-xemacs/pc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/pc/metadata.xml
+++ b/app-xemacs/pc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/pcl-cvs/metadata.xml b/app-xemacs/pcl-cvs/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/pcl-cvs/metadata.xml
+++ b/app-xemacs/pcl-cvs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/pcomplete/metadata.xml b/app-xemacs/pcomplete/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/pcomplete/metadata.xml
+++ b/app-xemacs/pcomplete/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/perl-modes/metadata.xml b/app-xemacs/perl-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/perl-modes/metadata.xml
+++ b/app-xemacs/perl-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/pgg/metadata.xml b/app-xemacs/pgg/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/pgg/metadata.xml
+++ b/app-xemacs/pgg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/prog-modes/metadata.xml b/app-xemacs/prog-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/prog-modes/metadata.xml
+++ b/app-xemacs/prog-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ps-print/metadata.xml b/app-xemacs/ps-print/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ps-print/metadata.xml
+++ b/app-xemacs/ps-print/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/psgml-dtds/metadata.xml b/app-xemacs/psgml-dtds/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/psgml-dtds/metadata.xml
+++ b/app-xemacs/psgml-dtds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/psgml/metadata.xml b/app-xemacs/psgml/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/psgml/metadata.xml
+++ b/app-xemacs/psgml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/python-modes/metadata.xml b/app-xemacs/python-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/python-modes/metadata.xml
+++ b/app-xemacs/python-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/re-builder/metadata.xml b/app-xemacs/re-builder/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/re-builder/metadata.xml
+++ b/app-xemacs/re-builder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/reftex/metadata.xml b/app-xemacs/reftex/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/reftex/metadata.xml
+++ b/app-xemacs/reftex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/riece/metadata.xml b/app-xemacs/riece/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/riece/metadata.xml
+++ b/app-xemacs/riece/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/rmail/metadata.xml b/app-xemacs/rmail/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/rmail/metadata.xml
+++ b/app-xemacs/rmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/ruby-modes/metadata.xml b/app-xemacs/ruby-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/ruby-modes/metadata.xml
+++ b/app-xemacs/ruby-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sasl/metadata.xml b/app-xemacs/sasl/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sasl/metadata.xml
+++ b/app-xemacs/sasl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/scheme/metadata.xml b/app-xemacs/scheme/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/scheme/metadata.xml
+++ b/app-xemacs/scheme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/semantic/metadata.xml b/app-xemacs/semantic/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/semantic/metadata.xml
+++ b/app-xemacs/semantic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sgml/metadata.xml b/app-xemacs/sgml/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sgml/metadata.xml
+++ b/app-xemacs/sgml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sh-script/metadata.xml b/app-xemacs/sh-script/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sh-script/metadata.xml
+++ b/app-xemacs/sh-script/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sieve/metadata.xml b/app-xemacs/sieve/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sieve/metadata.xml
+++ b/app-xemacs/sieve/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/skk/metadata.xml b/app-xemacs/skk/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/skk/metadata.xml
+++ b/app-xemacs/skk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/slider/metadata.xml b/app-xemacs/slider/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/slider/metadata.xml
+++ b/app-xemacs/slider/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sml-mode/metadata.xml b/app-xemacs/sml-mode/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sml-mode/metadata.xml
+++ b/app-xemacs/sml-mode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sounds-au/metadata.xml b/app-xemacs/sounds-au/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sounds-au/metadata.xml
+++ b/app-xemacs/sounds-au/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sounds-wav/metadata.xml b/app-xemacs/sounds-wav/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sounds-wav/metadata.xml
+++ b/app-xemacs/sounds-wav/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/speedbar/metadata.xml b/app-xemacs/speedbar/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/speedbar/metadata.xml
+++ b/app-xemacs/speedbar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/strokes/metadata.xml b/app-xemacs/strokes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/strokes/metadata.xml
+++ b/app-xemacs/strokes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/sun/metadata.xml b/app-xemacs/sun/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/sun/metadata.xml
+++ b/app-xemacs/sun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/supercite/metadata.xml b/app-xemacs/supercite/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/supercite/metadata.xml
+++ b/app-xemacs/supercite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/texinfo/metadata.xml b/app-xemacs/texinfo/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/texinfo/metadata.xml
+++ b/app-xemacs/texinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/text-modes/metadata.xml b/app-xemacs/text-modes/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/text-modes/metadata.xml
+++ b/app-xemacs/text-modes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/textools/metadata.xml b/app-xemacs/textools/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/textools/metadata.xml
+++ b/app-xemacs/textools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/time/metadata.xml b/app-xemacs/time/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/time/metadata.xml
+++ b/app-xemacs/time/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/tm/metadata.xml b/app-xemacs/tm/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/tm/metadata.xml
+++ b/app-xemacs/tm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/tooltalk/metadata.xml b/app-xemacs/tooltalk/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/tooltalk/metadata.xml
+++ b/app-xemacs/tooltalk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/tpu/metadata.xml b/app-xemacs/tpu/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/tpu/metadata.xml
+++ b/app-xemacs/tpu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/tramp/metadata.xml b/app-xemacs/tramp/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/tramp/metadata.xml
+++ b/app-xemacs/tramp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/vc-cc/metadata.xml b/app-xemacs/vc-cc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/vc-cc/metadata.xml
+++ b/app-xemacs/vc-cc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/vc/metadata.xml b/app-xemacs/vc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/vc/metadata.xml
+++ b/app-xemacs/vc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/vhdl/metadata.xml b/app-xemacs/vhdl/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/vhdl/metadata.xml
+++ b/app-xemacs/vhdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/view-process/metadata.xml b/app-xemacs/view-process/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/view-process/metadata.xml
+++ b/app-xemacs/view-process/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/viper/metadata.xml b/app-xemacs/viper/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/viper/metadata.xml
+++ b/app-xemacs/viper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/vm/metadata.xml b/app-xemacs/vm/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/vm/metadata.xml
+++ b/app-xemacs/vm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/w3/metadata.xml b/app-xemacs/w3/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/w3/metadata.xml
+++ b/app-xemacs/w3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/x-symbol/metadata.xml b/app-xemacs/x-symbol/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/x-symbol/metadata.xml
+++ b/app-xemacs/x-symbol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-base/metadata.xml b/app-xemacs/xemacs-base/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xemacs-base/metadata.xml
+++ b/app-xemacs/xemacs-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-devel/metadata.xml b/app-xemacs/xemacs-devel/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xemacs-devel/metadata.xml
+++ b/app-xemacs/xemacs-devel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-eterm/metadata.xml b/app-xemacs/xemacs-eterm/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xemacs-eterm/metadata.xml
+++ b/app-xemacs/xemacs-eterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-ispell/metadata.xml b/app-xemacs/xemacs-ispell/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xemacs-ispell/metadata.xml
+++ b/app-xemacs/xemacs-ispell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-packages-all/metadata.xml b/app-xemacs/xemacs-packages-all/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xemacs-packages-all/metadata.xml
+++ b/app-xemacs/xemacs-packages-all/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xetla/metadata.xml b/app-xemacs/xetla/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xetla/metadata.xml
+++ b/app-xemacs/xetla/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xlib/metadata.xml b/app-xemacs/xlib/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xlib/metadata.xml
+++ b/app-xemacs/xlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xslide/metadata.xml b/app-xemacs/xslide/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xslide/metadata.xml
+++ b/app-xemacs/xslide/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xslt-process/metadata.xml b/app-xemacs/xslt-process/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xslt-process/metadata.xml
+++ b/app-xemacs/xslt-process/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xwem/metadata.xml b/app-xemacs/xwem/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/xwem/metadata.xml
+++ b/app-xemacs/xwem/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/zenirc/metadata.xml b/app-xemacs/zenirc/metadata.xml
index 298888916608..68b35ec351b5 100644
--- a/app-xemacs/zenirc/metadata.xml
+++ b/app-xemacs/zenirc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xemacs</herd>
+  <maintainer>
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ada/adadoc/metadata.xml b/dev-ada/adadoc/metadata.xml
index bc732e4a3a2f..aacfcc3c52ff 100644
--- a/dev-ada/adadoc/metadata.xml
+++ b/dev-ada/adadoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ada</herd>
+	<maintainer>
+		<email>ada@gentoo.org</email>
+		<name>Gentoo Resources for Ada</name>
+	</maintainer>
 	<longdescription>AdaDoc is a tool for developers using the Ada95 programming language. It's goal is to create documentation in different format from a specification package.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">adadoc</remote-id>
diff --git a/dev-ada/adasockets/metadata.xml b/dev-ada/adasockets/metadata.xml
index e56a62e823d9..b977f92633aa 100644
--- a/dev-ada/adasockets/metadata.xml
+++ b/dev-ada/adasockets/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>AdaSockets is a set of free software Ada packages allowing Ada programmers to use the so-called BSD sockets from their favourite programming language. AdaSockets has been designed and tested with the GNAT free software Ada compiler, but should be portable to other compilers quite easily. AdaSockets philosophy is to help the Ada programmer by providing easy-to-use objects. Special care has been taken to ensure that performances do however remain good.</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/asis-gcc/metadata.xml b/dev-ada/asis-gcc/metadata.xml
index 8d559acbcee6..93069f019b8d 100644
--- a/dev-ada/asis-gcc/metadata.xml
+++ b/dev-ada/asis-gcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ada</herd>
+	<maintainer>
+		<email>ada@gentoo.org</email>
+		<name>Gentoo Resources for Ada</name>
+	</maintainer>
 	<longdescription>
 	Ada Semantic Interface Specification is a published international ISO 
 	standard (ISO/IEC 15291:1999). ASIS represents a compiler independent 
diff --git a/dev-ada/asis-gpl/metadata.xml b/dev-ada/asis-gpl/metadata.xml
index c352257de3bd..881bc332e811 100644
--- a/dev-ada/asis-gpl/metadata.xml
+++ b/dev-ada/asis-gpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>
 	Ada Semantic Interface Specification is a published international ISO 
 	standard (ISO/IEC 15291:1999). ASIS represents a compiler independent 
diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml
index 83f771493132..b13e43f60077 100644
--- a/dev-ada/aunit/metadata.xml
+++ b/dev-ada/aunit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It's intended as a developer's tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/booch_components/metadata.xml b/dev-ada/booch_components/metadata.xml
index 0e86180028f1..8de3964773af 100644
--- a/dev-ada/booch_components/metadata.xml
+++ b/dev-ada/booch_components/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ada</herd>
+	<maintainer>
+		<email>ada@gentoo.org</email>
+		<name>Gentoo Resources for Ada</name>
+	</maintainer>
 	<longdescription>The booch components provide a set of reusable components used in an efficient and appropriate manner, with the overall goal of balancing usability and extensibility. The BCs cover several issues: Time and Space semantics, Storage Management policies, Exception and Idioms for iteration.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">booch95</remote-id>
diff --git a/dev-ada/cbind/metadata.xml b/dev-ada/cbind/metadata.xml
index 045c2c55d0f4..ddd4fea232af 100644
--- a/dev-ada/cbind/metadata.xml
+++ b/dev-ada/cbind/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>This tool is designed to AID in the creation of Ada bindings to C. Bindings generated by this translator will be generally not be complete. This tool MAY/MAY NOT be useful as an AID to generating bindings.  Hopefully it can do a lot of the grunt work for you.</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/charles/metadata.xml b/dev-ada/charles/metadata.xml
index c589105f804a..684c21567fa2 100644
--- a/dev-ada/charles/metadata.xml
+++ b/dev-ada/charles/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>Charles is a data structure library for Ada95, modelled principally on the C++ STL. It features both ordered (lists and arrays) and unordered (sets and maps) collections. In addition to lists and vectors, the Charles library has set, multi-set, map, and multi-map data structure types.</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/florist/metadata.xml b/dev-ada/florist/metadata.xml
index 2a8540864847..fd74beb7eee6 100644
--- a/dev-ada/florist/metadata.xml
+++ b/dev-ada/florist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ada</herd>
+	<maintainer>
+		<email>ada@gentoo.org</email>
+		<name>Gentoo Resources for Ada</name>
+	</maintainer>
 	<longdescription>
 		Florist is the (F)lorida (S)tate (U)niversity open-source implementaton 
 		of IEEE Standard 1003.5b-1996, the POSIX Ada binding, including real-time 
diff --git a/dev-ada/glade/metadata.xml b/dev-ada/glade/metadata.xml
index aec150231c3f..faafba5cf197 100644
--- a/dev-ada/glade/metadata.xml
+++ b/dev-ada/glade/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index bc1d9dd433a6..755e977d28be 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>GtkAda is the technology that lets you implement the next generation of Ada 95 GUIs in an efficient and platform-independent manner. In addition to providing over 100 widgets and allowing you to use portable low-level drawing primitives, GtkAda has a pluggable look-and-feel and comes with a high-level GUI builder that allows round-trip GUI generation and update.</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 66f2f1fc397f..807a4b32883d 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>XML/Ada includes a complete XML parser that fully supports the XML 1.0 specifications, including DTDs, entity resolution, external entities,attribute normalization, and conditional sections. XML/Ada also supports the SAX 2.0 standard. Through an object-oriented Ada interface, the XML/Ada SAX implementation provides an extremely efficient way to convert XML streams to application-specific data representations. XML/Ada includes full support for the core part of DOM 2.0. In addition to this XML support, XML/Ada includes an extensive set of packages to read, manipulate and write Unicode streams, in various encodings like UTF-8, UTF-16 and UTF-32. It provides a conversion mechanism between Unicode and encodings such as Latin-1, Latin-2, etc.</longdescription>
 </pkgmetadata>
diff --git a/dev-cpp/antlr-cpp/metadata.xml b/dev-cpp/antlr-cpp/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-cpp/antlr-cpp/metadata.xml
+++ b/dev-cpp/antlr-cpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/asio/metadata.xml b/dev-cpp/asio/metadata.xml
index 2668b42f0ada..e2d662ee72bb 100644
--- a/dev-cpp/asio/metadata.xml
+++ b/dev-cpp/asio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">asio</remote-id>
 	</upstream>
diff --git a/dev-cpp/atkmm/metadata.xml b/dev-cpp/atkmm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/atkmm/metadata.xml
+++ b/dev-cpp/atkmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/cairomm/metadata.xml b/dev-cpp/cairomm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/cairomm/metadata.xml
+++ b/dev-cpp/cairomm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/clucene/metadata.xml b/dev-cpp/clucene/metadata.xml
index feff5816db29..1dede1bbfede 100644
--- a/dev-cpp/clucene/metadata.xml
+++ b/dev-cpp/clucene/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">clucene</remote-id>
 	</upstream>
diff --git a/dev-cpp/commoncpp2/metadata.xml b/dev-cpp/commoncpp2/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-cpp/commoncpp2/metadata.xml
+++ b/dev-cpp/commoncpp2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/ctemplate/metadata.xml b/dev-cpp/ctemplate/metadata.xml
index 2b4f08135671..573b06b7e570 100644
--- a/dev-cpp/ctemplate/metadata.xml
+++ b/dev-cpp/ctemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">google-ctemplate</remote-id>
 		<remote-id type="github">olafvdspek/ctemplate</remote-id>
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index c5aa60e0b27d..4eeff125b465 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription>
 		Eigen is a lightweight C++ template library for vector and matrix math,
 		a.k.a. linear algebra. Unlike most other linear algebra libraries, Eigen
diff --git a/dev-cpp/gccxml/metadata.xml b/dev-cpp/gccxml/metadata.xml
index bc97bb6ee207..12928f4f589c 100644
--- a/dev-cpp/gccxml/metadata.xml
+++ b/dev-cpp/gccxml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/gconfmm/metadata.xml b/dev-cpp/gconfmm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/gconfmm/metadata.xml
+++ b/dev-cpp/gconfmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/glibmm/metadata.xml b/dev-cpp/glibmm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/glibmm/metadata.xml
+++ b/dev-cpp/glibmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index fcf6c17cbcb3..11ff2aeb0648 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)</flag>
diff --git a/dev-cpp/gnome-vfsmm/metadata.xml b/dev-cpp/gnome-vfsmm/metadata.xml
index 8fc59a318320..d27adefecf34 100644
--- a/dev-cpp/gnome-vfsmm/metadata.xml
+++ b/dev-cpp/gnome-vfsmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-mm</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/gstreamermm/metadata.xml b/dev-cpp/gstreamermm/metadata.xml
index a8318defd95d..a11da666bd14 100644
--- a/dev-cpp/gstreamermm/metadata.xml
+++ b/dev-cpp/gstreamermm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-mm</herd>
   <maintainer>
     <email>eva@gentoo.org</email>
     <name>Gilles Dartiguelongue</name>
   </maintainer>
+<maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/gtkglextmm/metadata.xml b/dev-cpp/gtkglextmm/metadata.xml
index d8abd0a8270d..9f0aa705356d 100644
--- a/dev-cpp/gtkglextmm/metadata.xml
+++ b/dev-cpp/gtkglextmm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-mm</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkglext</remote-id>
 	</upstream>
diff --git a/dev-cpp/gtkmm-utils/metadata.xml b/dev-cpp/gtkmm-utils/metadata.xml
index e0575fef69e4..9417c8e15e6c 100644
--- a/dev-cpp/gtkmm-utils/metadata.xml
+++ b/dev-cpp/gtkmm-utils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>dominik.kriegner+gentoo@gmail.com</email>
 <name>Dominik Kriegner</name>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-cpp/gtkmm/metadata.xml b/dev-cpp/gtkmm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/gtkmm/metadata.xml
+++ b/dev-cpp/gtkmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/gtksourceviewmm/metadata.xml b/dev-cpp/gtksourceviewmm/metadata.xml
index cd895ab226be..360d118616a4 100644
--- a/dev-cpp/gtksourceviewmm/metadata.xml
+++ b/dev-cpp/gtksourceviewmm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-mm</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
     Gtkmm (C++) wrapper for gtksourceview
   </longdescription>
diff --git a/dev-cpp/libbinio/metadata.xml b/dev-cpp/libbinio/metadata.xml
index 4b4b0b04ad21..22a703b973a4 100644
--- a/dev-cpp/libbinio/metadata.xml
+++ b/dev-cpp/libbinio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libbinio</remote-id>
 	</upstream>
diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml
index 148e9f05d97a..5678434f43a0 100644
--- a/dev-cpp/libcmis/metadata.xml
+++ b/dev-cpp/libcmis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="man">Build and install man pages.</flag>
 	</use>
diff --git a/dev-cpp/libglademm/metadata.xml b/dev-cpp/libglademm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/libglademm/metadata.xml
+++ b/dev-cpp/libglademm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/libgnomecanvasmm/metadata.xml b/dev-cpp/libgnomecanvasmm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/libgnomecanvasmm/metadata.xml
+++ b/dev-cpp/libgnomecanvasmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/libgnomemm/metadata.xml b/dev-cpp/libgnomemm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/libgnomemm/metadata.xml
+++ b/dev-cpp/libgnomemm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/libgnomeuimm/metadata.xml b/dev-cpp/libgnomeuimm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/libgnomeuimm/metadata.xml
+++ b/dev-cpp/libgnomeuimm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/libmcpp/metadata.xml b/dev-cpp/libmcpp/metadata.xml
index 980da83dc135..b1f7b87a26d8 100644
--- a/dev-cpp/libmcpp/metadata.xml
+++ b/dev-cpp/libmcpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mcpp</remote-id>
 	</upstream>
diff --git a/dev-cpp/libxmlpp/metadata.xml b/dev-cpp/libxmlpp/metadata.xml
index 22b19f928ec2..1b63bc36f063 100644
--- a/dev-cpp/libxmlpp/metadata.xml
+++ b/dev-cpp/libxmlpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-mm</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libxmlplusplus</remote-id>
 	</upstream>
diff --git a/dev-cpp/mm-common/metadata.xml b/dev-cpp/mm-common/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/mm-common/metadata.xml
+++ b/dev-cpp/mm-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/muParser/metadata.xml b/dev-cpp/muParser/metadata.xml
index fca7b76f20e2..71af01c98f42 100644
--- a/dev-cpp/muParser/metadata.xml
+++ b/dev-cpp/muParser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   muParser is a C++ library for mathematical expression parsing.
   It is based on transforming an expression into a bytecode and
diff --git a/dev-cpp/pangomm/metadata.xml b/dev-cpp/pangomm/metadata.xml
index 57c9d9c1a1d8..fe3dc94b2bcd 100644
--- a/dev-cpp/pangomm/metadata.xml
+++ b/dev-cpp/pangomm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-mm</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/pngpp/metadata.xml b/dev-cpp/pngpp/metadata.xml
index 7ad27a2ced99..151ff93482ed 100644
--- a/dev-cpp/pngpp/metadata.xml
+++ b/dev-cpp/pngpp/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
-<herd>cpp</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/pstreams/metadata.xml b/dev-cpp/pstreams/metadata.xml
index c25d9a43d844..b31562023d21 100644
--- a/dev-cpp/pstreams/metadata.xml
+++ b/dev-cpp/pstreams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pstreams</remote-id>
 	</upstream>
diff --git a/dev-cpp/rudiments/metadata.xml b/dev-cpp/rudiments/metadata.xml
index 2bf2ef878f3a..afb8b9f5b3eb 100644
--- a/dev-cpp/rudiments/metadata.xml
+++ b/dev-cpp/rudiments/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription>
 		Rudiments is an Open Source C++ class library providing base classes
 		for things such as daemons, clients and servers, and wrapper classes
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index 55bed68d5a62..40c0934c54e3 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sparsehash/sparsehash</remote-id>
 	</upstream>
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index d9d21c8a6ebc..0aedbcf25d0a 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Intel Threading Building Blocks is a library that helps you
   leverage multi-core processor performance without having to be a
diff --git a/dev-cpp/tree/metadata.xml b/dev-cpp/tree/metadata.xml
index 457a56288ad9..cd8e5dc9c6ab 100644
--- a/dev-cpp/tree/metadata.xml
+++ b/dev-cpp/tree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   The tree.hh library for C++ provides an STL-like container class for
   n-ary trees, templated over the data stored at the nodes. Various
diff --git a/dev-db/apgdiff/metadata.xml b/dev-db/apgdiff/metadata.xml
index bd7fbc012add..410ca8d6fa4e 100644
--- a/dev-db/apgdiff/metadata.xml
+++ b/dev-db/apgdiff/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>java@gentoo.org</email>
   </maintainer>
diff --git a/dev-db/bucardo/metadata.xml b/dev-db/bucardo/metadata.xml
index d06e452b35af..59ee6494b165 100644
--- a/dev-db/bucardo/metadata.xml
+++ b/dev-db/bucardo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/ctdb/metadata.xml b/dev-db/ctdb/metadata.xml
index 587dabd73f1d..36f98ffb31b9 100644
--- a/dev-db/ctdb/metadata.xml
+++ b/dev-db/ctdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/datadraw/metadata.xml b/dev-db/datadraw/metadata.xml
index 8adb8b41992f..0a354ab52a9d 100644
--- a/dev-db/datadraw/metadata.xml
+++ b/dev-db/datadraw/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd> 
 <maintainer>
 	<email>xmw@gentoo.org</email>
 	<name>Michael Weber</name>
 </maintainer>
+<maintainer>
+	<email>sci-electronics@gentoo.org</email>
+	<name>Gentoo Electronics Project</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">datadraw</remote-id>
 </upstream>
diff --git a/dev-db/db-je/metadata.xml b/dev-db/db-je/metadata.xml
index 00f569801896..6aa9f5bd1de3 100644
--- a/dev-db/db-je/metadata.xml
+++ b/dev-db/db-je/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-<herd>java</herd>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/dbmodel/metadata.xml b/dev-db/dbmodel/metadata.xml
index 28176899696a..665fef6d8cd4 100644
--- a/dev-db/dbmodel/metadata.xml
+++ b/dev-db/dbmodel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml
index ed2cb0bbc5fa..f59a123de951 100644
--- a/dev-db/drizzle/metadata.xml
+++ b/dev-db/drizzle/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pavel.stratil-jun@fenix.cz</email>
 		<description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="doc">
       Build the API documentation for the package, using
diff --git a/dev-db/haildb/metadata.xml b/dev-db/haildb/metadata.xml
index 7a25688345ec..085242ce4e8b 100644
--- a/dev-db/haildb/metadata.xml
+++ b/dev-db/haildb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pavel.stratil-jun@fenix.cz</email>
 		<description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="zlib">
       Add support for compressed tables through
diff --git a/dev-db/henplus/metadata.xml b/dev-db/henplus/metadata.xml
index 8b2106471033..7e12a1c6ba82 100644
--- a/dev-db/henplus/metadata.xml
+++ b/dev-db/henplus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">henplus</remote-id>
 	</upstream>
diff --git a/dev-db/hsqldb/metadata.xml b/dev-db/hsqldb/metadata.xml
index 6e04a17bee48..c0eac617cb53 100644
--- a/dev-db/hsqldb/metadata.xml
+++ b/dev-db/hsqldb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hsqldb</remote-id>
 	</upstream>
diff --git a/dev-db/innotop/metadata.xml b/dev-db/innotop/metadata.xml
index 667f2932477e..e279a5dd1b77 100644
--- a/dev-db/innotop/metadata.xml
+++ b/dev-db/innotop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<longdescription>innotop - A text-mode MySQL and InnoDB monitor like mytop,
 but with many more features</longdescription>
 	<upstream>
diff --git a/dev-db/kyotocabinet/metadata.xml b/dev-db/kyotocabinet/metadata.xml
index 35319898fd0a..9553dc8701ee 100644
--- a/dev-db/kyotocabinet/metadata.xml
+++ b/dev-db/kyotocabinet/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
@@ -10,4 +9,8 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/libodbc++/metadata.xml b/dev-db/libodbc++/metadata.xml
index 9dcf9557004e..a206a043f4ae 100644
--- a/dev-db/libodbc++/metadata.xml
+++ b/dev-db/libodbc++/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libodbcxx</remote-id>
 	</upstream>
diff --git a/dev-db/libzdb/metadata.xml b/dev-db/libzdb/metadata.xml
index 89be866c29bc..015265d5b02a 100644
--- a/dev-db/libzdb/metadata.xml
+++ b/dev-db/libzdb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
         <email>lordvan@gentoo.org</email>
  	<name>Thomas Raschbacher</name>
@@ -11,4 +10,8 @@
  	<name>Johan Bergström</name>
 	<description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
+<maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-db/lmdb/metadata.xml b/dev-db/lmdb/metadata.xml
index 1a92abe90e01..7a9acb01231d 100644
--- a/dev-db/lmdb/metadata.xml
+++ b/dev-db/lmdb/metadata.xml
@@ -4,11 +4,14 @@
 	<longdescription lang="en">
 	An ultra-fast, ultra-compact key-value embedded data store
 </longdescription>
-	<herd>ldap</herd>
 	<maintainer>
 		<email>eras@gentoo.org</email>
 		<name>Eray Aslan</name>
 	</maintainer>
+	<maintainer>
+		<email>ldap-bugs@gentoo.org</email>
+		<name>Gentoo LDAP Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">LMDB/lmdb</remote-id>
 	</upstream>
diff --git a/dev-db/m17n-contrib/metadata.xml b/dev-db/m17n-contrib/metadata.xml
index 04dbcb713d95..e20fe447b987 100644
--- a/dev-db/m17n-contrib/metadata.xml
+++ b/dev-db/m17n-contrib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <longdescription lang="en">
 The m17n-contrib is a collection of contributed works to be used with the m17n library.
 </longdescription>
diff --git a/dev-db/m17n-db/metadata.xml b/dev-db/m17n-db/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-db/m17n-db/metadata.xml
+++ b/dev-db/m17n-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index fbb57c9b6695..2cd0253670c2 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-  <maintainer restrict="dev-db/mariadb-galera[libressl]">
+<maintainer restrict="dev-db/mariadb-galera[libressl]">
     <email>hasufell@gentoo.org</email>
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
+<maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index f7f488f6a5e0..124d69fa8056 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-  <maintainer restrict="dev-db/mariadb[libressl]">
+<maintainer restrict="dev-db/mariadb[libressl]">
     <email>hasufell@gentoo.org</email>
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else</description>
   </maintainer>
+<maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
diff --git a/dev-db/maxscale/metadata.xml b/dev-db/maxscale/metadata.xml
index 8def2a61ae60..ab24da28a7f9 100644
--- a/dev-db/maxscale/metadata.xml
+++ b/dev-db/maxscale/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
 	<maintainer>
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<use>
 		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
 		<flag name="rabbitmq">Add support for RabbitMQ message queue</flag>
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index d8ed9c9e2fbb..49ea05f60309 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -11,6 +10,10 @@
         <name>Lujeni</name>
         <description>Proxy-Maintainer, assign bugs</description>
     </maintainer>
+	<maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
 	<longdescription lang="en">
 	MongoDB (from "humongous") is a scalable, high-performance, open source,
 	schema-free, document-oriented database. Written in C++, MongoDB features:
diff --git a/dev-db/mtop/metadata.xml b/dev-db/mtop/metadata.xml
index 69b243a45bee..a5c755ffa4e3 100644
--- a/dev-db/mtop/metadata.xml
+++ b/dev-db/mtop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mtop</remote-id>
 	</upstream>
diff --git a/dev-db/mydumper/metadata.xml b/dev-db/mydumper/metadata.xml
index 5ff5cf8ca05f..d104d21d2a4c 100644
--- a/dev-db/mydumper/metadata.xml
+++ b/dev-db/mydumper/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pavel.stratil-jun@fenix.cz</email>
 		<description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">mydumper</remote-id>
 	</upstream>
diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml
index 716e7d4301bd..54aafedc6395 100644
--- a/dev-db/myodbc/metadata.xml
+++ b/dev-db/myodbc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql++/metadata.xml b/dev-db/mysql++/metadata.xml
index 716e7d4301bd..54aafedc6395 100644
--- a/dev-db/mysql++/metadata.xml
+++ b/dev-db/mysql++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index dda993e244ee..116cb4157499 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-  <maintainer restrict="dev-db/mysql[libressl]">
+<maintainer restrict="dev-db/mysql[libressl]">
     <email>hasufell@gentoo.org</email>
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
+<maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 <use>
   <flag name="cluster">Add support for NDB clustering</flag>
   <flag name="community">Enables the community features from upstream.</flag>
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
index 8e07201afa17..8d7529150ffb 100644
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-<herd>proxy-maintainers</herd>
 <use>
 <flag name="gcov">Build coverage support</flag>
 </use>
@@ -11,4 +9,12 @@
 		<name>Ian Delnaeny</name>
 		<description>Maintainer / developer</description>
 	</maintainer>
+<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql-connector-c/metadata.xml b/dev-db/mysql-connector-c/metadata.xml
index eada17468398..07dc43977587 100644
--- a/dev-db/mysql-connector-c/metadata.xml
+++ b/dev-db/mysql-connector-c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 <use>
 </use>
 </pkgmetadata>
diff --git a/dev-db/mysql-init-scripts/metadata.xml b/dev-db/mysql-init-scripts/metadata.xml
index abf3529deac0..905d230c9b61 100644
--- a/dev-db/mysql-init-scripts/metadata.xml
+++ b/dev-db/mysql-init-scripts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql-super-smack/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
index 51ac8e7be178..a82b6cee2daa 100644
--- a/dev-db/mysql-super-smack/metadata.xml
+++ b/dev-db/mysql-super-smack/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mysql</herd>
     <maintainer><email>robbat2@gentoo.org</email></maintainer>
+<maintainer>
+<email>mysql-bugs@gentoo.org</email>
+<name>MySQL</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index d8a250945304..e37529d0579b 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-  <maintainer restrict="dev-db/mysql[libressl]">
+<maintainer restrict="dev-db/mysql[libressl]">
     <email>hasufell@gentoo.org</email>
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
+<maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
diff --git a/dev-db/mytop/metadata.xml b/dev-db/mytop/metadata.xml
index 716e7d4301bd..54aafedc6395 100644
--- a/dev-db/mytop/metadata.xml
+++ b/dev-db/mytop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index 428ebf0e09b8..2989b400ef67 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-  <maintainer restrict="dev-db/percona-server[libressl]">
+<maintainer restrict="dev-db/percona-server[libressl]">
     <email>hasufell@gentoo.org</email>
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
+<maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 <use>
   <flag name="client-libs">Build the libmysqlclient libraries</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
diff --git a/dev-db/percona-toolkit/metadata.xml b/dev-db/percona-toolkit/metadata.xml
index 1e00b85e5e96..95ff5d93ec78 100644
--- a/dev-db/percona-toolkit/metadata.xml
+++ b/dev-db/percona-toolkit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<longdescription>Percona Toolkit, formerly Maatkit and Aspersa, formerly MySQL Toolkit,
 		is a collection of command-line utilities that provide missing
 		functionality for MySQL. Some of the tools implement lacking server
diff --git a/dev-db/pg_top/metadata.xml b/dev-db/pg_top/metadata.xml
index da90b399c13e..0d39c74f210c 100644
--- a/dev-db/pg_top/metadata.xml
+++ b/dev-db/pg_top/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 	<longdescription lang="en">
 		pg_top is 'top' for PostgreSQL. It is derived from Unix Top. Similar to
 		top, pg_top allows you to monitor PostgreSQL processes.
diff --git a/dev-db/pgadmin3/metadata.xml b/dev-db/pgadmin3/metadata.xml
index 2de04e68c028..57db50aa6c87 100644
--- a/dev-db/pgadmin3/metadata.xml
+++ b/dev-db/pgadmin3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+	<email>pgsql-bugs@gentoo.org</email>
+	<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 <use>
 	<flag name="databasedesigner">Enable the Database Designer component</flag>
 </use>
diff --git a/dev-db/pgagent/metadata.xml b/dev-db/pgagent/metadata.xml
index adf45800ffea..418e10cba8b9 100644
--- a/dev-db/pgagent/metadata.xml
+++ b/dev-db/pgagent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>postgresql</herd>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/dev-db/pgbadger/metadata.xml b/dev-db/pgbadger/metadata.xml
index 53749dd60425..21c56651013e 100644
--- a/dev-db/pgbadger/metadata.xml
+++ b/dev-db/pgbadger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pgbadger</remote-id>
 	</upstream>
diff --git a/dev-db/pgbouncer/metadata.xml b/dev-db/pgbouncer/metadata.xml
index f9bdcdbde21a..c21520fdbab3 100644
--- a/dev-db/pgbouncer/metadata.xml
+++ b/dev-db/pgbouncer/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>postgresql</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>bugs@bergstroem.nu</email>
         <name>Johan Bergström</name>
@@ -12,6 +10,14 @@
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="libevent">Use libevent 2.0+ and evdns as the DNS backend</flag>
         <flag name="udns">Use udns as the DNS backend. Supports IPv4 only.</flag>
diff --git a/dev-db/pgmemcache/metadata.xml b/dev-db/pgmemcache/metadata.xml
index bccdfddea398..61ae7e298756 100644
--- a/dev-db/pgmemcache/metadata.xml
+++ b/dev-db/pgmemcache/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
@@ -10,6 +9,10 @@
     <email>bugs@bergstroem.nu</email>
     <name>Johan Bergström</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ohmu/pgmemcache</remote-id>
   </upstream>
diff --git a/dev-db/pgpool2/metadata.xml b/dev-db/pgpool2/metadata.xml
index 9cfd4b91cdf6..6bb73bd0db4b 100644
--- a/dev-db/pgpool2/metadata.xml
+++ b/dev-db/pgpool2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>postgresql</herd>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
     <use>
         <flag name="memcached">Use memcached for query caching.</flag>
     </use>
diff --git a/dev-db/pgrouting/metadata.xml b/dev-db/pgrouting/metadata.xml
index fb3e2b441365..02a8e623ac55 100644
--- a/dev-db/pgrouting/metadata.xml
+++ b/dev-db/pgrouting/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
+  <maintainer>
+    <email>pgsql-bugs@gentoo.org</email>
+    <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
   <use>
     <flag name="html">Install HTML formatted documentation</flag>
     <flag name="drivingdistance">Enable to calculate driving distance</flag>
diff --git a/dev-db/pgtap/metadata.xml b/dev-db/pgtap/metadata.xml
index a674b19eabe6..ffbdf8e44809 100644
--- a/dev-db/pgtap/metadata.xml
+++ b/dev-db/pgtap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>postgresql</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
     <longdescription>
         pgTAP is a suite of database functions that make it easy to write
         TAP-emitting unit tests in psql scripts or xUnit-style test functions.
diff --git a/dev-db/pgxnclient/metadata.xml b/dev-db/pgxnclient/metadata.xml
index 0c269f078c8d..55710a249a3d 100644
--- a/dev-db/pgxnclient/metadata.xml
+++ b/dev-db/pgxnclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer>
+    <email>pgsql-bugs@gentoo.org</email>
+    <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pgxnclient</remote-id>
   </upstream>
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index 7bb697a7b342..35b91e2517c7 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>jmbsvicetto@gentoo.org</email>
 		<name>Jorge Manuel B. S. Vicetto</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="setup">
 			Installs the phpMyAdmin setup utility.
diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
index 4afb70d53bc4..6c3be7cc1a83 100644
--- a/dev-db/phppgadmin/metadata.xml
+++ b/dev-db/phppgadmin/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">phppgadmin</remote-id>
 	</upstream>
diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 59080cd96a27..2417931efb9b 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+  <email>pgsql-bugs@gentoo.org</email>
+  <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
+  <maintainer>
+  <email>sci-geosciences@gentoo.org</email>
+  <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
 	<flag name="gtk">Build shp2pgsql-gui a graphical interface to shp2pgsql</flag>
   </use>
diff --git a/dev-db/postgresql/metadata.xml b/dev-db/postgresql/metadata.xml
index 8fb6d0f32735..70334a0c9eed 100644
--- a/dev-db/postgresql/metadata.xml
+++ b/dev-db/postgresql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>postgresql</herd>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
     <use>
         <flag name="pg_legacytimestamp">
             Use double precision floating-point numbers instead of 64-bit
diff --git a/dev-db/psqlodbc/metadata.xml b/dev-db/psqlodbc/metadata.xml
index c3c59cf97d21..2c341842833e 100644
--- a/dev-db/psqlodbc/metadata.xml
+++ b/dev-db/psqlodbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>postgresql</herd>
+<maintainer>
+<email>pgsql-bugs@gentoo.org</email>
+<name>PostgreSQL and Related Package Development</name>
+</maintainer>
 <use>
 <flag name="iodbc">Use dev-db/libiodbc. Disable to use dev-db/unixODBC.</flag>
 </use>
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 9caf77d78a24..765edcc2c99d 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>ultrabug@gentoo.org</email>
   </maintainer>
@@ -16,6 +15,10 @@
     <name>Johan Bergström</name>
     <description>Proxy-Maintainer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="jemalloc">
       Use <pkg>dev-libs/jemalloc</pkg> for allocations.
diff --git a/dev-db/slony1/metadata.xml b/dev-db/slony1/metadata.xml
index d06e452b35af..59ee6494b165 100644
--- a/dev-db/slony1/metadata.xml
+++ b/dev-db/slony1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/spatialite-tools/metadata.xml b/dev-db/spatialite-tools/metadata.xml
index 3190fbf9c377..203359d7bee8 100644
--- a/dev-db/spatialite-tools/metadata.xml
+++ b/dev-db/spatialite-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/spatialite/metadata.xml b/dev-db/spatialite/metadata.xml
index adbecd756dc2..f683e46f74f2 100644
--- a/dev-db/spatialite/metadata.xml
+++ b/dev-db/spatialite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+	</maintainer>
 <use>
 	<flag name="geos">Add the <pkg>sci-libs/geos</pkg> library for exact topological tests</flag>
 	<flag name="proj">Add the <pkg>sci-libs/proj</pkg> library for reprojection features</flag>
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index 6a4f9ebb84ed..3d823760221d 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -5,7 +5,10 @@
     <email>arfrever.fta@gmail.com</email>
     <name>Arfrever Frehtes Taifersar Arahesis</name>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
     <flag name="tools">Install additional tools</flag>
diff --git a/dev-db/sqliteman/metadata.xml b/dev-db/sqliteman/metadata.xml
index 1bc81746bcdc..af9386339137 100644
--- a/dev-db/sqliteman/metadata.xml
+++ b/dev-db/sqliteman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sqliteman</remote-id>
 	</upstream>
diff --git a/dev-db/textsearch_ja/metadata.xml b/dev-db/textsearch_ja/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-db/textsearch_ja/metadata.xml
+++ b/dev-db/textsearch_ja/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml
index 9155cc041873..c4c5584a2a55 100644
--- a/dev-db/tora/metadata.xml
+++ b/dev-db/tora/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
@@ -10,6 +9,10 @@
 		<email>haubi@gentoo.org</email>
 		<name>Michael Haubenwallner</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	TOra is a Toolkit for Oracle which aims to help the DBA or developer of
 	database application. Features PL/SQL debugger, SQL worksheet with syntax
diff --git a/dev-db/wxsqlite3/metadata.xml b/dev-db/wxsqlite3/metadata.xml
index 2ce3d00ae9f4..7799f0055c13 100644
--- a/dev-db/wxsqlite3/metadata.xml
+++ b/dev-db/wxsqlite3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wxcode</remote-id>
 	</upstream>
diff --git a/dev-dotnet/art-sharp/metadata.xml b/dev-dotnet/art-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/art-sharp/metadata.xml
+++ b/dev-dotnet/art-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/atk-sharp/metadata.xml b/dev-dotnet/atk-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/atk-sharp/metadata.xml
+++ b/dev-dotnet/atk-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/dbus-sharp-glib/metadata.xml b/dev-dotnet/dbus-sharp-glib/metadata.xml
index 4bfc7f9f6c3f..aa855d422e7b 100644
--- a/dev-dotnet/dbus-sharp-glib/metadata.xml
+++ b/dev-dotnet/dbus-sharp-glib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mono/dbus-sharp</remote-id>
   </upstream>
diff --git a/dev-dotnet/dbus-sharp/metadata.xml b/dev-dotnet/dbus-sharp/metadata.xml
index 4bfc7f9f6c3f..aa855d422e7b 100644
--- a/dev-dotnet/dbus-sharp/metadata.xml
+++ b/dev-dotnet/dbus-sharp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mono/dbus-sharp</remote-id>
   </upstream>
diff --git a/dev-dotnet/flickrnet-bin/metadata.xml b/dev-dotnet/flickrnet-bin/metadata.xml
index d35e9300c540..b578be7f7b36 100644
--- a/dev-dotnet/flickrnet-bin/metadata.xml
+++ b/dev-dotnet/flickrnet-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gconf-sharp/metadata.xml b/dev-dotnet/gconf-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gconf-sharp/metadata.xml
+++ b/dev-dotnet/gconf-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gdk-sharp/metadata.xml b/dev-dotnet/gdk-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gdk-sharp/metadata.xml
+++ b/dev-dotnet/gdk-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gio-sharp/metadata.xml b/dev-dotnet/gio-sharp/metadata.xml
index 41b167255777..c3a941049b90 100644
--- a/dev-dotnet/gio-sharp/metadata.xml
+++ b/dev-dotnet/gio-sharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mono/gio-sharp</remote-id>
   </upstream>
diff --git a/dev-dotnet/gkeyfile-sharp/metadata.xml b/dev-dotnet/gkeyfile-sharp/metadata.xml
index de3b398a7b73..666ec2aee6e5 100644
--- a/dev-dotnet/gkeyfile-sharp/metadata.xml
+++ b/dev-dotnet/gkeyfile-sharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mono/gkeyfile-sharp</remote-id>
 		<remote-id type="launchpad">gkeyfile-sharp</remote-id>
diff --git a/dev-dotnet/glade-sharp/metadata.xml b/dev-dotnet/glade-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/glade-sharp/metadata.xml
+++ b/dev-dotnet/glade-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/glib-sharp/metadata.xml b/dev-dotnet/glib-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/glib-sharp/metadata.xml
+++ b/dev-dotnet/glib-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gnome-desktop-sharp/metadata.xml b/dev-dotnet/gnome-desktop-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gnome-desktop-sharp/metadata.xml
+++ b/dev-dotnet/gnome-desktop-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gnome-keyring-sharp/metadata.xml b/dev-dotnet/gnome-keyring-sharp/metadata.xml
index 7bc9c3374745..13cf144d97ad 100644
--- a/dev-dotnet/gnome-keyring-sharp/metadata.xml
+++ b/dev-dotnet/gnome-keyring-sharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mono/gnome-keyring-sharp</remote-id>
   </upstream>
diff --git a/dev-dotnet/gnome-sharp/metadata.xml b/dev-dotnet/gnome-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gnome-sharp/metadata.xml
+++ b/dev-dotnet/gnome-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gnomevfs-sharp/metadata.xml b/dev-dotnet/gnomevfs-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gnomevfs-sharp/metadata.xml
+++ b/dev-dotnet/gnomevfs-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/google-gdata-sharp/metadata.xml b/dev-dotnet/google-gdata-sharp/metadata.xml
index 73e8fe36697b..9092a8bfe902 100644
--- a/dev-dotnet/google-gdata-sharp/metadata.xml
+++ b/dev-dotnet/google-gdata-sharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">google-gdata</remote-id>
 	</upstream>
diff --git a/dev-dotnet/gsf-sharp/metadata.xml b/dev-dotnet/gsf-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gsf-sharp/metadata.xml
+++ b/dev-dotnet/gsf-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gtk-dotnet-sharp/metadata.xml b/dev-dotnet/gtk-dotnet-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gtk-dotnet-sharp/metadata.xml
+++ b/dev-dotnet/gtk-dotnet-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gtk-sharp-beans/metadata.xml b/dev-dotnet/gtk-sharp-beans/metadata.xml
index 5265352950f3..e8342c5fc512 100644
--- a/dev-dotnet/gtk-sharp-beans/metadata.xml
+++ b/dev-dotnet/gtk-sharp-beans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mono/gtk-sharp-beans</remote-id>
   </upstream>
diff --git a/dev-dotnet/gtk-sharp-docs/metadata.xml b/dev-dotnet/gtk-sharp-docs/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gtk-sharp-docs/metadata.xml
+++ b/dev-dotnet/gtk-sharp-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gtk-sharp-gapi/metadata.xml b/dev-dotnet/gtk-sharp-gapi/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gtk-sharp-gapi/metadata.xml
+++ b/dev-dotnet/gtk-sharp-gapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gtk-sharp/metadata.xml b/dev-dotnet/gtk-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gtk-sharp/metadata.xml
+++ b/dev-dotnet/gtk-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gtksourceview-sharp/metadata.xml b/dev-dotnet/gtksourceview-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/gtksourceview-sharp/metadata.xml
+++ b/dev-dotnet/gtksourceview-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/gudev-sharp/metadata.xml b/dev-dotnet/gudev-sharp/metadata.xml
index b07825d32d99..d8437ccc68c7 100644
--- a/dev-dotnet/gudev-sharp/metadata.xml
+++ b/dev-dotnet/gudev-sharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gudev-sharp</remote-id>
 	</upstream>
diff --git a/dev-dotnet/ikvm-bin/metadata.xml b/dev-dotnet/ikvm-bin/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/ikvm-bin/metadata.xml
+++ b/dev-dotnet/ikvm-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/ikvm/metadata.xml b/dev-dotnet/ikvm/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/ikvm/metadata.xml
+++ b/dev-dotnet/ikvm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/libgdiplus/metadata.xml b/dev-dotnet/libgdiplus/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/libgdiplus/metadata.xml
+++ b/dev-dotnet/libgdiplus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/log4net/metadata.xml b/dev-dotnet/log4net/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-dotnet/log4net/metadata.xml
+++ b/dev-dotnet/log4net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/mono-addins/metadata.xml b/dev-dotnet/mono-addins/metadata.xml
index ab1e40984daa..38e55d8d6bd4 100644
--- a/dev-dotnet/mono-addins/metadata.xml
+++ b/dev-dotnet/mono-addins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mono/mono-addins</remote-id>
 	</upstream>
diff --git a/dev-dotnet/mono-nat/metadata.xml b/dev-dotnet/mono-nat/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/mono-nat/metadata.xml
+++ b/dev-dotnet/mono-nat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/mono-zeroconf/metadata.xml b/dev-dotnet/mono-zeroconf/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/mono-zeroconf/metadata.xml
+++ b/dev-dotnet/mono-zeroconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/monocalendar/metadata.xml b/dev-dotnet/monocalendar/metadata.xml
index 19daf93693a9..fcec0b71228d 100644
--- a/dev-dotnet/monocalendar/metadata.xml
+++ b/dev-dotnet/monocalendar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">monocalendar</remote-id>
 	</upstream>
diff --git a/dev-dotnet/monotorrent/metadata.xml b/dev-dotnet/monotorrent/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/monotorrent/metadata.xml
+++ b/dev-dotnet/monotorrent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/nant/metadata.xml b/dev-dotnet/nant/metadata.xml
index d7a65d2bb5e9..d1ba2f51e7f9 100644
--- a/dev-dotnet/nant/metadata.xml
+++ b/dev-dotnet/nant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nant</remote-id>
 	</upstream>
diff --git a/dev-dotnet/ndesk-dbus-glib/metadata.xml b/dev-dotnet/ndesk-dbus-glib/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-dotnet/ndesk-dbus-glib/metadata.xml
+++ b/dev-dotnet/ndesk-dbus-glib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/ndesk-dbus/metadata.xml b/dev-dotnet/ndesk-dbus/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-dotnet/ndesk-dbus/metadata.xml
+++ b/dev-dotnet/ndesk-dbus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/nini/metadata.xml b/dev-dotnet/nini/metadata.xml
index 1b0dff51915c..ef20230cb14d 100644
--- a/dev-dotnet/nini/metadata.xml
+++ b/dev-dotnet/nini/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A .NET configuration library
 	</longdescription>
diff --git a/dev-dotnet/notify-sharp/metadata.xml b/dev-dotnet/notify-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/notify-sharp/metadata.xml
+++ b/dev-dotnet/notify-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/nuget/metadata.xml b/dev-dotnet/nuget/metadata.xml
index 5225f5cd7ed4..b0ef70407650 100644
--- a/dev-dotnet/nuget/metadata.xml
+++ b/dev-dotnet/nuget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <use>
   </use>
   <upstream>
diff --git a/dev-dotnet/pango-sharp/metadata.xml b/dev-dotnet/pango-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/pango-sharp/metadata.xml
+++ b/dev-dotnet/pango-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/pe-format/metadata.xml b/dev-dotnet/pe-format/metadata.xml
index c4626c89da13..e4976c718572 100644
--- a/dev-dotnet/pe-format/metadata.xml
+++ b/dev-dotnet/pe-format/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
   <maintainer>
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>mgorny@gentoo.org</email>
diff --git a/dev-dotnet/rsvg-sharp/metadata.xml b/dev-dotnet/rsvg-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/rsvg-sharp/metadata.xml
+++ b/dev-dotnet/rsvg-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/smartirc4net/metadata.xml b/dev-dotnet/smartirc4net/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/smartirc4net/metadata.xml
+++ b/dev-dotnet/smartirc4net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/taglib-sharp/metadata.xml b/dev-dotnet/taglib-sharp/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-dotnet/taglib-sharp/metadata.xml
+++ b/dev-dotnet/taglib-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/vte-sharp/metadata.xml b/dev-dotnet/vte-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/vte-sharp/metadata.xml
+++ b/dev-dotnet/vte-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/webkit-sharp/metadata.xml b/dev-dotnet/webkit-sharp/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-dotnet/webkit-sharp/metadata.xml
+++ b/dev-dotnet/webkit-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/wnck-sharp/metadata.xml b/dev-dotnet/wnck-sharp/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/dev-dotnet/wnck-sharp/metadata.xml
+++ b/dev-dotnet/wnck-sharp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-dotnet/xdt-for-monodevelop/metadata.xml b/dev-dotnet/xdt-for-monodevelop/metadata.xml
index a50adc63439a..8fdf629eca85 100644
--- a/dev-dotnet/xdt-for-monodevelop/metadata.xml
+++ b/dev-dotnet/xdt-for-monodevelop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <use>
   </use>
   <upstream>
diff --git a/dev-dotnet/xsp/metadata.xml b/dev-dotnet/xsp/metadata.xml
index c264edab779b..f32b4a8b94a6 100644
--- a/dev-dotnet/xsp/metadata.xml
+++ b/dev-dotnet/xsp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		XSP is a standalone web server written in C# that can be used to run
 		your ASP.NET applications.
diff --git a/dev-dotnet/zeitgeist-sharp/metadata.xml b/dev-dotnet/zeitgeist-sharp/metadata.xml
index 7276aaf46626..2b8148c328e4 100644
--- a/dev-dotnet/zeitgeist-sharp/metadata.xml
+++ b/dev-dotnet/zeitgeist-sharp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">zeitgeist-sharp</remote-id>
 	</upstream>
diff --git a/dev-embedded/arduino/metadata.xml b/dev-embedded/arduino/metadata.xml
index 70282d0d7284..930aff50e119 100644
--- a/dev-embedded/arduino/metadata.xml
+++ b/dev-embedded/arduino/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
 	<maintainer>
 		<email>miknix@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/avarice/metadata.xml b/dev-embedded/avarice/metadata.xml
index 884fee636149..90384a641b2b 100644
--- a/dev-embedded/avarice/metadata.xml
+++ b/dev-embedded/avarice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">avarice</remote-id>
 	</upstream>
diff --git a/dev-embedded/avr-libc/metadata.xml b/dev-embedded/avr-libc/metadata.xml
index cc92317f8819..23014de90730 100644
--- a/dev-embedded/avr-libc/metadata.xml
+++ b/dev-embedded/avr-libc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 		This package is part of the avr- binutils, -gcc, -lib toolchain for the Atmel microcontrollers.
 		These ebuilds have been created and submitted by Scott L. Price (dflytech.com).
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index a4645995f39e..c26761cefd0c 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>raxas@pavouk-v-rohu.net</email>
 		<name>Petr Kocmid</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Assembler for Atmel AVR microprocessors
 	</longdescription>
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index f84fa0502dc5..480749f3439d 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+	</maintainer>
 <use>
  <flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 </use>
diff --git a/dev-embedded/bitbake/metadata.xml b/dev-embedded/bitbake/metadata.xml
index 5db9f42b508d..96bc506efadb 100644
--- a/dev-embedded/bitbake/metadata.xml
+++ b/dev-embedded/bitbake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>embedded</herd>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">openembedded/bitbake</remote-id>
   </upstream>
diff --git a/dev-embedded/dc-tool-ip/metadata.xml b/dev-embedded/dc-tool-ip/metadata.xml
index 9d638b815e71..93ebdf37e08e 100644
--- a/dev-embedded/dc-tool-ip/metadata.xml
+++ b/dev-embedded/dc-tool-ip/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
 	<maintainer>
 		<email>sh@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cadcdev</remote-id>
 	</upstream>
diff --git a/dev-embedded/dfu-programmer/metadata.xml b/dev-embedded/dfu-programmer/metadata.xml
index 59eaedb921de..3149cf0bee68 100644
--- a/dev-embedded/dfu-programmer/metadata.xml
+++ b/dev-embedded/dfu-programmer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
 	<maintainer>
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dfu-programmer</remote-id>
 	</upstream>
diff --git a/dev-embedded/ftdi_eeprom/metadata.xml b/dev-embedded/ftdi_eeprom/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/ftdi_eeprom/metadata.xml
+++ b/dev-embedded/ftdi_eeprom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/gnome-avrdude/metadata.xml b/dev-embedded/gnome-avrdude/metadata.xml
index a0883f5ea252..07331c68115c 100644
--- a/dev-embedded/gnome-avrdude/metadata.xml
+++ b/dev-embedded/gnome-avrdude/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
 	<maintainer>
 		<email>calchan@gentoo.org</email>
 		<name>Denis Dupeyron</name>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 		gnome-avrdude is a GNOME graphical user interface (GUI) for the command-line 
 		Atmel AVR microcontroller programming software avrdude
diff --git a/dev-embedded/gnusim8085/metadata.xml b/dev-embedded/gnusim8085/metadata.xml
index 11f8bc9daa48..60ad9691092e 100644
--- a/dev-embedded/gnusim8085/metadata.xml
+++ b/dev-embedded/gnusim8085/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gnusim8085</remote-id>
 	</upstream>
diff --git a/dev-embedded/gpsim/metadata.xml b/dev-embedded/gpsim/metadata.xml
index 8529ed2ba5e9..ca96c264354a 100644
--- a/dev-embedded/gpsim/metadata.xml
+++ b/dev-embedded/gpsim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gpsim</remote-id>
 	</upstream>
diff --git a/dev-embedded/gputils/metadata.xml b/dev-embedded/gputils/metadata.xml
index cec11dbd208c..9950c7a5fbe2 100644
--- a/dev-embedded/gputils/metadata.xml
+++ b/dev-embedded/gputils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gputils</remote-id>
 	</upstream>
diff --git a/dev-embedded/icdprog/metadata.xml b/dev-embedded/icdprog/metadata.xml
index 8984bd587205..b6903c73bd1f 100644
--- a/dev-embedded/icdprog/metadata.xml
+++ b/dev-embedded/icdprog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>ICDPROG is a simple command line programmer for Microchip PIC
     controllers, using the Microchip ICD (in circuit debugger)
     hardware.</longdescription>
diff --git a/dev-embedded/include/metadata.xml b/dev-embedded/include/metadata.xml
index 4e6d8fe4e4b9..2d5b74f6b2d8 100644
--- a/dev-embedded/include/metadata.xml
+++ b/dev-embedded/include/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openwince</remote-id>
 	</upstream>
diff --git a/dev-embedded/jal/metadata.xml b/dev-embedded/jal/metadata.xml
index b67c99424dab..b566af9862c2 100644
--- a/dev-embedded/jal/metadata.xml
+++ b/dev-embedded/jal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 Jal is a high-level language for a number of Microchip (TM) PIC microcontrollers (16c84, 16f84, 12c508, 
 12c509, 16F877) and Ubicom SX (SX18 and SX28) microcontrollers
diff --git a/dev-embedded/jtag/metadata.xml b/dev-embedded/jtag/metadata.xml
index 4e6d8fe4e4b9..2d5b74f6b2d8 100644
--- a/dev-embedded/jtag/metadata.xml
+++ b/dev-embedded/jtag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openwince</remote-id>
 	</upstream>
diff --git a/dev-embedded/kobs-ng/metadata.xml b/dev-embedded/kobs-ng/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/kobs-ng/metadata.xml
+++ b/dev-embedded/kobs-ng/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/libdisasm/metadata.xml b/dev-embedded/libdisasm/metadata.xml
index 232bff48bfa8..b258afcd0566 100644
--- a/dev-embedded/libdisasm/metadata.xml
+++ b/dev-embedded/libdisasm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/dev-embedded/libftd2xx/metadata.xml b/dev-embedded/libftd2xx/metadata.xml
index 11dd73f4383c..baf25cf1dd0e 100644
--- a/dev-embedded/libftd2xx/metadata.xml
+++ b/dev-embedded/libftd2xx/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>brendan@horan.hk</email>
 	<name>Brendan Horan</name>
 	<description>Proxy maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/libftdi/metadata.xml b/dev-embedded/libftdi/metadata.xml
index 4b1fd3f632a9..f8e983401a98 100644
--- a/dev-embedded/libftdi/metadata.xml
+++ b/dev-embedded/libftdi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="tools">build ftdi_eeprom helper tool</flag>
 </use>
diff --git a/dev-embedded/libjaylink/metadata.xml b/dev-embedded/libjaylink/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/libjaylink/metadata.xml
+++ b/dev-embedded/libjaylink/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/mspdebug/metadata.xml b/dev-embedded/mspdebug/metadata.xml
index 0980c89b175f..49b42d76a102 100644
--- a/dev-embedded/mspdebug/metadata.xml
+++ b/dev-embedded/mspdebug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 		MSPDebug is a free debugger for use with MSP430 MCUs. It supports
 		FET430UIF, eZ430, RF2500, and Olimex MSP-JTAG-TINY programmers. It can be
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index b1823e2c1b06..b0f694b3a1f4 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
 	<maintainer>
 		<email>fercerpav@gmail.com</email>
 		<name>Paul Fertser</name>
 		<description>Upstream contact. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<use>
 		<flag name="blaster">Enable support for Altera USE-Blaster</flag>
 		<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
diff --git a/dev-embedded/parapin/metadata.xml b/dev-embedded/parapin/metadata.xml
index 55bc20922fa6..11f0cf91462c 100644
--- a/dev-embedded/parapin/metadata.xml
+++ b/dev-embedded/parapin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 Parapin makes it easy to write C code under Linux that controls individual pins on a PC parallel port. This kind of control is very useful for 
 electronics projects that use the PC's parallel port as a generic digital I/O interface. Parapin goes to great lengths to insulate the programmer 
diff --git a/dev-embedded/picasm/metadata.xml b/dev-embedded/picasm/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/picasm/metadata.xml
+++ b/dev-embedded/picasm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/picp/metadata.xml b/dev-embedded/picp/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/picp/metadata.xml
+++ b/dev-embedded/picp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/picprog/metadata.xml b/dev-embedded/picprog/metadata.xml
index 0f33447143fb..3ca2e0dc6243 100644
--- a/dev-embedded/picprog/metadata.xml
+++ b/dev-embedded/picprog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 <longdescription>a pic16xxx series microcontroller programmer software for the simple serial port 
 device</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/pista/metadata.xml b/dev-embedded/pista/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/pista/metadata.xml
+++ b/dev-embedded/pista/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/pk2-la/metadata.xml b/dev-embedded/pk2-la/metadata.xml
index 6fcfa4473b0f..e330799c19a2 100644
--- a/dev-embedded/pk2-la/metadata.xml
+++ b/dev-embedded/pk2-la/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
 	<longdescription>
 		pk2-la allows the Microchip PICkit2 programmer to be used as a
 		Logic Analyzer and I/O Probe.
@@ -10,6 +9,10 @@
 		<email>josejx@gentoo.org</email>
 		<name>Joseph Jezak</name>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pk2-la</remote-id>
 	</upstream>
diff --git a/dev-embedded/pk2cmd/metadata.xml b/dev-embedded/pk2cmd/metadata.xml
index f7475d97d9f8..3dea7cb36a7a 100644
--- a/dev-embedded/pk2cmd/metadata.xml
+++ b/dev-embedded/pk2cmd/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
 <maintainer>
   <email>josejx@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>embedded@gentoo.org</email>
+  <name>Embedded Gentoo</name>
+</maintainer>
 <longdescription lang="en">
 This application allows the use of the PICKit2 PIC programming device.
 </longdescription>
diff --git a/dev-embedded/ponyprog/metadata.xml b/dev-embedded/ponyprog/metadata.xml
index 2556689d33b3..eca9c38408ce 100644
--- a/dev-embedded/ponyprog/metadata.xml
+++ b/dev-embedded/ponyprog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ponyprog</remote-id>
 	</upstream>
diff --git a/dev-embedded/scratchbox-devkit-apt-https/metadata.xml b/dev-embedded/scratchbox-devkit-apt-https/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-apt-https/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-apt-https/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-cputransp/metadata.xml b/dev-embedded/scratchbox-devkit-cputransp/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-cputransp/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-cputransp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml b/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
index 8b648753b935..6bfc2738c3d9 100644
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-debian/metadata.xml b/dev-embedded/scratchbox-devkit-debian/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-debian/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-debian/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-doctools/metadata.xml b/dev-embedded/scratchbox-devkit-doctools/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-doctools/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-doctools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-git/metadata.xml b/dev-embedded/scratchbox-devkit-git/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-git/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-git/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-maemo3/metadata.xml b/dev-embedded/scratchbox-devkit-maemo3/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-maemo3/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-maemo3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-perl/metadata.xml b/dev-embedded/scratchbox-devkit-perl/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-perl/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-qemu/metadata.xml b/dev-embedded/scratchbox-devkit-qemu/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox-devkit-qemu/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-qemu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-svn/metadata.xml b/dev-embedded/scratchbox-devkit-svn/metadata.xml
index 8b648753b935..6bfc2738c3d9 100644
--- a/dev-embedded/scratchbox-devkit-svn/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-svn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox/metadata.xml b/dev-embedded/scratchbox/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/scratchbox/metadata.xml
+++ b/dev-embedded/scratchbox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/scratchbox2/metadata.xml b/dev-embedded/scratchbox2/metadata.xml
index 8b648753b935..6bfc2738c3d9 100644
--- a/dev-embedded/scratchbox2/metadata.xml
+++ b/dev-embedded/scratchbox2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index e52e1f4e24a9..ceaa33cb5b2f 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other microprocessors.
 	</longdescription>
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml
+++ b/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml
+++ b/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml
+++ b/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/smdk-dltool/metadata.xml b/dev-embedded/smdk-dltool/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/smdk-dltool/metadata.xml
+++ b/dev-embedded/smdk-dltool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/srecord/metadata.xml b/dev-embedded/srecord/metadata.xml
index e137ef85a62e..d19fa986cd24 100644
--- a/dev-embedded/srecord/metadata.xml
+++ b/dev-embedded/srecord/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<longdescription>
 The SRecord package is a collection of powerful tools for manipulating EPROM load files.
 </longdescription>
diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
index 895895d88a85..ca51fa9051ae 100644
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
 	<maintainer>
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linux-sunxi/sunxi-tools</remote-id>
 	</upstream>
diff --git a/dev-embedded/tavrasm/metadata.xml b/dev-embedded/tavrasm/metadata.xml
index a217d236ec3d..27dd36968d66 100644
--- a/dev-embedded/tavrasm/metadata.xml
+++ b/dev-embedded/tavrasm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/tigcc/metadata.xml b/dev-embedded/tigcc/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/tigcc/metadata.xml
+++ b/dev-embedded/tigcc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/u-boot-tools/metadata.xml
+++ b/dev-embedded/u-boot-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/uisp/metadata.xml b/dev-embedded/uisp/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/uisp/metadata.xml
+++ b/dev-embedded/uisp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/upslug2/metadata.xml b/dev-embedded/upslug2/metadata.xml
index 581cfc473675..8545aeef77b3 100644
--- a/dev-embedded/upslug2/metadata.xml
+++ b/dev-embedded/upslug2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
-	<herd>arm</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<maintainer>
+		<email>arm@gentoo.org</email>
+		<name>Gentoo Linux ARM Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nslu</remote-id>
 	</upstream>
diff --git a/dev-embedded/urjtag/metadata.xml b/dev-embedded/urjtag/metadata.xml
index 4089bd78e371..cf8dd00bab1a 100644
--- a/dev-embedded/urjtag/metadata.xml
+++ b/dev-embedded/urjtag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<use>
 		<flag name="ftd2xx">Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
diff --git a/dev-embedded/usbprog/metadata.xml b/dev-embedded/usbprog/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-embedded/usbprog/metadata.xml
+++ b/dev-embedded/usbprog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/KXL/metadata.xml b/dev-games/KXL/metadata.xml
index d5af03e3e537..5f249a4d506b 100644
--- a/dev-games/KXL/metadata.xml
+++ b/dev-games/KXL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 KXL is the library developed for the purpose of the ability to develop a 
 game easily on X Window System of Linux.
diff --git a/dev-games/cardpics/metadata.xml b/dev-games/cardpics/metadata.xml
index 2e7008ed7a14..6dbeea954a83 100644
--- a/dev-games/cardpics/metadata.xml
+++ b/dev-games/cardpics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 cardpics is a set of free cards sets.
 
diff --git a/dev-games/cegui/metadata.xml b/dev-games/cegui/metadata.xml
index db363de0cf16..95af9e112635 100644
--- a/dev-games/cegui/metadata.xml
+++ b/dev-games/cegui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="devil">Build the DevIL based ImageCodec module</flag>
 		<flag name="freeimage">Build the FreeImage based ImageCodec module</flag>
diff --git a/dev-games/clanlib/metadata.xml b/dev-games/clanlib/metadata.xml
index 741984228bd1..bcda09b1a3d9 100644
--- a/dev-games/clanlib/metadata.xml
+++ b/dev-games/clanlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Welcome to ClanLib, a multi-platform game development library.
 
diff --git a/dev-games/crystalspace/metadata.xml b/dev-games/crystalspace/metadata.xml
index eb8bc207ec7d..68ef21a789da 100644
--- a/dev-games/crystalspace/metadata.xml
+++ b/dev-games/crystalspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 Crystal Space is a free (LGPL) and portable 3D Game 
 Development Kit written in C++. It supports: true six degrees 
diff --git a/dev-games/etrophy/metadata.xml b/dev-games/etrophy/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-games/etrophy/metadata.xml
+++ b/dev-games/etrophy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/flatzebra/metadata.xml b/dev-games/flatzebra/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-games/flatzebra/metadata.xml
+++ b/dev-games/flatzebra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/flinker/metadata.xml b/dev-games/flinker/metadata.xml
index 084eec06ea85..cfc7dee135d3 100644
--- a/dev-games/flinker/metadata.xml
+++ b/dev-games/flinker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Here's a dos/linux program (with src) that allows you program a Visoly flash 
 cart (up to 50% faster than official software) or an official Nintendo flash 
diff --git a/dev-games/goatee/metadata.xml b/dev-games/goatee/metadata.xml
index 9288a81d788c..df803b7b2a41 100644
--- a/dev-games/goatee/metadata.xml
+++ b/dev-games/goatee/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Goatee is a Go library and game editor, written in Haskell.  It provides a
 		GUI for recording, studying, and editing game records.  Underneath this is a
diff --git a/dev-games/gtkradiant/metadata.xml b/dev-games/gtkradiant/metadata.xml
index a60b58e3b519..597a8ba92fa3 100644
--- a/dev-games/gtkradiant/metadata.xml
+++ b/dev-games/gtkradiant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 GtkRadiant is a level editor supporting multiple games and mods: Quake III Arena, Quake III: Team Arena, Quake III Arena modifications, Return To Castle Wolfenstein, Jedi Knight II: Jedi Outcast, Soldier Of Fortune II, Star Trek Voyager: Elite Force.
 </longdescription>
diff --git a/dev-games/guichan/metadata.xml b/dev-games/guichan/metadata.xml
index a5b09267e1d5..139de33ff391 100644
--- a/dev-games/guichan/metadata.xml
+++ b/dev-games/guichan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="allegro">Build the Allegro frontend</flag>
 	</use>
diff --git a/dev-games/hawknl/metadata.xml b/dev-games/hawknl/metadata.xml
index 4042a5659691..ce98506851e6 100644
--- a/dev-games/hawknl/metadata.xml
+++ b/dev-games/hawknl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 HawkNL is a free, open source, game oriented network API released under 
 the GNU Library General Public License (LGPL). HawkNL (NL) is a fairly 
diff --git a/dev-games/hdl_dump/metadata.xml b/dev-games/hdl_dump/metadata.xml
index ea461f64c94c..46252e5bb59d 100644
--- a/dev-games/hdl_dump/metadata.xml
+++ b/dev-games/hdl_dump/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/higan-ananke/metadata.xml b/dev-games/higan-ananke/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/dev-games/higan-ananke/metadata.xml
+++ b/dev-games/higan-ananke/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-games/hlsdk/metadata.xml b/dev-games/hlsdk/metadata.xml
index 27c6e20fac25..e5d2b050ae64 100644
--- a/dev-games/hlsdk/metadata.xml
+++ b/dev-games/hlsdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Half-Life SDK
 
diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml
index 3d46e569143f..fbb8f5fadf40 100644
--- a/dev-games/irrlicht/metadata.xml
+++ b/dev-games/irrlicht/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 The Irrlicht Engine is an open source high performance realtime 3D engine written in 
 C++. It is completely cross-platform, using D3D, OpenGL and its own software renderer, 
diff --git a/dev-games/libmaitretarot/metadata.xml b/dev-games/libmaitretarot/metadata.xml
index 2f38e8cffd22..0fc8d25aeb77 100644
--- a/dev-games/libmaitretarot/metadata.xml
+++ b/dev-games/libmaitretarot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 MaitreTarot is a Tarot card game. Understand a game like freecell or poker, 
 nothing to do with astrology. Tarot is rather a French game.
diff --git a/dev-games/libmt_client/metadata.xml b/dev-games/libmt_client/metadata.xml
index 2f38e8cffd22..0fc8d25aeb77 100644
--- a/dev-games/libmt_client/metadata.xml
+++ b/dev-games/libmt_client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 MaitreTarot is a Tarot card game. Understand a game like freecell or poker, 
 nothing to do with astrology. Tarot is rather a French game.
diff --git a/dev-games/libnw/metadata.xml b/dev-games/libnw/metadata.xml
index a27672f6f2c9..9f307dc432f2 100644
--- a/dev-games/libnw/metadata.xml
+++ b/dev-games/libnw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 libnw - libnw's aim is to provide platform-independent routines for the low- and 
 mid-level manipulation of NWN resources, as members of game data files, modules, hak 
diff --git a/dev-games/mercator/metadata.xml b/dev-games/mercator/metadata.xml
index 000ad0149523..1074c9b8627e 100644
--- a/dev-games/mercator/metadata.xml
+++ b/dev-games/mercator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Mercator is primarily aimed at terrain for multiplayer online games and forms
 one of the WorldForge core libraries. It is intended to be used as a terrain
diff --git a/dev-games/mygui/metadata.xml b/dev-games/mygui/metadata.xml
index f52d405a6880..8b9ba74cc604 100644
--- a/dev-games/mygui/metadata.xml
+++ b/dev-games/mygui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>altren@list.ru</email>
diff --git a/dev-games/newton/metadata.xml b/dev-games/newton/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-games/newton/metadata.xml
+++ b/dev-games/newton/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/ode/metadata.xml b/dev-games/ode/metadata.xml
index 0c0888501ff7..a325e808f70a 100644
--- a/dev-games/ode/metadata.xml
+++ b/dev-games/ode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 ODE is a free, industrial quality library for simulating articulated rigid body
 dynamics - for example ground vehicles, legged creatures, and moving objects in
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 06a7f9a559c8..6f15234e14f5 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D 
 engine written in C++ designed to make it easier and more intuitive for developers 
diff --git a/dev-games/ois/metadata.xml b/dev-games/ois/metadata.xml
index 9a10732db25f..ea0e6238c26b 100644
--- a/dev-games/ois/metadata.xml
+++ b/dev-games/ois/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wgois</remote-id>
 	</upstream>
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 2d1889808652..02b8052a7cf5 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 <longdescription lang="en">
 The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
 </longdescription>
diff --git a/dev-games/paklib/metadata.xml b/dev-games/paklib/metadata.xml
index 8d14a6674949..385ee1baaaf9 100644
--- a/dev-games/paklib/metadata.xml
+++ b/dev-games/paklib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">paklib</remote-id>
 	</upstream>
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index e67532100d47..8fef286409d3 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 PhysicsFS is a library to provide abstract access to various archives. It is 
 intended for use in video games, and the design was somewhat inspired by Quake 3's 
diff --git a/dev-games/poker-eval/metadata.xml b/dev-games/poker-eval/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-games/poker-eval/metadata.xml
+++ b/dev-games/poker-eval/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/ps2-packer/metadata.xml b/dev-games/ps2-packer/metadata.xml
index f3ae899a0823..54e67565b04d 100644
--- a/dev-games/ps2-packer/metadata.xml
+++ b/dev-games/ps2-packer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ps2dev/ps2-packer</remote-id>
   </upstream>
diff --git a/dev-games/quake4-sdk/metadata.xml b/dev-games/quake4-sdk/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-games/quake4-sdk/metadata.xml
+++ b/dev-games/quake4-sdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml
index dc1208cc442b..30064dc56a67 100644
--- a/dev-games/simgear/metadata.xml
+++ b/dev-games/simgear/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 SimGear is a set of open-source libraries designed to be used as building blocks for 
 quickly assembling 3d simulations, games, and visualization applications.
diff --git a/dev-games/t4k-common/metadata.xml b/dev-games/t4k-common/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/dev-games/t4k-common/metadata.xml
+++ b/dev-games/t4k-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-games/vamos/metadata.xml b/dev-games/vamos/metadata.xml
index 6561eaa5ffd0..94192cc46e59 100644
--- a/dev-games/vamos/metadata.xml
+++ b/dev-games/vamos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vamos</remote-id>
 	</upstream>
diff --git a/dev-games/wfmath/metadata.xml b/dev-games/wfmath/metadata.xml
index 9e1c2a2c218e..fd1d26924c0b 100644
--- a/dev-games/wfmath/metadata.xml
+++ b/dev-games/wfmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 The primary focus of WFMath is geometric objects. Thus, it includes several
 shapes (boxes, balls, lines), in addition to the basic math objects that are
diff --git a/dev-haskell/abstract-deque-tests/metadata.xml b/dev-haskell/abstract-deque-tests/metadata.xml
index 436a2882a69e..ae16c047310a 100644
--- a/dev-haskell/abstract-deque-tests/metadata.xml
+++ b/dev-haskell/abstract-deque-tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides tests that can be used with any queue implementation
 		that satisfies the `abstract-deque` interface.
diff --git a/dev-haskell/abstract-deque/metadata.xml b/dev-haskell/abstract-deque/metadata.xml
index 2725ffafd7c7..2f43f4e7a295 100644
--- a/dev-haskell/abstract-deque/metadata.xml
+++ b/dev-haskell/abstract-deque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		An abstract interface to highly-parameterizable queues/deques.
 		
diff --git a/dev-haskell/abstract-par/metadata.xml b/dev-haskell/abstract-par/metadata.xml
index aa460913223b..182059d520ac 100644
--- a/dev-haskell/abstract-par/metadata.xml
+++ b/dev-haskell/abstract-par/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The 'Par' monad(s) offer an alternative
 		parallel programming API to that provided by the
diff --git a/dev-haskell/adjunctions/metadata.xml b/dev-haskell/adjunctions/metadata.xml
index c9ee4d2c6368..e90e708d9507 100644
--- a/dev-haskell/adjunctions/metadata.xml
+++ b/dev-haskell/adjunctions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Adjunctions
 	</longdescription>
diff --git a/dev-haskell/aeson-pretty/metadata.xml b/dev-haskell/aeson-pretty/metadata.xml
index 8d52094eea89..5c14cecdaff7 100644
--- a/dev-haskell/aeson-pretty/metadata.xml
+++ b/dev-haskell/aeson-pretty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="lib-only">don't build 'aeson-pretty' executable.</flag>
 	</use>
diff --git a/dev-haskell/aeson-qq/metadata.xml b/dev-haskell/aeson-qq/metadata.xml
index 2451ef4778d9..44ecb438edc7 100644
--- a/dev-haskell/aeson-qq/metadata.xml
+++ b/dev-haskell/aeson-qq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@aeson-qq@ provides a JSON quasiquoter for Haskell.
 		
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
index e574d49e7e8b..9c0270dbe4e9 100644
--- a/dev-haskell/aeson/metadata.xml
+++ b/dev-haskell/aeson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A JSON parsing and encoding library optimized for ease of use
 		and high performance.
diff --git a/dev-haskell/alex/metadata.xml b/dev-haskell/alex/metadata.xml
index 411c90c14bbc..344f63ee7203 100644
--- a/dev-haskell/alex/metadata.xml
+++ b/dev-haskell/alex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Alex is a tool for generating lexical analysers in Haskell
 	</longdescription>
diff --git a/dev-haskell/alsa-core/metadata.xml b/dev-haskell/alsa-core/metadata.xml
index d93617d60851..b96130bcd4f0 100644
--- a/dev-haskell/alsa-core/metadata.xml
+++ b/dev-haskell/alsa-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides access to ALSA infrastructure,
 		that is needed by both alsa-seq and alsa-pcm.
diff --git a/dev-haskell/alsa-mixer/metadata.xml b/dev-haskell/alsa-mixer/metadata.xml
index ccdb996a4dab..4b2b273c73f1 100644
--- a/dev-haskell/alsa-mixer/metadata.xml
+++ b/dev-haskell/alsa-mixer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides haskell bindings to the ALSA simple mixer API.
 	</longdescription>
diff --git a/dev-haskell/alut/metadata.xml b/dev-haskell/alut/metadata.xml
index fcf851f940ef..3caf1143e9d1 100644
--- a/dev-haskell/alut/metadata.xml
+++ b/dev-haskell/alut/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml
index bb63eda2eb0d..44bea1ebcfd2 100644
--- a/dev-haskell/ansi-terminal/metadata.xml
+++ b/dev-haskell/ansi-terminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ANSI terminal support for Haskell: allows cursor movement, screen clearing, color output showing or hiding the cursor, and
 		changing the title. Compatible with Windows and those Unixes with ANSI terminals, but only GHC is supported as a compiler.
diff --git a/dev-haskell/ansi-wl-pprint/metadata.xml b/dev-haskell/ansi-wl-pprint/metadata.xml
index c7efd4ff5390..32c56727ef59 100644
--- a/dev-haskell/ansi-wl-pprint/metadata.xml
+++ b/dev-haskell/ansi-wl-pprint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a pretty printing library based on Wadler's paper "A Prettier Printer". It has been enhanced with support for ANSI terminal colored output using the ansi-terminal package.
 	</longdescription>
diff --git a/dev-haskell/appar/metadata.xml b/dev-haskell/appar/metadata.xml
index 7b1ba16af879..fa3c180f2982 100644
--- a/dev-haskell/appar/metadata.xml
+++ b/dev-haskell/appar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A simple applicative parser in Parsec style
 	</longdescription>
diff --git a/dev-haskell/arrows/metadata.xml b/dev-haskell/arrows/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/arrows/metadata.xml
+++ b/dev-haskell/arrows/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/ascii-progress/metadata.xml b/dev-haskell/ascii-progress/metadata.xml
index d938f439fb5f..b5b48ce8efa4 100644
--- a/dev-haskell/ascii-progress/metadata.xml
+++ b/dev-haskell/ascii-progress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A simple Haskell progress bar for the console. Heavily borrows from TJ
 		Holowaychuk's Node.JS project
diff --git a/dev-haskell/asn1-data/metadata.xml b/dev-haskell/asn1-data/metadata.xml
index e80a0526806c..f1808a2df17b 100644
--- a/dev-haskell/asn1-data/metadata.xml
+++ b/dev-haskell/asn1-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, CER and DER).
 		
diff --git a/dev-haskell/asn1-encoding/metadata.xml b/dev-haskell/asn1-encoding/metadata.xml
index ac4d879b20d6..6fff550b7e78 100644
--- a/dev-haskell/asn1-encoding/metadata.xml
+++ b/dev-haskell/asn1-encoding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, and DER).
 	</longdescription>
diff --git a/dev-haskell/asn1-parse/metadata.xml b/dev-haskell/asn1-parse/metadata.xml
index 4a79e9750ac7..8981c039d0ee 100644
--- a/dev-haskell/asn1-parse/metadata.xml
+++ b/dev-haskell/asn1-parse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple monadic parser for ASN1 stream types, when ASN1 pattern matching is not convenient.
 	</longdescription>
diff --git a/dev-haskell/asn1-types/metadata.xml b/dev-haskell/asn1-types/metadata.xml
index b7cbe66d6ab5..d3f17240da42 100644
--- a/dev-haskell/asn1-types/metadata.xml
+++ b/dev-haskell/asn1-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ASN.1 standard types
 	</longdescription>
diff --git a/dev-haskell/async/metadata.xml b/dev-haskell/async/metadata.xml
index 53ad75972521..a96e33680bf5 100644
--- a/dev-haskell/async/metadata.xml
+++ b/dev-haskell/async/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package provides a higher-level interface over
 		threads, in which an @Async a@ is a concurrent
diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml
index 2576b3c8008e..49235674db92 100644
--- a/dev-haskell/atomic-primops/metadata.xml
+++ b/dev-haskell/atomic-primops/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		After GHC 7.4 a new `casMutVar#` primop became available, but it's
 		difficult to use safely, because pointer equality is a highly
diff --git a/dev-haskell/attoparsec-conduit/metadata.xml b/dev-haskell/attoparsec-conduit/metadata.xml
index db03a9726493..8da4512fb469 100644
--- a/dev-haskell/attoparsec-conduit/metadata.xml
+++ b/dev-haskell/attoparsec-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Turn attoparsec parsers into sinks.
 	</longdescription>
diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
index 3fb765ae600f..a9f987799395 100644
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ b/dev-haskell/attoparsec-enumerator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library allows an Attoparsec parser to receive input incrementally
 		from an enumerator. This could be used for parsing large files, or
diff --git a/dev-haskell/attoparsec/metadata.xml b/dev-haskell/attoparsec/metadata.xml
index c3972bf907b7..ebdbf3a744d7 100644
--- a/dev-haskell/attoparsec/metadata.xml
+++ b/dev-haskell/attoparsec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A fast parser combinator library, aimed particularly at dealing
 		efficiently with network protocols and complicated text/binary
diff --git a/dev-haskell/authenticate/metadata.xml b/dev-haskell/authenticate/metadata.xml
index 6b3e2aafc0ed..d7ff16fca64a 100644
--- a/dev-haskell/authenticate/metadata.xml
+++ b/dev-haskell/authenticate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Focus is on third-party authentication methods, such as OpenID and BrowserID.
 	</longdescription>
diff --git a/dev-haskell/auto-update/metadata.xml b/dev-haskell/auto-update/metadata.xml
index 472b9576430d..40d6d8df2bc2 100644
--- a/dev-haskell/auto-update/metadata.xml
+++ b/dev-haskell/auto-update/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A common problem is the desire to have an action run at a scheduled interval, but only if it is needed. For example, instead of having every web request result in a new @getCurrentTime@ call, we'd like to have a single worker thread run every second, updating an @IORef@. However, if the request frequency is less than once per second, this is a pessimization, and worse, kills idle GC.
 		
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
index 53aa761ab0c6..7b44e4185a83 100644
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
 	</longdescription>
diff --git a/dev-haskell/base-compat/metadata.xml b/dev-haskell/base-compat/metadata.xml
index 88c2f823804e..913430c672c8 100644
--- a/dev-haskell/base-compat/metadata.xml
+++ b/dev-haskell/base-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Ban CPP from your code.  See the README for what is covered:
 		&lt;https://github.com/sol/base-compat#readme&gt;
diff --git a/dev-haskell/base-orphans/metadata.xml b/dev-haskell/base-orphans/metadata.xml
index 3f15cb060342..a33ce150814d 100644
--- a/dev-haskell/base-orphans/metadata.xml
+++ b/dev-haskell/base-orphans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@base-orphans@ defines orphan instances that mimic instances available in later versions of @base@ to a wider (older) range of compilers. @base-orphans@ does not export anything except the orphan instances themselves and complements @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@.
 		
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
index 018d10a91ea6..03dcb06fb974 100644
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ b/dev-haskell/base-unicode-symbols/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package defines new symbols for a number of functions,
 		operators and types in the base package.
diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml
index 837c9d62525f..de5875206aa7 100644
--- a/dev-haskell/base16-bytestring/metadata.xml
+++ b/dev-haskell/base16-bytestring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast base16 (hex) encoding and decoding for ByteStrings
 	</longdescription>
diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml
index 78444e5fc99c..c7537fd95da4 100644
--- a/dev-haskell/base64-bytestring/metadata.xml
+++ b/dev-haskell/base64-bytestring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast base64 encoding and deconding for ByteStrings
 	</longdescription>
diff --git a/dev-haskell/base64-conduit/metadata.xml b/dev-haskell/base64-conduit/metadata.xml
index cab5aa7c3af3..b67e728d34f2 100644
--- a/dev-haskell/base64-conduit/metadata.xml
+++ b/dev-haskell/base64-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Base64-encode and decode streams of bytes.
 	</longdescription>
diff --git a/dev-haskell/basic-prelude/metadata.xml b/dev-haskell/basic-prelude/metadata.xml
index 7528b64335ca..2df16af55ed4 100644
--- a/dev-haskell/basic-prelude/metadata.xml
+++ b/dev-haskell/basic-prelude/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The premise of @basic-prelude@ is that there are a lot of very commonly desired features missing from the standard @Prelude@, such as commonly used operators (@\&lt;$\&gt;@ and @&gt;=&gt;@, for instance) and imports for common datatypes (e.g., @ByteString@ and @Vector@). At the same time, there are lots of other components which are more debatable, such as providing polymorphic versions of common functions.
 		
diff --git a/dev-haskell/bencode/metadata.xml b/dev-haskell/bencode/metadata.xml
index 7f605a3c9b9d..e54c6a554d19 100644
--- a/dev-haskell/bencode/metadata.xml
+++ b/dev-haskell/bencode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Parser and printer for bencoded data.
 	</longdescription>
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
index fa032ab0725a..c18d1dee9f29 100644
--- a/dev-haskell/bifunctors/metadata.xml
+++ b/dev-haskell/bifunctors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 bifunctors
 	</longdescription>
diff --git a/dev-haskell/binary/metadata.xml b/dev-haskell/binary/metadata.xml
index a1894f70a5cb..910817e22a66 100644
--- a/dev-haskell/binary/metadata.xml
+++ b/dev-haskell/binary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Efficient, pure binary serialisation using lazy ByteStrings.
 		Haskell values may be encoded to and from binary formats,
diff --git a/dev-haskell/bio/metadata.xml b/dev-haskell/bio/metadata.xml
index c7052f420878..2c1b051c79cf 100644
--- a/dev-haskell/bio/metadata.xml
+++ b/dev-haskell/bio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a collection of data structures and algorithms
 		useful for building bioinformatics-related tools
diff --git a/dev-haskell/biocore/metadata.xml b/dev-haskell/biocore/metadata.xml
index 738abba90547..af1d6c941592 100644
--- a/dev-haskell/biocore/metadata.xml
+++ b/dev-haskell/biocore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A set of core definitions and data structures
 		commonly used in bioinformatics.  The intention is that bioinformatics
diff --git a/dev-haskell/biofasta/metadata.xml b/dev-haskell/biofasta/metadata.xml
index e2d400a97c00..46c179682f16 100644
--- a/dev-haskell/biofasta/metadata.xml
+++ b/dev-haskell/biofasta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Library for reading fasta sequence files
 	</longdescription>
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
index 85ee9ed22aa2..ea2c5beaba02 100644
--- a/dev-haskell/biosff/metadata.xml
+++ b/dev-haskell/biosff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The library contains the functionality for reading and writing
 		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
diff --git a/dev-haskell/bits-atomic/metadata.xml b/dev-haskell/bits-atomic/metadata.xml
index 65b64afd1ae1..40480262b67e 100644
--- a/dev-haskell/bits-atomic/metadata.xml
+++ b/dev-haskell/bits-atomic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Atomic operations including CAS (compare-and-swap), fetch &amp; add and variants
 		suitable for low-level shared-memory synchronization.
diff --git a/dev-haskell/blaze-builder-conduit/metadata.xml b/dev-haskell/blaze-builder-conduit/metadata.xml
index 598b98ef3e4a..783755037c3b 100644
--- a/dev-haskell/blaze-builder-conduit/metadata.xml
+++ b/dev-haskell/blaze-builder-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Convert streams of builders to streams of bytestrings.
 	</longdescription>
diff --git a/dev-haskell/blaze-builder-enumerator/metadata.xml b/dev-haskell/blaze-builder-enumerator/metadata.xml
index f242562c4c7e..918959ecce77 100644
--- a/dev-haskell/blaze-builder-enumerator/metadata.xml
+++ b/dev-haskell/blaze-builder-enumerator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package integrates the builders from the blaze-builder package with
 		the enumerator package. It provides infrastructure and enumeratees for
diff --git a/dev-haskell/blaze-builder/metadata.xml b/dev-haskell/blaze-builder/metadata.xml
index a3aed3b2363c..1c030401be7c 100644
--- a/dev-haskell/blaze-builder/metadata.xml
+++ b/dev-haskell/blaze-builder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides an abstraction of buffered output of
 		byte streams and several convenience functions to exploit
diff --git a/dev-haskell/blaze-html/metadata.xml b/dev-haskell/blaze-html/metadata.xml
index 75de1a8b043c..9660a709244d 100644
--- a/dev-haskell/blaze-html/metadata.xml
+++ b/dev-haskell/blaze-html/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A blazingly fast HTML combinator library for the Haskell
 		programming language. The Text.Blaze module is a good
diff --git a/dev-haskell/blaze-markup/metadata.xml b/dev-haskell/blaze-markup/metadata.xml
index 4ca0c7675e05..19ae7b967530 100644
--- a/dev-haskell/blaze-markup/metadata.xml
+++ b/dev-haskell/blaze-markup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Core modules of a blazingly fast markup combinator library for the Haskell
 		programming language. The Text.Blaze module is a good
diff --git a/dev-haskell/bloomfilter/metadata.xml b/dev-haskell/bloomfilter/metadata.xml
index 2eb68485816b..f02044eeb4cc 100644
--- a/dev-haskell/bloomfilter/metadata.xml
+++ b/dev-haskell/bloomfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Pure and impure Bloom Filter implementations.
 	</longdescription>
diff --git a/dev-haskell/boxes/metadata.xml b/dev-haskell/boxes/metadata.xml
index cb24c09ed763..b00575a65b02 100644
--- a/dev-haskell/boxes/metadata.xml
+++ b/dev-haskell/boxes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A pretty-printing library for laying out text in
 		two dimensions, using a simple box model.
diff --git a/dev-haskell/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
index ae51de4d6973..e4d6e4e259f3 100644
--- a/dev-haskell/byteable/metadata.xml
+++ b/dev-haskell/byteable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Abstract class to manipulate sequence of bytes
 		
diff --git a/dev-haskell/byteorder/metadata.xml b/dev-haskell/byteorder/metadata.xml
index 1da042e00683..ee1d7fc6cf58 100644
--- a/dev-haskell/byteorder/metadata.xml
+++ b/dev-haskell/byteorder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package is for working with the native byte-ordering of
 		the system.
diff --git a/dev-haskell/bytestring-builder/metadata.xml b/dev-haskell/bytestring-builder/metadata.xml
index 20d1ce106411..a2a788dc4443 100644
--- a/dev-haskell/bytestring-builder/metadata.xml
+++ b/dev-haskell/bytestring-builder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is the bytestring builder that is debuting in bytestring-0.10.4.0, which
 		should be shipping with GHC 7.8, probably late in 2013.  This builder has
diff --git a/dev-haskell/bytestring-mmap/metadata.xml b/dev-haskell/bytestring-mmap/metadata.xml
index 5cee889aaa7e..d0d305d67e01 100644
--- a/dev-haskell/bytestring-mmap/metadata.xml
+++ b/dev-haskell/bytestring-mmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		
 		This library provides a wrapper to mmap(2), allowing files or
diff --git a/dev-haskell/bytestring-show/metadata.xml b/dev-haskell/bytestring-show/metadata.xml
index 0096db8efc22..d59627e81e7d 100644
--- a/dev-haskell/bytestring-show/metadata.xml
+++ b/dev-haskell/bytestring-show/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Efficient conversion of values into readable byte strings.
 	</longdescription>
diff --git a/dev-haskell/bzlib/metadata.xml b/dev-haskell/bzlib/metadata.xml
index 2cc92a612b70..790a32e12bfb 100644
--- a/dev-haskell/bzlib/metadata.xml
+++ b/dev-haskell/bzlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
diff --git a/dev-haskell/c2hs/metadata.xml b/dev-haskell/c2hs/metadata.xml
index 9c97f697c708..65e71e42aa70 100644
--- a/dev-haskell/c2hs/metadata.xml
+++ b/dev-haskell/c2hs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		C-&gt;Haskell assists in the development of Haskell bindings to C
 		libraries. It extracts interface information from C header
diff --git a/dev-haskell/cabal-helper/metadata.xml b/dev-haskell/cabal-helper/metadata.xml
index a4d5906e90a1..becfff385909 100644
--- a/dev-haskell/cabal-helper/metadata.xml
+++ b/dev-haskell/cabal-helper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@cabal-helper@ provides a library which wraps the internal use of executables
 		to lift the restrictions imposed by linking against versions of GHC before
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index bc3326bd7fc4..bdfd059e60a7 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The 'cabal' command-line program simplifies the process of managing
 		Haskell software by automating the fetching, configuration, compilation
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index dde98cf80b95..e21aca77062a 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/cairo/metadata.xml b/dev-haskell/cairo/metadata.xml
index 63b2a76154d3..cc616e2f153c 100644
--- a/dev-haskell/cairo/metadata.xml
+++ b/dev-haskell/cairo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cairo is a library to render high quality vector graphics. There
 		exist various backends that allows rendering to Gtk windows, PDF,
diff --git a/dev-haskell/case-insensitive/metadata.xml b/dev-haskell/case-insensitive/metadata.xml
index 38e8c0d36538..2de110d3e0a4 100644
--- a/dev-haskell/case-insensitive/metadata.xml
+++ b/dev-haskell/case-insensitive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The module @Data.CaseInsensitive@ provides the 'CI' type
 		constructor which can be parameterised by a string-like
diff --git a/dev-haskell/cassava/metadata.xml b/dev-haskell/cassava/metadata.xml
index 68ad6280c045..7bba13c286be 100644
--- a/dev-haskell/cassava/metadata.xml
+++ b/dev-haskell/cassava/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A CSV parsing and encoding library optimized for ease of use and high
 		performance.
diff --git a/dev-haskell/cereal/metadata.xml b/dev-haskell/cereal/metadata.xml
index 1ecf95f56bef..2e02afe71c57 100644
--- a/dev-haskell/cereal/metadata.xml
+++ b/dev-haskell/cereal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A binary serialization library, similar to binary, that introduces an isolate
 		primitive for parser isolation, and replaces the asynchronous errors with a
diff --git a/dev-haskell/certificate/metadata.xml b/dev-haskell/certificate/metadata.xml
index 50833e1be936..228f5f41dc3d 100644
--- a/dev-haskell/certificate/metadata.xml
+++ b/dev-haskell/certificate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Certificates and Key reader/writer
 		
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
index bf336346991f..5ca35ade0b47 100644
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a Haskell library for writing CGI programs.
 	</longdescription>
diff --git a/dev-haskell/chaselev-deque/metadata.xml b/dev-haskell/chaselev-deque/metadata.xml
index c94b09c85697..4840df1cdeba 100644
--- a/dev-haskell/chaselev-deque/metadata.xml
+++ b/dev-haskell/chaselev-deque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Chase &amp; Lev work-stealing lock-free double-ended queues (deques).
 	</longdescription>
diff --git a/dev-haskell/chasingbottoms/metadata.xml b/dev-haskell/chasingbottoms/metadata.xml
index 21f906bf63f3..fb32557a4842 100644
--- a/dev-haskell/chasingbottoms/metadata.xml
+++ b/dev-haskell/chasingbottoms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Do you ever feel the need to test code involving bottoms (e.g. calls to
 		the @error@ function), or code involving infinite values? Then this
diff --git a/dev-haskell/chell-quickcheck/metadata.xml b/dev-haskell/chell-quickcheck/metadata.xml
index 20d00f647ad8..a6de9aa82112 100644
--- a/dev-haskell/chell-quickcheck/metadata.xml
+++ b/dev-haskell/chell-quickcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		QuickCheck support for the Chell testing library
 	</longdescription>
diff --git a/dev-haskell/chell/metadata.xml b/dev-haskell/chell/metadata.xml
index 238cbf0b3020..4ddaed9a75ed 100644
--- a/dev-haskell/chell/metadata.xml
+++ b/dev-haskell/chell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Chell is a simple and intuitive library for automated testing. It natively
 		supports assertion-based testing, and can use companion libraries
diff --git a/dev-haskell/chunked-data/metadata.xml b/dev-haskell/chunked-data/metadata.xml
index 8fce7d601e96..e275ccc97405 100644
--- a/dev-haskell/chunked-data/metadata.xml
+++ b/dev-haskell/chunked-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Originally present in classy-prelude.
 	</longdescription>
diff --git a/dev-haskell/cipher-aes/metadata.xml b/dev-haskell/cipher-aes/metadata.xml
index eccf775fd26f..f7ff4b926019 100644
--- a/dev-haskell/cipher-aes/metadata.xml
+++ b/dev-haskell/cipher-aes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast AES cipher implementation with advanced mode of operations
 	</longdescription>
diff --git a/dev-haskell/cipher-blowfish/metadata.xml b/dev-haskell/cipher-blowfish/metadata.xml
index 9646e071edc6..6815669d8c3a 100644
--- a/dev-haskell/cipher-blowfish/metadata.xml
+++ b/dev-haskell/cipher-blowfish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Blowfish cipher primitives
 	</longdescription>
diff --git a/dev-haskell/cipher-camellia/metadata.xml b/dev-haskell/cipher-camellia/metadata.xml
index 480d4f03c9cb..83a027eeb85a 100644
--- a/dev-haskell/cipher-camellia/metadata.xml
+++ b/dev-haskell/cipher-camellia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Camellia block cipher primitives
 	</longdescription>
diff --git a/dev-haskell/cipher-des/metadata.xml b/dev-haskell/cipher-des/metadata.xml
index 19680bfaeaad..8d2ea189348f 100644
--- a/dev-haskell/cipher-des/metadata.xml
+++ b/dev-haskell/cipher-des/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		DES and 3DES primitives
 	</longdescription>
diff --git a/dev-haskell/cipher-rc4/metadata.xml b/dev-haskell/cipher-rc4/metadata.xml
index ce95c167e672..48d8ecf3870c 100644
--- a/dev-haskell/cipher-rc4/metadata.xml
+++ b/dev-haskell/cipher-rc4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast RC4 cipher implementation
 	</longdescription>
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
index 0ff2a6b2f3e2..e17409da6a87 100644
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ b/dev-haskell/citeproc-hs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
 		<flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
diff --git a/dev-haskell/classy-prelude/metadata.xml b/dev-haskell/classy-prelude/metadata.xml
index 0b7a8f72ea39..4d271fd2fd6b 100644
--- a/dev-haskell/classy-prelude/metadata.xml
+++ b/dev-haskell/classy-prelude/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Focuses on using common typeclasses when possible, and creating new ones to avoid name clashing. Exposes many recommended datastructures (Map, ByteString, etc) directly without requiring long import lists and qualified modules.
 	</longdescription>
diff --git a/dev-haskell/clientsession/metadata.xml b/dev-haskell/clientsession/metadata.xml
index 0a743a5e4500..aa63c6a78e0b 100644
--- a/dev-haskell/clientsession/metadata.xml
+++ b/dev-haskell/clientsession/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Achieves security through AES-CTR encryption and
 		Skein-MAC-512-256 authentication.  Uses Base64
diff --git a/dev-haskell/clock/metadata.xml b/dev-haskell/clock/metadata.xml
index 87984412cdd0..ed4cfe274fcf 100644
--- a/dev-haskell/clock/metadata.xml
+++ b/dev-haskell/clock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A package for convenient access to high-resolution
 		clock and timer functions of different operating
diff --git a/dev-haskell/cmark/metadata.xml b/dev-haskell/cmark/metadata.xml
index 9a3c0c53dcf4..0ff5b010fad4 100644
--- a/dev-haskell/cmark/metadata.xml
+++ b/dev-haskell/cmark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides Haskell bindings for
 		&lt;https://github.com/jgm/cmark libcmark&gt;, the reference
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index 38d52d122f35..5e41d6a59b7c 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides an easy way to define command line parsers. Most users
 		will want to use the "System.Console.CmdArgs.Implicit" module, whose
diff --git a/dev-haskell/cmdlib/metadata.xml b/dev-haskell/cmdlib/metadata.xml
index c7178e17b3bd..1592367278eb 100644
--- a/dev-haskell/cmdlib/metadata.xml
+++ b/dev-haskell/cmdlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A commandline parsing library, based on getopt. Comes with a
 		powerful attribute system. Supports complex interfaces with many
diff --git a/dev-haskell/comonad-transformers/metadata.xml b/dev-haskell/comonad-transformers/metadata.xml
index b84429f670a2..72413cc5faf9 100644
--- a/dev-haskell/comonad-transformers/metadata.xml
+++ b/dev-haskell/comonad-transformers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Comonad transformers
 	</longdescription>
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 47a26799eff9..5ddd2889ae52 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 comonads
 	</longdescription>
diff --git a/dev-haskell/comonads-fd/metadata.xml b/dev-haskell/comonads-fd/metadata.xml
index d64c47ed8e4a..020ec0b5b12b 100644
--- a/dev-haskell/comonads-fd/metadata.xml
+++ b/dev-haskell/comonads-fd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Comonad transformers using functional dependencies
 	</longdescription>
diff --git a/dev-haskell/concurrent-extra/metadata.xml b/dev-haskell/concurrent-extra/metadata.xml
index df4f0da831a9..721080a8536d 100644
--- a/dev-haskell/concurrent-extra/metadata.xml
+++ b/dev-haskell/concurrent-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The @concurrent-extra@ package offers among other things the
 		following selection of synchronisation primitives:
diff --git a/dev-haskell/concurrent-output/metadata.xml b/dev-haskell/concurrent-output/metadata.xml
index 146f2b3e5d65..00d01a18a084 100644
--- a/dev-haskell/concurrent-output/metadata.xml
+++ b/dev-haskell/concurrent-output/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides a simple interface for writing concurrent programs that
 		need to output a lot of status messages to the console, or display
diff --git a/dev-haskell/conduit-extra/metadata.xml b/dev-haskell/conduit-extra/metadata.xml
index ad0e865ef3c8..279885c647c8 100644
--- a/dev-haskell/conduit-extra/metadata.xml
+++ b/dev-haskell/conduit-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package will soon contain much more functionality. This is a placeholder until the next release is ready.
 	</longdescription>
diff --git a/dev-haskell/conduit/metadata.xml b/dev-haskell/conduit/metadata.xml
index 377b0f95ed80..85eaa8d397f6 100644
--- a/dev-haskell/conduit/metadata.xml
+++ b/dev-haskell/conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Conduits are an approach to the streaming data problem. It is meant as an alternative to enumerators\/iterators, hoping to address the same issues with different trade-offs based on real-world experience with enumerators. For more information, see &lt;http://www.yesodweb.com/blog/2011/12/conduits&gt;.
 	</longdescription>
diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
index 133d59cdbb18..a92b0f76bdb8 100644
--- a/dev-haskell/configfile/metadata.xml
+++ b/dev-haskell/configfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Parser and writer for handling sectioned config files in
 		Haskell.
diff --git a/dev-haskell/connection/metadata.xml b/dev-haskell/connection/metadata.xml
index 5b691521f8b5..a5f192cb9e92 100644
--- a/dev-haskell/connection/metadata.xml
+++ b/dev-haskell/connection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple network library for all your connection need.
 		
diff --git a/dev-haskell/constraints/metadata.xml b/dev-haskell/constraints/metadata.xml
index d9df2d8a64c2..e90ab67668bf 100644
--- a/dev-haskell/constraints/metadata.xml
+++ b/dev-haskell/constraints/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Constraint manipulation
 	</longdescription>
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
index c6898cdbd101..c39880b3b3bb 100644
--- a/dev-haskell/contravariant/metadata.xml
+++ b/dev-haskell/contravariant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 contravariant functors
 	</longdescription>
diff --git a/dev-haskell/control-monad-loop/metadata.xml b/dev-haskell/control-monad-loop/metadata.xml
index 58e5198062e9..4cdb9f9da68f 100644
--- a/dev-haskell/control-monad-loop/metadata.xml
+++ b/dev-haskell/control-monad-loop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A library of looping constructs with @continue@ and @exit@ control flow
 		statements.
diff --git a/dev-haskell/convertible/metadata.xml b/dev-haskell/convertible/metadata.xml
index 88ecc722c6e3..58cbde61bbb1 100644
--- a/dev-haskell/convertible/metadata.xml
+++ b/dev-haskell/convertible/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Convertible provides a typeclass with a single function
 		that is designed to help convert between different types: numeric
diff --git a/dev-haskell/cookie/metadata.xml b/dev-haskell/cookie/metadata.xml
index 20ebb3a8ee1c..ed8f1323d419 100644
--- a/dev-haskell/cookie/metadata.xml
+++ b/dev-haskell/cookie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HTTP cookie parsing and rendering
 	</longdescription>
diff --git a/dev-haskell/cpphs/metadata.xml b/dev-haskell/cpphs/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/cpphs/metadata.xml
+++ b/dev-haskell/cpphs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
index bd92a85d655f..b461bb29aafc 100644
--- a/dev-haskell/cprng-aes/metadata.xml
+++ b/dev-haskell/cprng-aes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple crypto pseudo-random-number-generator with really good randomness property.
 		
diff --git a/dev-haskell/cpu/metadata.xml b/dev-haskell/cpu/metadata.xml
index bfc0ff9ad00b..061c370e709d 100644
--- a/dev-haskell/cpu/metadata.xml
+++ b/dev-haskell/cpu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="executable">build 'cpuid' tool</flag>
 	</use>
diff --git a/dev-haskell/criterion/metadata.xml b/dev-haskell/criterion/metadata.xml
index 09dd81380f17..023e72536724 100644
--- a/dev-haskell/criterion/metadata.xml
+++ b/dev-haskell/criterion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides a powerful but simple way to measure the
 		performance of Haskell code.  It provides both a framework for
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
index 98a7f77a029b..04433464e432 100644
--- a/dev-haskell/crypto-api/metadata.xml
+++ b/dev-haskell/crypto-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A generic interface for cryptographic operations (hashes, ciphers, randomness).
 		Maintainers of hash and cipher implementations are
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
index 8c507b94afd9..8cec2441d615 100644
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ b/dev-haskell/crypto-cipher-tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generic cryptography cipher tests
 	</longdescription>
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
index 24df10502948..22929920b391 100644
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ b/dev-haskell/crypto-cipher-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generic cryptography cipher types
 	</longdescription>
diff --git a/dev-haskell/crypto-conduit/metadata.xml b/dev-haskell/crypto-conduit/metadata.xml
index 96a72e1fa7c5..40881fa2c59e 100644
--- a/dev-haskell/crypto-conduit/metadata.xml
+++ b/dev-haskell/crypto-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains everything that you need to use a
 		cryptographic package that supports the @crypto-api@ package
diff --git a/dev-haskell/crypto-numbers/metadata.xml b/dev-haskell/crypto-numbers/metadata.xml
index 7e70d3aeaedf..db4f3f24ee12 100644
--- a/dev-haskell/crypto-numbers/metadata.xml
+++ b/dev-haskell/crypto-numbers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cryptographic numbers: functions and algorithms
 	</longdescription>
diff --git a/dev-haskell/crypto-pubkey-types/metadata.xml b/dev-haskell/crypto-pubkey-types/metadata.xml
index 5b7b358d4aa6..39a21bbac368 100644
--- a/dev-haskell/crypto-pubkey-types/metadata.xml
+++ b/dev-haskell/crypto-pubkey-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generic cryptography public keys algorithm types
 	</longdescription>
diff --git a/dev-haskell/crypto-pubkey/metadata.xml b/dev-haskell/crypto-pubkey/metadata.xml
index a024e27be7a7..2f441586d38c 100644
--- a/dev-haskell/crypto-pubkey/metadata.xml
+++ b/dev-haskell/crypto-pubkey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Public Key cryptography
 		
diff --git a/dev-haskell/crypto-random-api/metadata.xml b/dev-haskell/crypto-random-api/metadata.xml
index 7d18c3786494..29453f1b3cec 100644
--- a/dev-haskell/crypto-random-api/metadata.xml
+++ b/dev-haskell/crypto-random-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple random generators API for cryptography related code
 	</longdescription>
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
index df9b27c0a494..88103eff78a8 100644
--- a/dev-haskell/crypto-random/metadata.xml
+++ b/dev-haskell/crypto-random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple cryptographic random related types
 	</longdescription>
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
index 2df624596a9b..19d921dfcec6 100644
--- a/dev-haskell/crypto/metadata.xml
+++ b/dev-haskell/crypto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		DES, Blowfish, AES, TEA, SHA1, MD5, RSA, BubbleBabble,
 		Hexdump, Support for Word128, Word192 and Word256 and Beyond, PKCS5
diff --git a/dev-haskell/cryptocipher/metadata.xml b/dev-haskell/cryptocipher/metadata.xml
index ab6465e4bcba..aef324768d06 100644
--- a/dev-haskell/cryptocipher/metadata.xml
+++ b/dev-haskell/cryptocipher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Symmetrical Block, Stream and PubKey Ciphers
 	</longdescription>
diff --git a/dev-haskell/cryptohash-conduit/metadata.xml b/dev-haskell/cryptohash-conduit/metadata.xml
index 15c7cc62ce75..a73549aff2de 100644
--- a/dev-haskell/cryptohash-conduit/metadata.xml
+++ b/dev-haskell/cryptohash-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Support all the @cryptohash@ package using conduits from
 		the @conduit@ package.
diff --git a/dev-haskell/cryptohash-cryptoapi/metadata.xml b/dev-haskell/cryptohash-cryptoapi/metadata.xml
index 030483a1ecec..644c2ac0e022 100644
--- a/dev-haskell/cryptohash-cryptoapi/metadata.xml
+++ b/dev-haskell/cryptohash-cryptoapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Crypto-api interfaces for cryptohash
 	</longdescription>
diff --git a/dev-haskell/cryptohash/metadata.xml b/dev-haskell/cryptohash/metadata.xml
index 9f596300db9d..9a71caa5bab2 100644
--- a/dev-haskell/cryptohash/metadata.xml
+++ b/dev-haskell/cryptohash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A collection of crypto hashes, with a practical incremental and one-pass, pure APIs,
 		with performance close to the fastest implementations available in others languages.
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml
index a0964926a0ff..517910879007 100644
--- a/dev-haskell/cryptonite/metadata.xml
+++ b/dev-haskell/cryptonite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A repository of cryptographic primitives.
 		
diff --git a/dev-haskell/css-text/metadata.xml b/dev-haskell/css-text/metadata.xml
index 01beb4039ac3..b32cb05f270d 100644
--- a/dev-haskell/css-text/metadata.xml
+++ b/dev-haskell/css-text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		CSS parser and renderer.
 	</longdescription>
diff --git a/dev-haskell/curl/metadata.xml b/dev-haskell/curl/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/curl/metadata.xml
+++ b/dev-haskell/curl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/data-binary-ieee754/metadata.xml b/dev-haskell/data-binary-ieee754/metadata.xml
index 673dbf86f9ee..1501a2fc6c8f 100644
--- a/dev-haskell/data-binary-ieee754/metadata.xml
+++ b/dev-haskell/data-binary-ieee754/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Convert Float and Decimal values to/from raw octets.
 	</longdescription>
diff --git a/dev-haskell/data-default-class/metadata.xml b/dev-haskell/data-default-class/metadata.xml
index 2c1278db1ad8..1a2f4be1c5c5 100644
--- a/dev-haskell/data-default-class/metadata.xml
+++ b/dev-haskell/data-default-class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A class for types with a default value
 	</longdescription>
diff --git a/dev-haskell/data-default-instances-base/metadata.xml b/dev-haskell/data-default-instances-base/metadata.xml
index 55d75bbfca19..d892b237ffe1 100644
--- a/dev-haskell/data-default-instances-base/metadata.xml
+++ b/dev-haskell/data-default-instances-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Default instances for types in base
 	</longdescription>
diff --git a/dev-haskell/data-default-instances-containers/metadata.xml b/dev-haskell/data-default-instances-containers/metadata.xml
index b431135c3520..7319ba144353 100644
--- a/dev-haskell/data-default-instances-containers/metadata.xml
+++ b/dev-haskell/data-default-instances-containers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Default instances for types in containers
 	</longdescription>
diff --git a/dev-haskell/data-default-instances-dlist/metadata.xml b/dev-haskell/data-default-instances-dlist/metadata.xml
index a3455522d42d..0e4ddba5f323 100644
--- a/dev-haskell/data-default-instances-dlist/metadata.xml
+++ b/dev-haskell/data-default-instances-dlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Default instances for types in dlist
 	</longdescription>
diff --git a/dev-haskell/data-default-instances-old-locale/metadata.xml b/dev-haskell/data-default-instances-old-locale/metadata.xml
index 08b2f91165dd..d9d8cd337de9 100644
--- a/dev-haskell/data-default-instances-old-locale/metadata.xml
+++ b/dev-haskell/data-default-instances-old-locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Default instances for types in old-locale
 	</longdescription>
diff --git a/dev-haskell/data-default/metadata.xml b/dev-haskell/data-default/metadata.xml
index 2c1278db1ad8..1a2f4be1c5c5 100644
--- a/dev-haskell/data-default/metadata.xml
+++ b/dev-haskell/data-default/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A class for types with a default value
 	</longdescription>
diff --git a/dev-haskell/data-endian/metadata.xml b/dev-haskell/data-endian/metadata.xml
index 0e49ea3e9f86..32f3d6844f08 100644
--- a/dev-haskell/data-endian/metadata.xml
+++ b/dev-haskell/data-endian/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides helpers for converting endian-sensitive data.
 	</longdescription>
diff --git a/dev-haskell/data-hash/metadata.xml b/dev-haskell/data-hash/metadata.xml
index fda3411d0d93..b2725b7dc2ac 100644
--- a/dev-haskell/data-hash/metadata.xml
+++ b/dev-haskell/data-hash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Combinators for building fast hashing functions. Includes
 		hashing functions for all basic Haskell98 types.
diff --git a/dev-haskell/data-ordlist/metadata.xml b/dev-haskell/data-ordlist/metadata.xml
index b9e9b6fcf1e7..04553887326c 100644
--- a/dev-haskell/data-ordlist/metadata.xml
+++ b/dev-haskell/data-ordlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This module provides set and multiset operations on ordered lists.
 	</longdescription>
diff --git a/dev-haskell/dataenc/metadata.xml b/dev-haskell/dataenc/metadata.xml
index 7b979a0b1c25..2695850ac316 100644
--- a/dev-haskell/dataenc/metadata.xml
+++ b/dev-haskell/dataenc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Data encoding library currently providing Base16, Base32,
 		Base32Hex, Base64, Base64Url, Base85, Python string escaping,
diff --git a/dev-haskell/date-cache/metadata.xml b/dev-haskell/date-cache/metadata.xml
index 6f22e6d41f60..3288a073343b 100644
--- a/dev-haskell/date-cache/metadata.xml
+++ b/dev-haskell/date-cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Formatting time is slow. This package provides
 		mechanisms to cache formatted date
diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
index 38f57f6502cb..66746c64bacf 100644
--- a/dev-haskell/dav/metadata.xml
+++ b/dev-haskell/dav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a library for the Web Distributed Authoring and Versioning
 		(WebDAV) extensions to HTTP.  At present it supports a very small
diff --git a/dev-haskell/dbus-core/metadata.xml b/dev-haskell/dbus-core/metadata.xml
index e9c319717fea..dd70161eba4b 100644
--- a/dev-haskell/dbus-core/metadata.xml
+++ b/dev-haskell/dbus-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Low-level D-Bus protocol implementation
 	</longdescription>
diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml
index 71cefc4d20ae..2dcfd2c10561 100644
--- a/dev-haskell/dbus/metadata.xml
+++ b/dev-haskell/dbus/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		D-Bus is a simple, message-based protocol for inter-process
 		communication, which allows applications to interact with other parts of
diff --git a/dev-haskell/deepseq-generics/metadata.xml b/dev-haskell/deepseq-generics/metadata.xml
index 45adca012f26..0f65b1a0deb4 100644
--- a/dev-haskell/deepseq-generics/metadata.xml
+++ b/dev-haskell/deepseq-generics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a "GHC.Generics"-based
 		'Control.DeepSeq.Generics.genericRnf' function which can be used
diff --git a/dev-haskell/diff/metadata.xml b/dev-haskell/diff/metadata.xml
index 9d7f1bde2f1e..d2b6c393cac4 100644
--- a/dev-haskell/diff/metadata.xml
+++ b/dev-haskell/diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Basic implementation of the standard diff algorithm.
 	</longdescription>
diff --git a/dev-haskell/digest/metadata.xml b/dev-haskell/digest/metadata.xml
index 9980be7d4769..1b3fdf3e2a5a 100644
--- a/dev-haskell/digest/metadata.xml
+++ b/dev-haskell/digest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides efficient cryptographic hash implementations for
 		strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
diff --git a/dev-haskell/distributive/metadata.xml b/dev-haskell/distributive/metadata.xml
index 2b252fdeb760..9b5c39428320 100644
--- a/dev-haskell/distributive/metadata.xml
+++ b/dev-haskell/distributive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 Distributive functors -- Dual to Traversable
 	</longdescription>
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
index 98c679a26363..8c85640c391b 100644
--- a/dev-haskell/djinn-ghc/metadata.xml
+++ b/dev-haskell/djinn-ghc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Djinn uses an theorem prover for intuitionistic propositional logic
 		to generate a Haskell expression when given a type.
diff --git a/dev-haskell/djinn-lib/metadata.xml b/dev-haskell/djinn-lib/metadata.xml
index 02d9032c605b..8832463ef070 100644
--- a/dev-haskell/djinn-lib/metadata.xml
+++ b/dev-haskell/djinn-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Djinn uses an theorem prover for intuitionistic propositional logic
 		to generate a Haskell expression when given a type.
diff --git a/dev-haskell/dlist-instances/metadata.xml b/dev-haskell/dlist-instances/metadata.xml
index 95cdff33f29a..2cc84bb47415 100644
--- a/dev-haskell/dlist-instances/metadata.xml
+++ b/dev-haskell/dlist-instances/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		See the dlist packages.
 		This package is the canonical source for some orphan instances.
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
index 3b8e620d417c..d7b05c8a45c1 100644
--- a/dev-haskell/dlist/metadata.xml
+++ b/dev-haskell/dlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Differences lists: a list-like type supporting O(1) append.
 		This is particularly useful for efficient logging and pretty
diff --git a/dev-haskell/dns/metadata.xml b/dev-haskell/dns/metadata.xml
index 9cc544c2b3b0..b56a9366f9cd 100644
--- a/dev-haskell/dns/metadata.xml
+++ b/dev-haskell/dns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		DNS library for clients and servers.
 	</longdescription>
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
index dffd0ab6329c..1d2296ff342c 100644
--- a/dev-haskell/doctest/metadata.xml
+++ b/dev-haskell/doctest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The doctest program checks examples in source code comments.
 		It is modeled after doctest for Python
diff --git a/dev-haskell/drift/metadata.xml b/dev-haskell/drift/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/drift/metadata.xml
+++ b/dev-haskell/drift/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 6ea498ede467..74582911d104 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cross-platform File handling for Unix/Mac/Windows
 	</longdescription>
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index 7ea9251e08e2..0d08e38bb157 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.
 	</longdescription>
diff --git a/dev-haskell/editline/metadata.xml b/dev-haskell/editline/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/editline/metadata.xml
+++ b/dev-haskell/editline/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/either/metadata.xml b/dev-haskell/either/metadata.xml
index 28b747f61339..c4e939a003f8 100644
--- a/dev-haskell/either/metadata.xml
+++ b/dev-haskell/either/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 either monad transformer
 	</longdescription>
diff --git a/dev-haskell/ekg-core/metadata.xml b/dev-haskell/ekg-core/metadata.xml
index 01ccd0408b1e..ad6a94ab8b61 100644
--- a/dev-haskell/ekg-core/metadata.xml
+++ b/dev-haskell/ekg-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library lets you defined and track system metrics.
 	</longdescription>
diff --git a/dev-haskell/ekg-json/metadata.xml b/dev-haskell/ekg-json/metadata.xml
index 5e8ea039ee79..7d7cf11017d1 100644
--- a/dev-haskell/ekg-json/metadata.xml
+++ b/dev-haskell/ekg-json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Encodes ekg metrics as JSON, using the same encoding as used by the
 		ekg package, thus allowing ekg metrics to be served by other HTTP
diff --git a/dev-haskell/ekg/metadata.xml b/dev-haskell/ekg/metadata.xml
index 8c8de5e1257b..d144b49a96d1 100644
--- a/dev-haskell/ekg/metadata.xml
+++ b/dev-haskell/ekg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library lets you remotely monitor a running process over HTTP.
 		It provides a simple way to integrate a monitoring server into any
diff --git a/dev-haskell/email-validate/metadata.xml b/dev-haskell/email-validate/metadata.xml
index f72c4dc63ead..9426b770e162 100644
--- a/dev-haskell/email-validate/metadata.xml
+++ b/dev-haskell/email-validate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Validating an email address string against RFC 5322
 	</longdescription>
diff --git a/dev-haskell/enclosed-exceptions/metadata.xml b/dev-haskell/enclosed-exceptions/metadata.xml
index 82b8a6548b1d..2f5c38ed71f4 100644
--- a/dev-haskell/enclosed-exceptions/metadata.xml
+++ b/dev-haskell/enclosed-exceptions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Catching all exceptions raised within an enclosed computation,
 		while remaining responsive to (external) asynchronous exceptions.
diff --git a/dev-haskell/encoding/metadata.xml b/dev-haskell/encoding/metadata.xml
index 924adebf6db3..84443dece9bd 100644
--- a/dev-haskell/encoding/metadata.xml
+++ b/dev-haskell/encoding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
 	</longdescription>
diff --git a/dev-haskell/entropy/metadata.xml b/dev-haskell/entropy/metadata.xml
index e999949638db..bb7c84282bb9 100644
--- a/dev-haskell/entropy/metadata.xml
+++ b/dev-haskell/entropy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A platform independent method to obtain cryptographically strong entropy
 		(RDRAND when available anywhere, urandom on nix, CryptAPI on Windows, patches welcome).
diff --git a/dev-haskell/enumerator/metadata.xml b/dev-haskell/enumerator/metadata.xml
index 94f1cc788ba3..2e252ac1ce51 100644
--- a/dev-haskell/enumerator/metadata.xml
+++ b/dev-haskell/enumerator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Typical buffer&amp;#x2013;based incremental I/O is based around a single loop,
 		which reads data from some source (such as a socket or file), transforms
diff --git a/dev-haskell/equivalence/metadata.xml b/dev-haskell/equivalence/metadata.xml
index a9b99ce8ce81..428b0bd24f8d 100644
--- a/dev-haskell/equivalence/metadata.xml
+++ b/dev-haskell/equivalence/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is an implementation of Tarjan's Union-Find algorithm (Robert
 		E. Tarjan. "Efficiency of a Good But Not Linear Set Union
diff --git a/dev-haskell/erf/metadata.xml b/dev-haskell/erf/metadata.xml
index 1bd094125296..a8095f919b6a 100644
--- a/dev-haskell/erf/metadata.xml
+++ b/dev-haskell/erf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A type class for the error function, erf, and related functions.
 		Instances for Float and Double.
diff --git a/dev-haskell/errorcall-eq-instance/metadata.xml b/dev-haskell/errorcall-eq-instance/metadata.xml
index 53b5ccaf069e..8bba41695b35 100644
--- a/dev-haskell/errorcall-eq-instance/metadata.xml
+++ b/dev-haskell/errorcall-eq-instance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Prior to @base-4.7.0.0@ there was no @Eq@ instance for
 		@ErrorCall@.  This package provides an orphan instance.
diff --git a/dev-haskell/errors/metadata.xml b/dev-haskell/errors/metadata.xml
index 9c339e28f4ef..90f372fe108a 100644
--- a/dev-haskell/errors/metadata.xml
+++ b/dev-haskell/errors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The one-stop shop for all your error-handling needs!  Just import
 		"Control.Error".
diff --git a/dev-haskell/esqueleto/metadata.xml b/dev-haskell/esqueleto/metadata.xml
index 7e706ecf63b6..0922223bb8a7 100644
--- a/dev-haskell/esqueleto/metadata.xml
+++ b/dev-haskell/esqueleto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@persistent@ is a library for type-safe data serialization.  It
 		has many kinds of backends, such as SQL backends
diff --git a/dev-haskell/exceptions/metadata.xml b/dev-haskell/exceptions/metadata.xml
index b7da76b43080..24a0b40fd696 100644
--- a/dev-haskell/exceptions/metadata.xml
+++ b/dev-haskell/exceptions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Extensible optionally-pure exceptions
 	</longdescription>
diff --git a/dev-haskell/executable-path/metadata.xml b/dev-haskell/executable-path/metadata.xml
index f16ad43d0b6b..4681c1121c7e 100644
--- a/dev-haskell/executable-path/metadata.xml
+++ b/dev-haskell/executable-path/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The documentation of "System.Environment.getProgName" says that
 		\"However, this is hard-to-impossible to implement on some non-Unix OSes,
diff --git a/dev-haskell/extensible-exceptions/metadata.xml b/dev-haskell/extensible-exceptions/metadata.xml
index e379152ea4d6..b162d7b28ba2 100644
--- a/dev-haskell/extensible-exceptions/metadata.xml
+++ b/dev-haskell/extensible-exceptions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides extensible exceptions for both new and
 		old versions of GHC (i.e., &lt; 6.10).
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index 05bd6f359522..e565eed1908a 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A hodge-podge of functions and modules that do not have a better home
 	</longdescription>
diff --git a/dev-haskell/failure/metadata.xml b/dev-haskell/failure/metadata.xml
index 42edf9a005b7..18d59a472fcf 100644
--- a/dev-haskell/failure/metadata.xml
+++ b/dev-haskell/failure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A simple type class for success/failure computations.
 	</longdescription>
diff --git a/dev-haskell/fast-logger/metadata.xml b/dev-haskell/fast-logger/metadata.xml
index 0c39fe760a89..0bba74d1020c 100644
--- a/dev-haskell/fast-logger/metadata.xml
+++ b/dev-haskell/fast-logger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A fast logging system
 	</longdescription>
diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
index 5d36bd3f189d..82e6846afdd9 100644
--- a/dev-haskell/fclabels/metadata.xml
+++ b/dev-haskell/fclabels/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides first class labels that can act as
 		bidirectional record fields. The labels can be derived
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
index 3aff3f32bafb..1d81e9994e64 100644
--- a/dev-haskell/fdo-notify/metadata.xml
+++ b/dev-haskell/fdo-notify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A library for issuing notifications using FreeDesktop.org's Desktop
 		Notifications protcol. This protocol is supported by services such
diff --git a/dev-haskell/feed/metadata.xml b/dev-haskell/feed/metadata.xml
index c657f6d2efcf..c4adc2881f0d 100644
--- a/dev-haskell/feed/metadata.xml
+++ b/dev-haskell/feed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.
 	</longdescription>
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index 18a820e00d9a..825b6fbc62ae 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Martin Erwig's Functional Graph Library
 	</longdescription>
diff --git a/dev-haskell/file-embed/metadata.xml b/dev-haskell/file-embed/metadata.xml
index 1ee790de7ca7..f9a946f96259 100644
--- a/dev-haskell/file-embed/metadata.xml
+++ b/dev-haskell/file-embed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Use Template Haskell to embed file contents directly.
 	</longdescription>
diff --git a/dev-haskell/file-location/metadata.xml b/dev-haskell/file-location/metadata.xml
index 20341f110dbd..9bb5b0d5c8c0 100644
--- a/dev-haskell/file-location/metadata.xml
+++ b/dev-haskell/file-location/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Common debugging/error/exception functions that give file location information
 		
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 933506f8e66c..4eae07e447cc 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell library for working with files and directories.
 		Includes code for pattern matching, finding files,
diff --git a/dev-haskell/filestore/metadata.xml b/dev-haskell/filestore/metadata.xml
index 57144d9ab63b..e0b5b7e920d4 100644
--- a/dev-haskell/filestore/metadata.xml
+++ b/dev-haskell/filestore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The filestore library provides an abstract interface for a versioning
 		file store, and modules that instantiate this interface.  Currently
diff --git a/dev-haskell/filesystem-conduit/metadata.xml b/dev-haskell/filesystem-conduit/metadata.xml
index 746d7269b6b6..0af699ccfe0a 100644
--- a/dev-haskell/filesystem-conduit/metadata.xml
+++ b/dev-haskell/filesystem-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides ability to traverse a folder structure efficiently, as well as convenience wrappers for reading from and writing to files.
 	</longdescription>
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index bebd737ccaff..a750b625083a 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This module locates the full directory to the running program,
 		to allow the use of paths relative to it.
diff --git a/dev-haskell/fingertree/metadata.xml b/dev-haskell/fingertree/metadata.xml
index f6d9f027b1cd..6b9f453d20e0 100644
--- a/dev-haskell/fingertree/metadata.xml
+++ b/dev-haskell/fingertree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A general sequence representation with arbitrary
 		annotations, for use as a base for implementations of
diff --git a/dev-haskell/fmlist/metadata.xml b/dev-haskell/fmlist/metadata.xml
index 5fb8dfb59404..635ae147e997 100644
--- a/dev-haskell/fmlist/metadata.xml
+++ b/dev-haskell/fmlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		FoldMap lists are lists represented by their foldMap function.
 		FoldMap lists have O(1) cons, snoc and append, just like DLists,
diff --git a/dev-haskell/foldl/metadata.xml b/dev-haskell/foldl/metadata.xml
index 5cdf37ee3d00..0eb9fe009d6d 100644
--- a/dev-haskell/foldl/metadata.xml
+++ b/dev-haskell/foldl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides strict left folds that stream in constant
 		memory, and you can combine folds using @Applicative@ style to derive new
diff --git a/dev-haskell/free/metadata.xml b/dev-haskell/free/metadata.xml
index 3335ae4a2d0e..a4673e17237a 100644
--- a/dev-haskell/free/metadata.xml
+++ b/dev-haskell/free/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Monads for free
 	</longdescription>
diff --git a/dev-haskell/frown/metadata.xml b/dev-haskell/frown/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/frown/metadata.xml
+++ b/dev-haskell/frown/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/fsnotify/metadata.xml b/dev-haskell/fsnotify/metadata.xml
index eabb10714e65..8f0de3dee8ac 100644
--- a/dev-haskell/fsnotify/metadata.xml
+++ b/dev-haskell/fsnotify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cross platform library for file creation, modification,
 		and deletion notification. This library builds upon
diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
index 49e3c008fd06..534f5a645562 100644
--- a/dev-haskell/generic-deriving/metadata.xml
+++ b/dev-haskell/generic-deriving/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides functionality for generalizing the deriving mechanism
 		in Haskell to arbitrary classes. It was first described in the paper:
diff --git a/dev-haskell/geniplate-mirror/metadata.xml b/dev-haskell/geniplate-mirror/metadata.xml
index a96fc318d24d..fa64a4ea97fc 100644
--- a/dev-haskell/geniplate-mirror/metadata.xml
+++ b/dev-haskell/geniplate-mirror/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Use Template Haskell to generate Uniplate-like functions.
 		
diff --git a/dev-haskell/geniplate/metadata.xml b/dev-haskell/geniplate/metadata.xml
index 3bc6b444e951..c824f5f0514e 100644
--- a/dev-haskell/geniplate/metadata.xml
+++ b/dev-haskell/geniplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Use template Haskell to generate Uniplate-like functions.
 	</longdescription>
diff --git a/dev-haskell/ghc-paths/metadata.xml b/dev-haskell/ghc-paths/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/ghc-paths/metadata.xml
+++ b/dev-haskell/ghc-paths/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
index 38f0a45fcee4..dae7b6abe963 100644
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Scrap Your Boilerplate utilities for the GHC API.
 	</longdescription>
diff --git a/dev-haskell/gio/metadata.xml b/dev-haskell/gio/metadata.xml
index cd8a787d16a2..f46b03044538 100644
--- a/dev-haskell/gio/metadata.xml
+++ b/dev-haskell/gio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		GIO is striving to provide a modern, easy-to-use VFS API that sits at the right level in the library stack.
 		The goal is to overcome the shortcomings of GnomeVFS and provide an API that is
diff --git a/dev-haskell/glade/metadata.xml b/dev-haskell/glade/metadata.xml
index 5d0c4f356b42..393510963d9a 100644
--- a/dev-haskell/glade/metadata.xml
+++ b/dev-haskell/glade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library allows to load externally stored user interfaces into
 		programs. This allows alteration of the interface without recompilation
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index 2a82a19ae548..7e9994adeb41 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+        <email>haskell@gentoo.org</email>
+        <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The GNU Library is a collection of C data structures and utility
 		function for dealing with Unicode. This package only binds as
diff --git a/dev-haskell/glob/metadata.xml b/dev-haskell/glob/metadata.xml
index 5616e0183695..b8b4248fcd5a 100644
--- a/dev-haskell/glob/metadata.xml
+++ b/dev-haskell/glob/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A library for globbing: matching patterns against file paths.
 	</longdescription>
diff --git a/dev-haskell/gluraw/metadata.xml b/dev-haskell/gluraw/metadata.xml
index 83ca80ff7146..e9be0cfd3891 100644
--- a/dev-haskell/gluraw/metadata.xml
+++ b/dev-haskell/gluraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is
 		basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
diff --git a/dev-haskell/glut/metadata.xml b/dev-haskell/glut/metadata.xml
index 9428eff2e964..4af80231167e 100644
--- a/dev-haskell/glut/metadata.xml
+++ b/dev-haskell/glut/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell binding for the OpenGL Utility Toolkit, a window system independent
 		toolkit for writing OpenGL programs. For more information about the C library
diff --git a/dev-haskell/gnuidn/metadata.xml b/dev-haskell/gnuidn/metadata.xml
index abd841c0b0e9..a1dc94af1f91 100644
--- a/dev-haskell/gnuidn/metadata.xml
+++ b/dev-haskell/gnuidn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Bindings for GNU IDN
 	</longdescription>
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
index 8ffc051f268a..80f98a743ccc 100644
--- a/dev-haskell/gnutls/metadata.xml
+++ b/dev-haskell/gnutls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		You almost certainly don't want to depend on this release.
 		
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
index 8e9e50a57cc0..df941bdcc5b8 100644
--- a/dev-haskell/groupoids/metadata.xml
+++ b/dev-haskell/groupoids/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 Groupoids
 	</longdescription>
diff --git a/dev-haskell/gsasl/metadata.xml b/dev-haskell/gsasl/metadata.xml
index de18f8c57e41..84e9475a2acd 100644
--- a/dev-haskell/gsasl/metadata.xml
+++ b/dev-haskell/gsasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Bindings for GNU libgsasl
 	</longdescription>
diff --git a/dev-haskell/gtk/metadata.xml b/dev-haskell/gtk/metadata.xml
index 1f100db8721e..16e5da2eb493 100644
--- a/dev-haskell/gtk/metadata.xml
+++ b/dev-haskell/gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is the core library of the Gtk2Hs suite of libraries for Haskell
 		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml
index 1a141b6f2055..cb52f7f817b2 100644
--- a/dev-haskell/gtk2hs-buildtools/metadata.xml
+++ b/dev-haskell/gtk2hs-buildtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a set of helper programs necessary to
 		build the Gtk2Hs suite of libraries. These tools include
diff --git a/dev-haskell/gtk3/metadata.xml b/dev-haskell/gtk3/metadata.xml
index ee8b0291295b..cf00a8f1e001 100644
--- a/dev-haskell/gtk3/metadata.xml
+++ b/dev-haskell/gtk3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is the core library of the Gtk2Hs suite of libraries for Haskell
 		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
diff --git a/dev-haskell/haddock-api/metadata.xml b/dev-haskell/haddock-api/metadata.xml
index 0fc4b3e0fc56..97664c6bdc7b 100644
--- a/dev-haskell/haddock-api/metadata.xml
+++ b/dev-haskell/haddock-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haddock is a documentation-generation tool for Haskell
 		libraries
diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
index dfc8b713debe..94a6e8bff239 100644
--- a/dev-haskell/haddock-library/metadata.xml
+++ b/dev-haskell/haddock-library/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haddock is a documentation-generation tool for Haskell
 		libraries. These modules expose some functionality of it
diff --git a/dev-haskell/haddock/metadata.xml b/dev-haskell/haddock/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/haddock/metadata.xml
+++ b/dev-haskell/haddock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
index ecdb35051a4a..1cff91db543b 100644
--- a/dev-haskell/hamlet/metadata.xml
+++ b/dev-haskell/hamlet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
 		
diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
index 1d0e584ecfa3..309ccef7e6d5 100644
--- a/dev-haskell/happstack-server/metadata.xml
+++ b/dev-haskell/happstack-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
 	</longdescription>
diff --git a/dev-haskell/happy/metadata.xml b/dev-haskell/happy/metadata.xml
index 1a2ff416b8e8..8f6b13b6df0d 100644
--- a/dev-haskell/happy/metadata.xml
+++ b/dev-haskell/happy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Happy is a parser generator for Haskell
 	</longdescription>
diff --git a/dev-haskell/harp/metadata.xml b/dev-haskell/harp/metadata.xml
index e85a7d4e3036..b2d993ad594d 100644
--- a/dev-haskell/harp/metadata.xml
+++ b/dev-haskell/harp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription lang="en">
 	HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
 	normal pattern matching facility with the power of regular expressions. This
diff --git a/dev-haskell/hashable/metadata.xml b/dev-haskell/hashable/metadata.xml
index 7c06716089c0..86597d2c48ea 100644
--- a/dev-haskell/hashable/metadata.xml
+++ b/dev-haskell/hashable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package defines a class, 'Hashable', for types that
 		can be converted to a hash value.  This class
diff --git a/dev-haskell/hashed-storage/metadata.xml b/dev-haskell/hashed-storage/metadata.xml
index 20421897c38c..dfe4c9a4dc82 100644
--- a/dev-haskell/hashed-storage/metadata.xml
+++ b/dev-haskell/hashed-storage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Support code for reading and manipulating hashed file storage
 		(where each file and directory is associated with a
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 534f6dfdb278..3d4334e23475 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package provides a couple of different implementations of mutable hash
 		tables in the ST monad, as well as a typeclass abstracting their common
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
index 24b9af7494c4..87faf0628749 100644
--- a/dev-haskell/haskeline/metadata.xml
+++ b/dev-haskell/haskeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskeline provides a user interface for line input in command-line
 		programs.  This library is similar in purpose to readline, but since
diff --git a/dev-haskell/haskell-lexer/metadata.xml b/dev-haskell/haskell-lexer/metadata.xml
index 1f616f916264..77300a59ea1d 100644
--- a/dev-haskell/haskell-lexer/metadata.xml
+++ b/dev-haskell/haskell-lexer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A fully compliant Haskell 98 lexer.
 	</longdescription>
diff --git a/dev-haskell/haskell-platform/metadata.xml b/dev-haskell/haskell-platform/metadata.xml
index d9f34097f44e..123455aa0b38 100644
--- a/dev-haskell/haskell-platform/metadata.xml
+++ b/dev-haskell/haskell-platform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The Haskell Platform (HP) is the blessed set of libraries and tools on
 		which to build further Haskell libraries and applications. It is
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 65af20f163f7..327afb6953e3 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
+  <maintainer>
+    <email>haskell@gentoo.org</email>
+    <name>Gentoo Haskell</name>
+  </maintainer>
   <longdescription lang="en">
 Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
 standard haskell-src package, and handles most common syntactic extensions to
diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
index 25396cce34b7..28c72535bfd8 100644
--- a/dev-haskell/haskell-src-meta/metadata.xml
+++ b/dev-haskell/haskell-src-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The translation from haskell-src-exts abstract syntax
 		to template-haskell abstract syntax isn't 100% complete yet.
diff --git a/dev-haskell/haskell-src/metadata.xml b/dev-haskell/haskell-src/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/haskell-src/metadata.xml
+++ b/dev-haskell/haskell-src/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/hastache/metadata.xml b/dev-haskell/hastache/metadata.xml
index 4f481b189157..0edaf8138ea9 100644
--- a/dev-haskell/hastache/metadata.xml
+++ b/dev-haskell/hastache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell implementation of Mustache templates (&lt;https://mustache.github.com/&gt;).
 		
diff --git a/dev-haskell/haxml/metadata.xml b/dev-haskell/haxml/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/haxml/metadata.xml
+++ b/dev-haskell/haxml/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
index e97aed95fc01..ded80f37f9da 100644
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ b/dev-haskell/hdbc-mysql/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package provides a MySQL driver for HDBC, implemented via
 		bindings to the C @mysqlclient@ library.
diff --git a/dev-haskell/hdbc-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
index 0b5657ed5bdd..a9c478dbd58c 100644
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ b/dev-haskell/hdbc-odbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides an ODBC database backend for HDBC.
 		It is cross-platform and supports unixODBC on Unix/Linux/POSIX platforms
diff --git a/dev-haskell/hdbc-postgresql/metadata.xml b/dev-haskell/hdbc-postgresql/metadata.xml
index e171b0d92ee7..584f84b512e2 100644
--- a/dev-haskell/hdbc-postgresql/metadata.xml
+++ b/dev-haskell/hdbc-postgresql/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/hdbc-sqlite/metadata.xml b/dev-haskell/hdbc-sqlite/metadata.xml
index 0ef35d2796f6..4c9ebe9429b0 100644
--- a/dev-haskell/hdbc-sqlite/metadata.xml
+++ b/dev-haskell/hdbc-sqlite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is the Sqlite v3 driver for HDBC, the generic
 		database access system for Haskell
diff --git a/dev-haskell/hdbc/metadata.xml b/dev-haskell/hdbc/metadata.xml
index 607a1e4d0d53..77e0c6dd3ea5 100644
--- a/dev-haskell/hdbc/metadata.xml
+++ b/dev-haskell/hdbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HDBC provides an abstraction layer between Haskell programs and SQL
 		relational databases. This lets you write database code once, in
diff --git a/dev-haskell/hex/metadata.xml b/dev-haskell/hex/metadata.xml
index 59427924c3b8..dd2a3856d30c 100644
--- a/dev-haskell/hex/metadata.xml
+++ b/dev-haskell/hex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Convert strings into hexadecimal and back.
 	</longdescription>
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
index 1cdb0a83454a..476493f5df90 100644
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package provides a general purpose Haskell XML library using Expat to
 		do its parsing (&lt;http://expat.sourceforge.net/&gt; - a fast stream-oriented XML
diff --git a/dev-haskell/hgettext/metadata.xml b/dev-haskell/hgettext/metadata.xml
index 22f2fb8e9a19..f8b7ab253b21 100644
--- a/dev-haskell/hgettext/metadata.xml
+++ b/dev-haskell/hgettext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Bindings to libintl.h (gettext, bindtextdomain)
 	</longdescription>
diff --git a/dev-haskell/highlighting-kate/metadata.xml b/dev-haskell/highlighting-kate/metadata.xml
index e2281dce511b..cf307ad362de 100644
--- a/dev-haskell/highlighting-kate/metadata.xml
+++ b/dev-haskell/highlighting-kate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		highlighting-kate is a syntax highlighting library
 		with support for nearly one hundred languages. The syntax
diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml
index 1f9ae6c0236b..f57ff1f26d47 100644
--- a/dev-haskell/hinotify/metadata.xml
+++ b/dev-haskell/hinotify/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/hjsmin/metadata.xml b/dev-haskell/hjsmin/metadata.xml
index 539dfcb586d5..9affd49c3b17 100644
--- a/dev-haskell/hjsmin/metadata.xml
+++ b/dev-haskell/hjsmin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Reduces size of javascript files by stripping out extraneous whitespace and
 		other syntactic elements, without changing the semantics.
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
index dd702bc48e46..b8048c00a9e6 100644
--- a/dev-haskell/hlint/metadata.xml
+++ b/dev-haskell/hlint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HLint gives suggestions on how to improve your source code.
 	</longdescription>
diff --git a/dev-haskell/hoauth2/metadata.xml b/dev-haskell/hoauth2/metadata.xml
index d190209d4ed1..ab498d193621 100644
--- a/dev-haskell/hoauth2/metadata.xml
+++ b/dev-haskell/hoauth2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell OAuth2 authentication.
 		
diff --git a/dev-haskell/hostname/metadata.xml b/dev-haskell/hostname/metadata.xml
index 1f7f3d0a7234..0745321ced19 100644
--- a/dev-haskell/hostname/metadata.xml
+++ b/dev-haskell/hostname/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A very simple package providing a cross-platform means of determining the hostname
 	</longdescription>
diff --git a/dev-haskell/hourglass/metadata.xml b/dev-haskell/hourglass/metadata.xml
index 2b2d13d44158..603ac2670781 100644
--- a/dev-haskell/hourglass/metadata.xml
+++ b/dev-haskell/hourglass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple time library focusing on simple but powerful and performant API
 		
diff --git a/dev-haskell/hpc/metadata.xml b/dev-haskell/hpc/metadata.xml
index 956e475a80e7..f016c4b26e09 100644
--- a/dev-haskell/hpc/metadata.xml
+++ b/dev-haskell/hpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Code Coverage Library for Haskell
 	</longdescription>
diff --git a/dev-haskell/hs-bibutils/metadata.xml b/dev-haskell/hs-bibutils/metadata.xml
index 3b34cc3cde8b..b18b5334d755 100644
--- a/dev-haskell/hs-bibutils/metadata.xml
+++ b/dev-haskell/hs-bibutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell bindings to Chris Putnam's bibutils, a
 		library that interconverts between various
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
index 802004476ec1..470e70d1cf6e 100644
--- a/dev-haskell/hs3/metadata.xml
+++ b/dev-haskell/hs3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is the Haskell S3 library.  It provides an
 		interface to Amazon's Simple Storage Service (S3), allowing Haskell
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
index 403deff9771e..4e9a43bdaf8e 100644
--- a/dev-haskell/hsb2hs/metadata.xml
+++ b/dev-haskell/hsb2hs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		hsb2hs is a preprocessor that allows you to include the contents of
 		files as string literals in your Haskell programs and libraries.
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/hscolour/metadata.xml
+++ b/dev-haskell/hscolour/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 1db0e6643219..90ac51deb3e1 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="buildtests">Build the executable to run unit tests.</flag>
 	</use>
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index 4e5483a95f1f..3dd899867688 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="system-lua">Use the system-wide lua instead of the bundled copy.</flag>
 	</use>
diff --git a/dev-haskell/hsopenssl/metadata.xml b/dev-haskell/hsopenssl/metadata.xml
index 515d5be00721..a2f0f0ad1f35 100644
--- a/dev-haskell/hsopenssl/metadata.xml
+++ b/dev-haskell/hsopenssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="fast-bignum">Enable fast moving of bignums between OpenSSL and GMP (GHC Only)</flag>
 	</use>
diff --git a/dev-haskell/hspec-core/metadata.xml b/dev-haskell/hspec-core/metadata.xml
index 5744e2844ce8..5391b742925e 100644
--- a/dev-haskell/hspec-core/metadata.xml
+++ b/dev-haskell/hspec-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package exposes internal types and functions that can be
 		used to extend Hspec's functionality.
diff --git a/dev-haskell/hspec-discover/metadata.xml b/dev-haskell/hspec-discover/metadata.xml
index 1090d2e6d09e..9343ba3721f5 100644
--- a/dev-haskell/hspec-discover/metadata.xml
+++ b/dev-haskell/hspec-discover/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Automatically discover and run Hspec tests
 		
diff --git a/dev-haskell/hspec-expectations/metadata.xml b/dev-haskell/hspec-expectations/metadata.xml
index 42acbbd8172a..1a4f24423887 100644
--- a/dev-haskell/hspec-expectations/metadata.xml
+++ b/dev-haskell/hspec-expectations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Catchy combinators for HUnit: &lt;https://github.com/sol/hspec-expectations#readme&gt;
 	</longdescription>
diff --git a/dev-haskell/hspec-meta/metadata.xml b/dev-haskell/hspec-meta/metadata.xml
index ec7ef698d1fd..9abcf9b25cfd 100644
--- a/dev-haskell/hspec-meta/metadata.xml
+++ b/dev-haskell/hspec-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A stable version of Hspec which is used to test the
 		in-development version of Hspec.
diff --git a/dev-haskell/hspec/metadata.xml b/dev-haskell/hspec/metadata.xml
index ab8d7778598b..7d1544e0b7db 100644
--- a/dev-haskell/hspec/metadata.xml
+++ b/dev-haskell/hspec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Behavior Driven Development for Haskell
 		
diff --git a/dev-haskell/hsql-mysql/metadata.xml b/dev-haskell/hsql-mysql/metadata.xml
index cf6d37f198fd..26802cacd2db 100644
--- a/dev-haskell/hsql-mysql/metadata.xml
+++ b/dev-haskell/hsql-mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		MySQL driver for HSQL.
 	</longdescription>
diff --git a/dev-haskell/hsql-odbc/metadata.xml b/dev-haskell/hsql-odbc/metadata.xml
index 3efeb0ec2f89..bf0f14c2f3ac 100644
--- a/dev-haskell/hsql-odbc/metadata.xml
+++ b/dev-haskell/hsql-odbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ODBC driver for HSQL.
 	</longdescription>
diff --git a/dev-haskell/hsql-postgresql/metadata.xml b/dev-haskell/hsql-postgresql/metadata.xml
index 70cef0b47eb5..d66d2042b150 100644
--- a/dev-haskell/hsql-postgresql/metadata.xml
+++ b/dev-haskell/hsql-postgresql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		PostgreSQL driver for HSQL.
 	</longdescription>
diff --git a/dev-haskell/hsql-sqlite3/metadata.xml b/dev-haskell/hsql-sqlite3/metadata.xml
index 420114e63c4e..4520c7b049f0 100644
--- a/dev-haskell/hsql-sqlite3/metadata.xml
+++ b/dev-haskell/hsql-sqlite3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell Interface to SQLite 3 via libsqlite3
 		in the standard library path.
diff --git a/dev-haskell/hsql/metadata.xml b/dev-haskell/hsql/metadata.xml
index cf220d8043b5..df2c0be36132 100644
--- a/dev-haskell/hsql/metadata.xml
+++ b/dev-haskell/hsql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple library for database access from Haskell.
 	</longdescription>
diff --git a/dev-haskell/hstringtemplate/metadata.xml b/dev-haskell/hstringtemplate/metadata.xml
index 41baef021a3b..730daef4fc3c 100644
--- a/dev-haskell/hstringtemplate/metadata.xml
+++ b/dev-haskell/hstringtemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A port of the Java library by Terrence Parr.
 	</longdescription>
diff --git a/dev-haskell/html-conduit/metadata.xml b/dev-haskell/html-conduit/metadata.xml
index 0fe5f9fae8de..5b52c320d698 100644
--- a/dev-haskell/html-conduit/metadata.xml
+++ b/dev-haskell/html-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package uses tagstream-conduit for its parser. It automatically balances mismatched tags, so that there shouldn't be any parse failures. It does not handle a full HTML document rendering, such as adding missing html and head tags.
 	</longdescription>
diff --git a/dev-haskell/html/metadata.xml b/dev-haskell/html/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/html/metadata.xml
+++ b/dev-haskell/html/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/http-attoparsec/metadata.xml b/dev-haskell/http-attoparsec/metadata.xml
index 8da91581407b..db770839d49b 100644
--- a/dev-haskell/http-attoparsec/metadata.xml
+++ b/dev-haskell/http-attoparsec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Attoparsec parsers for http-types.
 	</longdescription>
diff --git a/dev-haskell/http-client-conduit/metadata.xml b/dev-haskell/http-client-conduit/metadata.xml
index 6484303fe7cc..c3f637c0f1f5 100644
--- a/dev-haskell/http-client-conduit/metadata.xml
+++ b/dev-haskell/http-client-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Intended for use by higher-level libraries, such as http-conduit.
 	</longdescription>
diff --git a/dev-haskell/http-client-multipart/metadata.xml b/dev-haskell/http-client-multipart/metadata.xml
index 3ff0ce47cb9a..ea93ef11790b 100644
--- a/dev-haskell/http-client-multipart/metadata.xml
+++ b/dev-haskell/http-client-multipart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generate multipart uploads for http-client.
 	</longdescription>
diff --git a/dev-haskell/http-client-tls/metadata.xml b/dev-haskell/http-client-tls/metadata.xml
index 6484303fe7cc..c3f637c0f1f5 100644
--- a/dev-haskell/http-client-tls/metadata.xml
+++ b/dev-haskell/http-client-tls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Intended for use by higher-level libraries, such as http-conduit.
 	</longdescription>
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
index edb374e357be..d3f08e451512 100644
--- a/dev-haskell/http-client/metadata.xml
+++ b/dev-haskell/http-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This codebase has been refactored from http-conduit.
 	</longdescription>
diff --git a/dev-haskell/http-conduit/metadata.xml b/dev-haskell/http-conduit/metadata.xml
index a39a0ef7b064..7a4159859ff3 100644
--- a/dev-haskell/http-conduit/metadata.xml
+++ b/dev-haskell/http-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package uses attoparsec for parsing the actual contents of the HTTP connection. It also provides higher-level functions which allow you to avoid direct usage of conduits. See &lt;http://www.yesodweb.com/book/http-conduit&gt; for more information.
 	</longdescription>
diff --git a/dev-haskell/http-date/metadata.xml b/dev-haskell/http-date/metadata.xml
index 5aed26408fb8..758eaa728505 100644
--- a/dev-haskell/http-date/metadata.xml
+++ b/dev-haskell/http-date/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast parser and formatter for HTTP Date
 	</longdescription>
diff --git a/dev-haskell/http-reverse-proxy/metadata.xml b/dev-haskell/http-reverse-proxy/metadata.xml
index 735a1f75375c..7a168df1fcde 100644
--- a/dev-haskell/http-reverse-proxy/metadata.xml
+++ b/dev-haskell/http-reverse-proxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides a simple means of reverse-proxying HTTP requests. The raw approach uses the same technique as leveraged by keter, whereas the WAI approach performs full request/response parsing via WAI and http-conduit.
 	</longdescription>
diff --git a/dev-haskell/http-types/metadata.xml b/dev-haskell/http-types/metadata.xml
index a0bf856b6970..531ff8a672a4 100644
--- a/dev-haskell/http-types/metadata.xml
+++ b/dev-haskell/http-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generic HTTP types for Haskell (for both client and server code).
 	</longdescription>
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
index 155e11ce588c..dbb0180801a5 100644
--- a/dev-haskell/http/metadata.xml
+++ b/dev-haskell/http/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The HTTP package supports client-side web programming in Haskell. It lets you set up
 		HTTP connections, transmitting requests and processing the responses coming back, all
diff --git a/dev-haskell/http2/metadata.xml b/dev-haskell/http2/metadata.xml
index a575d8870f71..cd1c6a41229d 100644
--- a/dev-haskell/http2/metadata.xml
+++ b/dev-haskell/http2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HTTP/2.0 library including frames and HPACK.
 		Currently HTTP/2 16 framing and HPACK 10 is supported.
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index 38e15417f89d..0feb742cfebf 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This web server promotes a Request to IO Response function
 		into a local web server. The user can decide how to interpret
diff --git a/dev-haskell/hunit/metadata.xml b/dev-haskell/hunit/metadata.xml
index 8794e4c5a679..81b4588889c4 100644
--- a/dev-haskell/hunit/metadata.xml
+++ b/dev-haskell/hunit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HUnit is a unit testing framework for Haskell, inspired by the
 		JUnit tool for Java, see: &lt;http://www.junit.org&gt;.
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
index 624d686048a8..ffb6b0b5ad58 100644
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ b/dev-haskell/hxt-charproperties/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Character proprties defined by XML and Unicode standards.
 		These modules contain predicates for Unicode blocks and char proprties
diff --git a/dev-haskell/hxt-regex-xmlschema/metadata.xml b/dev-haskell/hxt-regex-xmlschema/metadata.xml
index 2679a4a44045..084f69216898 100644
--- a/dev-haskell/hxt-regex-xmlschema/metadata.xml
+++ b/dev-haskell/hxt-regex-xmlschema/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library supports full W3C XML Schema regular expressions
 		inclusive all Unicode character sets and blocks.
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
index 774fbdd51b35..45de2457baae 100644
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ b/dev-haskell/hxt-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
 		used in the Haskell XML Toolbox.
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
index 81586f0d9ca8..f4634aa94db9 100644
--- a/dev-haskell/hxt/metadata.xml
+++ b/dev-haskell/hxt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
 		but introduces a more general approach for processing XML with Haskell.
diff --git a/dev-haskell/iconv/metadata.xml b/dev-haskell/iconv/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/iconv/metadata.xml
+++ b/dev-haskell/iconv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/idna/metadata.xml b/dev-haskell/idna/metadata.xml
index b9ed2dbe509c..fe28ea684256 100644
--- a/dev-haskell/idna/metadata.xml
+++ b/dev-haskell/idna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Implements IDNA - Internationalized Domain Names in Applications (RFC 3490).
 	</longdescription>
diff --git a/dev-haskell/ieee754/metadata.xml b/dev-haskell/ieee754/metadata.xml
index 3b55b7a01742..0e7e2aa33ea3 100644
--- a/dev-haskell/ieee754/metadata.xml
+++ b/dev-haskell/ieee754/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 	Utilities for dealing with IEEE floating point numbers, ported from the Tangoi
 	math library; approximate and exact equality comparisons for general types. 
diff --git a/dev-haskell/ifelse/metadata.xml b/dev-haskell/ifelse/metadata.xml
index 25149e91bb1f..5ad1b6e4e5d3 100644
--- a/dev-haskell/ifelse/metadata.xml
+++ b/dev-haskell/ifelse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Anaphoric and miscellaneous useful control-flow
 	</longdescription>
diff --git a/dev-haskell/iproute/metadata.xml b/dev-haskell/iproute/metadata.xml
index 23ba932fd043..2e99cddf0ee3 100644
--- a/dev-haskell/iproute/metadata.xml
+++ b/dev-haskell/iproute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		IP Routing Table is a tree of IP ranges
 		to search one of them on the longest
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
index e1c77485139f..c9fcd2d8f626 100644
--- a/dev-haskell/json/metadata.xml
+++ b/dev-haskell/json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		JSON (JavaScript Object Notation) is a lightweight data-interchange
 		format. It is easy for humans to read and write. It is easy for
diff --git a/dev-haskell/juicypixels/metadata.xml b/dev-haskell/juicypixels/metadata.xml
index 8f705b543fb5..8e7213a262bf 100644
--- a/dev-haskell/juicypixels/metadata.xml
+++ b/dev-haskell/juicypixels/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		&lt;&lt;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==&gt;&gt;
 		
diff --git a/dev-haskell/kan-extensions/metadata.xml b/dev-haskell/kan-extensions/metadata.xml
index fea6780e5e97..7e161d0e8193 100644
--- a/dev-haskell/kan-extensions/metadata.xml
+++ b/dev-haskell/kan-extensions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Kan extensions, the Yoneda lemma, and (co)density (co)monads
 	</longdescription>
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
index 6db9e5e4ecf3..cb59a94f915b 100644
--- a/dev-haskell/keys/metadata.xml
+++ b/dev-haskell/keys/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Keyed functors and containers
 	</longdescription>
diff --git a/dev-haskell/language-c/metadata.xml b/dev-haskell/language-c/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/language-c/metadata.xml
+++ b/dev-haskell/language-c/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/language-haskell-extract/metadata.xml b/dev-haskell/language-haskell-extract/metadata.xml
index cfb283864121..6d012f17d4d5 100644
--- a/dev-haskell/language-haskell-extract/metadata.xml
+++ b/dev-haskell/language-haskell-extract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@language-haskell-extract@ contains some useful helper functions on top of Template Haskell.
 		
diff --git a/dev-haskell/language-javascript/metadata.xml b/dev-haskell/language-javascript/metadata.xml
index 526bda2b408b..0c808e929391 100644
--- a/dev-haskell/language-javascript/metadata.xml
+++ b/dev-haskell/language-javascript/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Parses Javascript into an Abstract Syntax Tree (AST).  Initially intended as frontend to hjsmin.
 	</longdescription>
diff --git a/dev-haskell/lazysmallcheck/metadata.xml b/dev-haskell/lazysmallcheck/metadata.xml
index 25e6c3466d85..f6a4a984e3a5 100644
--- a/dev-haskell/lazysmallcheck/metadata.xml
+++ b/dev-haskell/lazysmallcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Lazy SmallCheck is a library for exhaustive, demand-driven testing of
 		Haskell programs.  It is based on the idea that if a property holds
diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
index 272873069bfc..d3b76eee3e16 100644
--- a/dev-haskell/lcs/metadata.xml
+++ b/dev-haskell/lcs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides a function lcs that takes two lists and returns a longest
 		common sublist. For example, lcs "abcd" "acbd" is either "abd" or
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index e817d8842f5f..3c55e6fe859e 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package comes \"Batteries Included\" with many useful lenses for the types
 		commonly used from the Haskell Platform, and with tools for automatically
diff --git a/dev-haskell/lhs2tex/metadata.xml b/dev-haskell/lhs2tex/metadata.xml
index 66b9052a990b..9029619565a3 100644
--- a/dev-haskell/lhs2tex/metadata.xml
+++ b/dev-haskell/lhs2tex/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
index b172d88c815e..3d4822a25b17 100644
--- a/dev-haskell/libmpd/metadata.xml
+++ b/dev-haskell/libmpd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A client library for MPD, the Music Player Daemon
 		(&lt;http://www.musicpd.org/&gt;).
diff --git a/dev-haskell/libxml-sax/metadata.xml b/dev-haskell/libxml-sax/metadata.xml
index eb1b415ebd87..0b9fefd62238 100644
--- a/dev-haskell/libxml-sax/metadata.xml
+++ b/dev-haskell/libxml-sax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Bindings for the libXML2 SAX interface
 	</longdescription>
diff --git a/dev-haskell/libxml/metadata.xml b/dev-haskell/libxml/metadata.xml
index 57eb27867dec..de6701da4a7b 100644
--- a/dev-haskell/libxml/metadata.xml
+++ b/dev-haskell/libxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Minimal binding to libxml2. Additional functions will be added when needed.
 	</longdescription>
diff --git a/dev-haskell/lifted-async/metadata.xml b/dev-haskell/lifted-async/metadata.xml
index 4f36f3f026d5..95cc12ddc83c 100644
--- a/dev-haskell/lifted-async/metadata.xml
+++ b/dev-haskell/lifted-async/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides IO operations from @async@ package lifted to any
 		instance of 'MonadBase' or 'MonadBaseControl'.
diff --git a/dev-haskell/lifted-base/metadata.xml b/dev-haskell/lifted-base/metadata.xml
index 5e843fc06cf7..ff182ebbb871 100644
--- a/dev-haskell/lifted-base/metadata.xml
+++ b/dev-haskell/lifted-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@lifted-base@ exports IO operations from the base library lifted to
 		any instance of 'MonadBase' or 'MonadBaseControl'.
diff --git a/dev-haskell/list/metadata.xml b/dev-haskell/list/metadata.xml
index 451e7a22e3f5..981222eb5fd2 100644
--- a/dev-haskell/list/metadata.xml
+++ b/dev-haskell/list/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A List monad transformer and a List class.
 		With standard list operations for Lists
diff --git a/dev-haskell/listlike/metadata.xml b/dev-haskell/listlike/metadata.xml
index c4e85126278d..328d3d3df750 100644
--- a/dev-haskell/listlike/metadata.xml
+++ b/dev-haskell/listlike/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generic support for list-like structures in Haskell.
 		
diff --git a/dev-haskell/logging-facade/metadata.xml b/dev-haskell/logging-facade/metadata.xml
index 0e383c3017fc..8c4a34c1daa0 100644
--- a/dev-haskell/logging-facade/metadata.xml
+++ b/dev-haskell/logging-facade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Simple logging abstraction that allows multiple backends
 	</longdescription>
diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
index cee2e787377f..3f0bb8a1fa9e 100644
--- a/dev-haskell/logict/metadata.xml
+++ b/dev-haskell/logict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A continuation-based, backtracking, logic programming monad.
 		An adaptation of the two-continuation implementation found
diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml
index fad507b1f23d..6a5b70c57d44 100644
--- a/dev-haskell/lvmlib/metadata.xml
+++ b/dev-haskell/lvmlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The Lazy Virtual Machine (LVM) defines a portable instruction set and file
 		format. It is specifically designed to execute languages with non-strict (or
diff --git a/dev-haskell/maccatcher/metadata.xml b/dev-haskell/maccatcher/metadata.xml
index 94edbc4450b7..3db1ca058397 100644
--- a/dev-haskell/maccatcher/metadata.xml
+++ b/dev-haskell/maccatcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Obtain the host MAC address on *NIX and Windows.
 	</longdescription>
diff --git a/dev-haskell/markdown-unlit/metadata.xml b/dev-haskell/markdown-unlit/metadata.xml
index 40428830904e..00a0e3d6f500 100644
--- a/dev-haskell/markdown-unlit/metadata.xml
+++ b/dev-haskell/markdown-unlit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Documentation is here: &lt;https://github.com/sol/markdown-unlit#readme&gt;
 	</longdescription>
diff --git a/dev-haskell/math-functions/metadata.xml b/dev-haskell/math-functions/metadata.xml
index b9dce45365c9..01b866913c68 100644
--- a/dev-haskell/math-functions/metadata.xml
+++ b/dev-haskell/math-functions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides implementations of special mathematical
 		functions and Chebyshev polynomials.  These functions are often
diff --git a/dev-haskell/memory/metadata.xml b/dev-haskell/memory/metadata.xml
index 6e8c8539217f..8f5e83ac03c5 100644
--- a/dev-haskell/memory/metadata.xml
+++ b/dev-haskell/memory/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Chunk of memory, polymorphic byte array management and manipulation
 		
diff --git a/dev-haskell/mersenne-random-pure64/metadata.xml b/dev-haskell/mersenne-random-pure64/metadata.xml
index 13de96105f5e..a8aea609cddb 100644
--- a/dev-haskell/mersenne-random-pure64/metadata.xml
+++ b/dev-haskell/mersenne-random-pure64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The Mersenne twister is a pseudorandom number generator developed by
 		Makoto Matsumoto and Takuji Nishimura that is based on a matrix linear
diff --git a/dev-haskell/mime-mail/metadata.xml b/dev-haskell/mime-mail/metadata.xml
index e2910d9c4a22..c8c69e7e42b1 100644
--- a/dev-haskell/mime-mail/metadata.xml
+++ b/dev-haskell/mime-mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides some high-level datatypes for declaring MIME email messages, functions for automatically composing these into bytestrings, and the ability to send bytestrings via the sendmail executable. You can also use any other library you wish to send via different methods, eg directly to SMTP.
 	</longdescription>
diff --git a/dev-haskell/mime-types/metadata.xml b/dev-haskell/mime-types/metadata.xml
index bd941a899c99..5eec247f7c67 100644
--- a/dev-haskell/mime-types/metadata.xml
+++ b/dev-haskell/mime-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Basic mime-type handling types and functions
 	</longdescription>
diff --git a/dev-haskell/minisat/metadata.xml b/dev-haskell/minisat/metadata.xml
index 48c7fc849bda..0e61972cf92d 100644
--- a/dev-haskell/minisat/metadata.xml
+++ b/dev-haskell/minisat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell bundle of the Minisat SAT solver
 	</longdescription>
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index 60db33df846b..647c2a83310a 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/mmap/metadata.xml b/dev-haskell/mmap/metadata.xml
index 750d696bf7ac..2fb771aaa0eb 100644
--- a/dev-haskell/mmap/metadata.xml
+++ b/dev-haskell/mmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides a wrapper to mmap(2) or MapViewOfFile,
 		allowing files or devices to be lazily loaded into memory as
diff --git a/dev-haskell/mmorph/metadata.xml b/dev-haskell/mmorph/metadata.xml
index 2635091a8c93..a0ff15ab7613 100644
--- a/dev-haskell/mmorph/metadata.xml
+++ b/dev-haskell/mmorph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides monad morphism utilities, most commonly used
 		for manipulating monad transformer stacks.
diff --git a/dev-haskell/mockery/metadata.xml b/dev-haskell/mockery/metadata.xml
index fcf70f1a8742..63c350874751 100644
--- a/dev-haskell/mockery/metadata.xml
+++ b/dev-haskell/mockery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Support functions for automated testing
 	</longdescription>
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index da06fe160857..237ddea8508c 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package defines the type class @MonadControlIO@, a subset of
 		@MonadIO@ into which generic control operations such as @catch@ can
diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
index 63f1d83a3d38..a91fc8360a42 100644
--- a/dev-haskell/monad-journal/metadata.xml
+++ b/dev-haskell/monad-journal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a typeclass for logging in
 		pure code, or more generally, in any kind of
diff --git a/dev-haskell/monad-logger/metadata.xml b/dev-haskell/monad-logger/metadata.xml
index 358d12ea0e66..054161bbf5cd 100644
--- a/dev-haskell/monad-logger/metadata.xml
+++ b/dev-haskell/monad-logger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="template_haskell">Enable Template Haskell support.</flag>
 	</use>
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
index 1eb0752ea4b6..f73d371da581 100644
--- a/dev-haskell/monad-loops/metadata.xml
+++ b/dev-haskell/monad-loops/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Some useful control operators for looping.
 		
diff --git a/dev-haskell/monad-par-extras/metadata.xml b/dev-haskell/monad-par-extras/metadata.xml
index de5a4d3238a3..a9f8edf0a2a9 100644
--- a/dev-haskell/monad-par-extras/metadata.xml
+++ b/dev-haskell/monad-par-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The modules below provide additional
 		data structures, and other added capabilities
diff --git a/dev-haskell/monad-par/metadata.xml b/dev-haskell/monad-par/metadata.xml
index 33ab394d65e2..d83d3a53a465 100644
--- a/dev-haskell/monad-par/metadata.xml
+++ b/dev-haskell/monad-par/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library offers an alternative parallel programming
 		API to that provided by the @parallel@ package.
diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
index bdb998abce3f..27956f243030 100644
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ b/dev-haskell/monadcatchio-mtl/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Provides a monad-transformer version of the @Control.Exception.catch@
 		function. For this, it defines the @MonadCatchIO@ class, a subset of
diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
index 73de4f14a63d..2be4e5059624 100644
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ b/dev-haskell/monadcatchio-transformers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides functions to throw and catch exceptions. Unlike the functions from
 		@Control.Exception@, which work in @IO@, these work in any stack of monad
diff --git a/dev-haskell/monadrandom/metadata.xml b/dev-haskell/monadrandom/metadata.xml
index b22e3aee9e2e..74c9f4a53027 100644
--- a/dev-haskell/monadrandom/metadata.xml
+++ b/dev-haskell/monadrandom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Support for computations which consume random values.
 	</longdescription>
diff --git a/dev-haskell/monads-tf/metadata.xml b/dev-haskell/monads-tf/metadata.xml
index e8f31f7a0564..cae9861daccd 100644
--- a/dev-haskell/monads-tf/metadata.xml
+++ b/dev-haskell/monads-tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Monad classes using type families, with instances for various
 		monad transformers, inspired by the paper /Functional Programming
diff --git a/dev-haskell/mono-traversable/metadata.xml b/dev-haskell/mono-traversable/metadata.xml
index b502a24aee00..e706c168d703 100644
--- a/dev-haskell/mono-traversable/metadata.xml
+++ b/dev-haskell/mono-traversable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Monomorphic variants of the Functor, Foldable, and Traversable typeclasses. Contains even more experimental code for abstracting containers and sequences.
 	</longdescription>
diff --git a/dev-haskell/mtl-compat/metadata.xml b/dev-haskell/mtl-compat/metadata.xml
index 79e859ca50a5..40f3db1d066e 100644
--- a/dev-haskell/mtl-compat/metadata.xml
+++ b/dev-haskell/mtl-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package backports the "Control.Monad.Except" module from
 		@mtl@ (if using @mtl-2.2.0.1@ or earlier), which reexports the
diff --git a/dev-haskell/mtl/metadata.xml b/dev-haskell/mtl/metadata.xml
index d4012cc59187..43ff7070d1be 100644
--- a/dev-haskell/mtl/metadata.xml
+++ b/dev-haskell/mtl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Monad classes using functional dependencies, with instances
 		for various monad transformers, inspired by the paper
diff --git a/dev-haskell/multipart/metadata.xml b/dev-haskell/multipart/metadata.xml
index 55af50e269d7..c90d11da747e 100644
--- a/dev-haskell/multipart/metadata.xml
+++ b/dev-haskell/multipart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HTTP multipart split out of the cgi package
 	</longdescription>
diff --git a/dev-haskell/mutable-containers/metadata.xml b/dev-haskell/mutable-containers/metadata.xml
index 8eb0fa716b78..a7a03e91d7ab 100644
--- a/dev-haskell/mutable-containers/metadata.xml
+++ b/dev-haskell/mutable-containers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		See docs and README at &lt;http://www.stackage.org/package/mutable-containers&gt;
 	</longdescription>
diff --git a/dev-haskell/mwc-random/metadata.xml b/dev-haskell/mwc-random/metadata.xml
index 11eb9e64f21a..4cec4b8bb751 100644
--- a/dev-haskell/mwc-random/metadata.xml
+++ b/dev-haskell/mwc-random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains code for generating high quality random
 		numbers that follow either a uniform or normal distribution.  The
diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
index 50a7466c8584..6b07dc6bc189 100644
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A lightweight implementation of a subset of Hspec's API with
 		minimal dependencies.
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 08c54b90e9da..447a063d998f 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 natural numbers
 	</longdescription>
diff --git a/dev-haskell/network-bytestring/metadata.xml b/dev-haskell/network-bytestring/metadata.xml
index 2a8a8ad4ee72..23bc36c489ee 100644
--- a/dev-haskell/network-bytestring/metadata.xml
+++ b/dev-haskell/network-bytestring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast, memory-efficient, low-level socket functions
 		that use 'Data.ByteString's instead of 'String's.
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
index 4d2d89437e6a..a9e926cca987 100644
--- a/dev-haskell/network-conduit/metadata.xml
+++ b/dev-haskell/network-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Stream socket data using conduits.
 	</longdescription>
diff --git a/dev-haskell/network-data/metadata.xml b/dev-haskell/network-data/metadata.xml
index 60ffcb806b72..fdb5867fc579 100644
--- a/dev-haskell/network-data/metadata.xml
+++ b/dev-haskell/network-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="small_base">Build the split-up base package.</flag>
 	</use>
diff --git a/dev-haskell/network-info/metadata.xml b/dev-haskell/network-info/metadata.xml
index 1a8480bcf7f6..cd8151c5cf60 100644
--- a/dev-haskell/network-info/metadata.xml
+++ b/dev-haskell/network-info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides simple read-only access to the
 		local computer's networking configuration. It is
diff --git a/dev-haskell/network-multicast/metadata.xml b/dev-haskell/network-multicast/metadata.xml
index 1f42cce11082..350230dbadb1 100644
--- a/dev-haskell/network-multicast/metadata.xml
+++ b/dev-haskell/network-multicast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The "Network.Multicast" module is for sending
 		UDP datagrams over multicast (class D) addresses.
diff --git a/dev-haskell/network-protocol-xmpp/metadata.xml b/dev-haskell/network-protocol-xmpp/metadata.xml
index 66a2c1b38de0..69930405b92e 100644
--- a/dev-haskell/network-protocol-xmpp/metadata.xml
+++ b/dev-haskell/network-protocol-xmpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Client library for the XMPP protocol.
 	</longdescription>
diff --git a/dev-haskell/network-uri/metadata.xml b/dev-haskell/network-uri/metadata.xml
index 990891e82907..79f55f36bfc0 100644
--- a/dev-haskell/network-uri/metadata.xml
+++ b/dev-haskell/network-uri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides an URI manipulation inteface.
 		
diff --git a/dev-haskell/network/metadata.xml b/dev-haskell/network/metadata.xml
index 7bbb5d034cbd..24487f3e87bd 100644
--- a/dev-haskell/network/metadata.xml
+++ b/dev-haskell/network/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
+  <maintainer>
+    <email>haskell@gentoo.org</email>
+    <name>Gentoo Haskell</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">haskell/network</remote-id>
   </upstream>
diff --git a/dev-haskell/newtype/metadata.xml b/dev-haskell/newtype/metadata.xml
index 26c4fe7ad2e2..9da27aedb061 100644
--- a/dev-haskell/newtype/metadata.xml
+++ b/dev-haskell/newtype/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype, and allows you to operatate under that newtype with functions such as ala.
 	</longdescription>
diff --git a/dev-haskell/nonce/metadata.xml b/dev-haskell/nonce/metadata.xml
index 6436aa0cf422..ee4752f43309 100644
--- a/dev-haskell/nonce/metadata.xml
+++ b/dev-haskell/nonce/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		According to the Wikipedia, a nonce is an arbitrary number used
 		only once in a cryptographic communication.  This package
diff --git a/dev-haskell/objectname/metadata.xml b/dev-haskell/objectname/metadata.xml
index d571ee06ff0a..332c4969dc26 100644
--- a/dev-haskell/objectname/metadata.xml
+++ b/dev-haskell/objectname/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This tiny package contains the class ObjectName, which corresponds to the
 		general notion of explicitly handled identifiers for API objects, e.g. a
diff --git a/dev-haskell/old-locale/metadata.xml b/dev-haskell/old-locale/metadata.xml
index 04a98198131a..a3b15b794bc1 100644
--- a/dev-haskell/old-locale/metadata.xml
+++ b/dev-haskell/old-locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides the ability to adapt to
 		locale conventions such as date and time formats.
diff --git a/dev-haskell/old-time/metadata.xml b/dev-haskell/old-time/metadata.xml
index f14ff64a4b56..f6f4721d08eb 100644
--- a/dev-haskell/old-time/metadata.xml
+++ b/dev-haskell/old-time/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides the old time library.
 		
diff --git a/dev-haskell/openal/metadata.xml b/dev-haskell/openal/metadata.xml
index fcf851f940ef..3caf1143e9d1 100644
--- a/dev-haskell/openal/metadata.xml
+++ b/dev-haskell/openal/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/opengl/metadata.xml b/dev-haskell/opengl/metadata.xml
index 23c00a66c40d..a17590639c77 100644
--- a/dev-haskell/opengl/metadata.xml
+++ b/dev-haskell/opengl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its
 		accompanying utility library (GLU, version 1.3).
diff --git a/dev-haskell/openglraw/metadata.xml b/dev-haskell/openglraw/metadata.xml
index 04fa3d7201bd..969382a45c67 100644
--- a/dev-haskell/openglraw/metadata.xml
+++ b/dev-haskell/openglraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
 		lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
diff --git a/dev-haskell/options/metadata.xml b/dev-haskell/options/metadata.xml
index 94fb3306f128..cd24075a7036 100644
--- a/dev-haskell/options/metadata.xml
+++ b/dev-haskell/options/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The @options@ package lets library and application developers easily work
 		with command-line options.
diff --git a/dev-haskell/optparse-applicative/metadata.xml b/dev-haskell/optparse-applicative/metadata.xml
index a2d33046e859..b494dc53c9e3 100644
--- a/dev-haskell/optparse-applicative/metadata.xml
+++ b/dev-haskell/optparse-applicative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Here is a simple example of an applicative option parser:
 		
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
index 889d2992b91c..f9041e4b2926 100644
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ b/dev-haskell/pandoc-citeproc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
 		<flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
index 94edc4387869..d6ea6894f77d 100644
--- a/dev-haskell/pandoc-types/metadata.xml
+++ b/dev-haskell/pandoc-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains definitions for the <pkg>app-text/pandoc</pkg> data
 		structure, which is used by pandoc to represent
diff --git a/dev-haskell/pango/metadata.xml b/dev-haskell/pango/metadata.xml
index ddb2b453cd1f..320f819da1e3 100644
--- a/dev-haskell/pango/metadata.xml
+++ b/dev-haskell/pango/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/parallel-io/metadata.xml b/dev-haskell/parallel-io/metadata.xml
index 3e04410d16f1..ebc4d4afc7b7 100644
--- a/dev-haskell/parallel-io/metadata.xml
+++ b/dev-haskell/parallel-io/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides combinators for sequencing IO actions onto a thread pool. The
 		thread pool is guaranteed to contain no more unblocked threads than a user-specified upper limit, thus
diff --git a/dev-haskell/parallel/metadata.xml b/dev-haskell/parallel/metadata.xml
index 391ebed9c283..cf9da0fb6ebb 100644
--- a/dev-haskell/parallel/metadata.xml
+++ b/dev-haskell/parallel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a library for parallel programming.
 	</longdescription>
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index a75d2c7d144f..5692c3f85398 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/path-pieces/metadata.xml b/dev-haskell/path-pieces/metadata.xml
index 447466b0478d..e76f32bc2072 100644
--- a/dev-haskell/path-pieces/metadata.xml
+++ b/dev-haskell/path-pieces/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Components of paths.
 	</longdescription>
diff --git a/dev-haskell/patience/metadata.xml b/dev-haskell/patience/metadata.xml
index 3799b2c2f313..5f1b2bb94748 100644
--- a/dev-haskell/patience/metadata.xml
+++ b/dev-haskell/patience/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library implements the \"patience diff\" algorithm, as well as the patience
 		algorithm for the longest increasing subsequence problem.
diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
index a96dcd68413f..eb83a9fb2551 100644
--- a/dev-haskell/pcap/metadata.xml
+++ b/dev-haskell/pcap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A system-independent interface for user-level packet capture
 	</longdescription>
diff --git a/dev-haskell/pcre-light/metadata.xml b/dev-haskell/pcre-light/metadata.xml
index 7b735c31e247..adbb7272edb7 100644
--- a/dev-haskell/pcre-light/metadata.xml
+++ b/dev-haskell/pcre-light/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A small, efficient and portable regex library for Perl 5 compatible regular expressions
 		
diff --git a/dev-haskell/pem/metadata.xml b/dev-haskell/pem/metadata.xml
index 3cfecf8e6ac0..c246178478f1 100644
--- a/dev-haskell/pem/metadata.xml
+++ b/dev-haskell/pem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Privacy Enhanced Mail (PEM) format reader and writer.
 	</longdescription>
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
index d01b9f9e3fb5..f0f282c57007 100644
--- a/dev-haskell/persistent-sqlite/metadata.xml
+++ b/dev-haskell/persistent-sqlite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+          <email>haskell@gentoo.org</email>
+          <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
 	</longdescription>
diff --git a/dev-haskell/persistent-template/metadata.xml b/dev-haskell/persistent-template/metadata.xml
index a2736de14505..45b53b6f2347 100644
--- a/dev-haskell/persistent-template/metadata.xml
+++ b/dev-haskell/persistent-template/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
 	</longdescription>
diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml
index 224f625619a3..33d9186076d2 100644
--- a/dev-haskell/persistent/metadata.xml
+++ b/dev-haskell/persistent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
 	</longdescription>
diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
index 9ca0446cabcd..81ce89c8a6ac 100644
--- a/dev-haskell/pipes/metadata.xml
+++ b/dev-haskell/pipes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		\"Coroutines done right\".  This library generalizes iteratees and coroutines
 		simply and elegantly.
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
index ab0468ce80b3..11a7dcce5ffb 100644
--- a/dev-haskell/pointed/metadata.xml
+++ b/dev-haskell/pointed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 pointed and copointed data
 	</longdescription>
diff --git a/dev-haskell/polyparse/metadata.xml b/dev-haskell/polyparse/metadata.xml
index 6eabfc2cf73c..cdc66870e7fe 100644
--- a/dev-haskell/polyparse/metadata.xml
+++ b/dev-haskell/polyparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A variety of alternative parser combinator libraries, including
 		the original HuttonMeijer set.  The Poly sets have features like
diff --git a/dev-haskell/pool-conduit/metadata.xml b/dev-haskell/pool-conduit/metadata.xml
index e3d45ec69e96..d48e68934c37 100644
--- a/dev-haskell/pool-conduit/metadata.xml
+++ b/dev-haskell/pool-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Allocate resources from a pool, guaranteeing resource handling via the ResourceT transformer.
 	</longdescription>
diff --git a/dev-haskell/prelude-extras/metadata.xml b/dev-haskell/prelude-extras/metadata.xml
index e4887fc13625..0c1ad7c0579d 100644
--- a/dev-haskell/prelude-extras/metadata.xml
+++ b/dev-haskell/prelude-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 - higher order versions of Prelude classes to ease programming with polymorphic recursion and reduce UndecidableInstances
 		
diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
index 67fa8c972033..77f46375a6a0 100644
--- a/dev-haskell/preprocessor-tools/metadata.xml
+++ b/dev-haskell/preprocessor-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides a quick-and-dirty (but often effective)
 		method for extending Haskell's syntax using a custom
diff --git a/dev-haskell/pretty-show/metadata.xml b/dev-haskell/pretty-show/metadata.xml
index 785d01b3618d..0145910c3419 100644
--- a/dev-haskell/pretty-show/metadata.xml
+++ b/dev-haskell/pretty-show/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		We provide a library and an executable for working with derived 'Show'
 		instances. By using the library, we can parse derived 'Show' instances into a
diff --git a/dev-haskell/prettyclass/metadata.xml b/dev-haskell/prettyclass/metadata.xml
index a10116fb57b4..b6c45bd27440 100644
--- a/dev-haskell/prettyclass/metadata.xml
+++ b/dev-haskell/prettyclass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Pretty printing class similar to Show, based on the HughesPJ
 		pretty printing library.  Provides the pretty printing class
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
index 698fdd2a865e..5bd1a5d7714c 100644
--- a/dev-haskell/primitive/metadata.xml
+++ b/dev-haskell/primitive/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		
 		This package provides wrappers for primitive array operations from
diff --git a/dev-haskell/process-conduit/metadata.xml b/dev-haskell/process-conduit/metadata.xml
index 296c5f7c686a..6dee472223d7 100644
--- a/dev-haskell/process-conduit/metadata.xml
+++ b/dev-haskell/process-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Conduits for processes.
 		For more details: &lt;https://github.com/tanakh/process-conduit/blob/master/README.md&gt;
diff --git a/dev-haskell/process-extras/metadata.xml b/dev-haskell/process-extras/metadata.xml
index 2f2787628bda..245897c8c05b 100644
--- a/dev-haskell/process-extras/metadata.xml
+++ b/dev-haskell/process-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Extra functionality for the Process library
 		&lt;http://hackage.haskell.org/package/process&gt;.
diff --git a/dev-haskell/profunctor-extras/metadata.xml b/dev-haskell/profunctor-extras/metadata.xml
index 3d3c7c631729..f06d8299d222 100644
--- a/dev-haskell/profunctor-extras/metadata.xml
+++ b/dev-haskell/profunctor-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a number of utilities and constructions that arise
 		when working with profunctors that require minor extensions to Haskell 98.
diff --git a/dev-haskell/profunctors/metadata.xml b/dev-haskell/profunctors/metadata.xml
index ab61cdb22fef..962a9c10e828 100644
--- a/dev-haskell/profunctors/metadata.xml
+++ b/dev-haskell/profunctors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 Profunctors
 	</longdescription>
diff --git a/dev-haskell/project-template/metadata.xml b/dev-haskell/project-template/metadata.xml
index a518dac52e39..e58905ec488c 100644
--- a/dev-haskell/project-template/metadata.xml
+++ b/dev-haskell/project-template/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		See initial blog post for explanation: &lt;http://www.yesodweb.com/blog/2012/09/project-templates&gt;
 	</longdescription>
diff --git a/dev-haskell/psqueue/metadata.xml b/dev-haskell/psqueue/metadata.xml
index 564ad8bd0f8b..399c559b3e39 100644
--- a/dev-haskell/psqueue/metadata.xml
+++ b/dev-haskell/psqueue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A /priority search queue/ efficiently supports the
 		opperations of both a search tree and a priority queue. A
diff --git a/dev-haskell/psqueues/metadata.xml b/dev-haskell/psqueues/metadata.xml
index f44e265cde02..07a98d87f125 100644
--- a/dev-haskell/psqueues/metadata.xml
+++ b/dev-haskell/psqueues/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The psqueues package provides
 		&lt;http://en.wikipedia.org/wiki/Priority_queue Priority Search Queues&gt; in
diff --git a/dev-haskell/publicsuffixlist/metadata.xml b/dev-haskell/publicsuffixlist/metadata.xml
index 55af1fe0604c..47904c1f124b 100644
--- a/dev-haskell/publicsuffixlist/metadata.xml
+++ b/dev-haskell/publicsuffixlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Is a given string a domain suffix?
 	</longdescription>
diff --git a/dev-haskell/punycode/metadata.xml b/dev-haskell/punycode/metadata.xml
index 01e5554efcc8..cfffcd594d3c 100644
--- a/dev-haskell/punycode/metadata.xml
+++ b/dev-haskell/punycode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Encode unicode strings to ascii forms according to RFC 3492. It is written in pure Haskell, as opposed to gnuidn's Data.Text.IDN.Punycode. Please note that Data.Encoding.BootString from the 'encoding' package also contains an implementation of the Punycode algorithm.
 	</longdescription>
diff --git a/dev-haskell/puremd5/metadata.xml b/dev-haskell/puremd5/metadata.xml
index 2b631c334729..8c95cc575db8 100644
--- a/dev-haskell/puremd5/metadata.xml
+++ b/dev-haskell/puremd5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell-only implementation of the MD5 digest (hash) algorithm.  This now supports
 		the crypto-api class interface.
diff --git a/dev-haskell/pwstore-fast/metadata.xml b/dev-haskell/pwstore-fast/metadata.xml
index 16bb6472b184..5f67f118e58f 100644
--- a/dev-haskell/pwstore-fast/metadata.xml
+++ b/dev-haskell/pwstore-fast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		To store passwords securely, they should be salted,
 		then hashed with a slow hash function. This library
diff --git a/dev-haskell/quickcheck-instances/metadata.xml b/dev-haskell/quickcheck-instances/metadata.xml
index 4cf77d36fba1..b6c07e31b834 100644
--- a/dev-haskell/quickcheck-instances/metadata.xml
+++ b/dev-haskell/quickcheck-instances/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		QuickCheck instances.
 		
diff --git a/dev-haskell/quickcheck-io/metadata.xml b/dev-haskell/quickcheck-io/metadata.xml
index f9ee42a1ee71..cc653830524e 100644
--- a/dev-haskell/quickcheck-io/metadata.xml
+++ b/dev-haskell/quickcheck-io/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides an orphan instance that allows you to
 		use HUnit assertions as QuickCheck properties.
diff --git a/dev-haskell/quickcheck-unicode/metadata.xml b/dev-haskell/quickcheck-unicode/metadata.xml
index 1c7e1aa0b555..141e91398b7c 100644
--- a/dev-haskell/quickcheck-unicode/metadata.xml
+++ b/dev-haskell/quickcheck-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generator and shrink functions for testing
 		Unicode-related software.
diff --git a/dev-haskell/quickcheck/metadata.xml b/dev-haskell/quickcheck/metadata.xml
index d7bf7dcb8adc..e3559fb027f9 100644
--- a/dev-haskell/quickcheck/metadata.xml
+++ b/dev-haskell/quickcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="template_haskell">Enable additional test modules requiring Template Haskell support.</flag>
 	</use>
diff --git a/dev-haskell/random/metadata.xml b/dev-haskell/random/metadata.xml
index b4cc97ed1b50..bf8bd85b001d 100644
--- a/dev-haskell/random/metadata.xml
+++ b/dev-haskell/random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a random number library.
 	</longdescription>
diff --git a/dev-haskell/ranges/metadata.xml b/dev-haskell/ranges/metadata.xml
index d70b94ebce37..be00538621f9 100644
--- a/dev-haskell/ranges/metadata.xml
+++ b/dev-haskell/ranges/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Ranges and some functions allowing things like fast membership
 		lookup on ranges with holes in them and so on.
diff --git a/dev-haskell/readargs/metadata.xml b/dev-haskell/readargs/metadata.xml
index 240a652b0a68..258bfa154ce5 100644
--- a/dev-haskell/readargs/metadata.xml
+++ b/dev-haskell/readargs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		ReadArgs provides the @readArgs@ IO action, which lets you tell the compiler
 		to parse the command line arguments to fit the type signature you give.
diff --git a/dev-haskell/readline/metadata.xml b/dev-haskell/readline/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/readline/metadata.xml
+++ b/dev-haskell/readline/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/recaptcha/metadata.xml b/dev-haskell/recaptcha/metadata.xml
index 8b2e2bb66f93..eda6eda86b6b 100644
--- a/dev-haskell/recaptcha/metadata.xml
+++ b/dev-haskell/recaptcha/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		reCAPTCHA (http://recaptcha.net/) is a service that provides
 		captchas for preventing automated spam in web applications.
diff --git a/dev-haskell/reducers/metadata.xml b/dev-haskell/reducers/metadata.xml
index 37ab21f42e79..b3372cb7f9b5 100644
--- a/dev-haskell/reducers/metadata.xml
+++ b/dev-haskell/reducers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Semigroups, specialized containers and a general map/reduce framework
 	</longdescription>
diff --git a/dev-haskell/reflection/metadata.xml b/dev-haskell/reflection/metadata.xml
index 6f8facf83344..d8e45a2885dd 100644
--- a/dev-haskell/reflection/metadata.xml
+++ b/dev-haskell/reflection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides an implementation of the ideas presented in the paper
 		\"Functional Pearl: Implicit Configurations\" by Oleg Kiselyov and
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
index 1059fd4b074a..b9282502fd55 100644
--- a/dev-haskell/regex-applicative/metadata.xml
+++ b/dev-haskell/regex-applicative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		regex-applicative is a Haskell library for parsing using regular expressions.
 		Parsers can be built using Applicative interface.
diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
index 647d36639e0e..1b47a8615d35 100644
--- a/dev-haskell/regex-base/metadata.xml
+++ b/dev-haskell/regex-base/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
index da6e95268263..181f3b4f4d35 100644
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ b/dev-haskell/regex-compat-tdfa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="newbase">Use base-4.0 or newer.</flag>
 		<flag name="splitbase">Use the new smaller, split-up base package.</flag>
diff --git a/dev-haskell/regex-compat/metadata.xml b/dev-haskell/regex-compat/metadata.xml
index 647d36639e0e..1b47a8615d35 100644
--- a/dev-haskell/regex-compat/metadata.xml
+++ b/dev-haskell/regex-compat/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/regex-pcre-builtin/metadata.xml b/dev-haskell/regex-pcre-builtin/metadata.xml
index 726ce5a96cd1..f784a136375f 100644
--- a/dev-haskell/regex-pcre-builtin/metadata.xml
+++ b/dev-haskell/regex-pcre-builtin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lazy-regex</remote-id>
 	</upstream>
diff --git a/dev-haskell/regex-pcre/metadata.xml b/dev-haskell/regex-pcre/metadata.xml
index 9f3073bcbd93..3b0239d84c21 100644
--- a/dev-haskell/regex-pcre/metadata.xml
+++ b/dev-haskell/regex-pcre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The PCRE backend to accompany regex-base, see www.pcre.org
 	</longdescription>
diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
index 5f88ecaa9e45..3fca1ace9540 100644
--- a/dev-haskell/regex-posix/metadata.xml
+++ b/dev-haskell/regex-posix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The posix regex backend for regex-base
 	</longdescription>
diff --git a/dev-haskell/regex-tdfa-rc/metadata.xml b/dev-haskell/regex-tdfa-rc/metadata.xml
index 8fbddf69f1dc..06836de17618 100644
--- a/dev-haskell/regex-tdfa-rc/metadata.xml
+++ b/dev-haskell/regex-tdfa-rc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
index d96445e903e3..bf36351daef3 100644
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ b/dev-haskell/regex-tdfa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A new all Haskell "tagged" DFA regex engine, inspired by libtre
 	</longdescription>
diff --git a/dev-haskell/resource-pool/metadata.xml b/dev-haskell/resource-pool/metadata.xml
index d7f6408f8fa4..477a781adcd9 100644
--- a/dev-haskell/resource-pool/metadata.xml
+++ b/dev-haskell/resource-pool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A high-performance striped pooling abstraction for managing
 		flexibly-sized collections of resources such as database
diff --git a/dev-haskell/resourcet/metadata.xml b/dev-haskell/resourcet/metadata.xml
index 9f89fa0f7fdd..ee28f3fa67e3 100644
--- a/dev-haskell/resourcet/metadata.xml
+++ b/dev-haskell/resourcet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package was originally included with the conduit package, and has since been split off. For more information, please see &lt;http://www.yesodweb.com/book/conduits&gt;.
 	</longdescription>
diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
index 790e9183e1e1..612ce5d93441 100644
--- a/dev-haskell/rfc5051/metadata.xml
+++ b/dev-haskell/rfc5051/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="mkunicodedata">build codes generator itself</flag>
 	</use>
diff --git a/dev-haskell/safe/metadata.xml b/dev-haskell/safe/metadata.xml
index 864f6aee1c30..6b6f615ebe77 100644
--- a/dev-haskell/safe/metadata.xml
+++ b/dev-haskell/safe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Partial functions from the base library, such as @head@ and @!!@, modified
 		to return more descriptive error messages, programmer defined error messages,
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
index b169f830d5b5..fb6da372b8de 100644
--- a/dev-haskell/safesemaphore/metadata.xml
+++ b/dev-haskell/safesemaphore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This provides a much safer semaphore than the QSem, QSemN, SampleVar in base.
 		Those base modules are not exception safe and can be broken by killThread.
diff --git a/dev-haskell/sandi/metadata.xml b/dev-haskell/sandi/metadata.xml
index 6803ad614312..ae885e3b60e8 100644
--- a/dev-haskell/sandi/metadata.xml
+++ b/dev-haskell/sandi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+                <email>haskell@gentoo.org</email>
+                <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Reasonably fast data encoding library.
 	</longdescription>
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index ef4a04b0c621..1811da49690d 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A @Scientific@ number is an arbitrary-precision floating-point number
 		represented using scientific notation.
diff --git a/dev-haskell/securemem/metadata.xml b/dev-haskell/securemem/metadata.xml
index 7c2fd9c3ebfd..e0a956977cdd 100644
--- a/dev-haskell/securemem/metadata.xml
+++ b/dev-haskell/securemem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		SecureMem is similar to ByteString, except that it provides a memory chunk that
 		will be auto-scrubbed after it run out of scope.
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
index 55f73be50f48..1cb3e61d7efb 100644
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ b/dev-haskell/semigroupoid-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Semigroupoids and semigroupoid operations requiring Haskell extensions
 	</longdescription>
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 0b9dfed4ec37..e1dce2fb9fce 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides a wide array of semigroupoids and operations for working with semigroupds.
 		
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index 587c9e992173..b00f33ab8721 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 semigroups
 		
diff --git a/dev-haskell/sendfile/metadata.xml b/dev-haskell/sendfile/metadata.xml
index 3d0eaf5322f1..4f5481b39d69 100644
--- a/dev-haskell/sendfile/metadata.xml
+++ b/dev-haskell/sendfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A library which exposes zero-copy sendfile functionality in a portable way. If a platform does not support sendfile, a fallback implementation in haskell is provided.
 		
diff --git a/dev-haskell/setenv/metadata.xml b/dev-haskell/setenv/metadata.xml
index 10a8d77eab4f..65d1acaf7127 100644
--- a/dev-haskell/setenv/metadata.xml
+++ b/dev-haskell/setenv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A cross-platform library for setting environment variables
 	</longdescription>
diff --git a/dev-haskell/setlocale/metadata.xml b/dev-haskell/setlocale/metadata.xml
index cec4e0007236..b37cee4f55fb 100644
--- a/dev-haskell/setlocale/metadata.xml
+++ b/dev-haskell/setlocale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell interface to @setlocale()@.
 	</longdescription>
diff --git a/dev-haskell/sha/metadata.xml b/dev-haskell/sha/metadata.xml
index b824ba547d89..644123adfce4 100644
--- a/dev-haskell/sha/metadata.xml
+++ b/dev-haskell/sha/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="exe">Build a sha1 and a sha384 executable similar to 'md5sum'.</flag>
 	</use>
diff --git a/dev-haskell/shakespeare-css/metadata.xml b/dev-haskell/shakespeare-css/metadata.xml
index 491366ba9c5c..83ac84a23005 100644
--- a/dev-haskell/shakespeare-css/metadata.xml
+++ b/dev-haskell/shakespeare-css/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		
 		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
diff --git a/dev-haskell/shakespeare-i18n/metadata.xml b/dev-haskell/shakespeare-i18n/metadata.xml
index 0b631129c09b..c23b17e480d4 100644
--- a/dev-haskell/shakespeare-i18n/metadata.xml
+++ b/dev-haskell/shakespeare-i18n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package uses the same approach of type-safe URLs to create translated content. It has a simple syntax for translators, while allowing the ful power of Haskell for applying complex grammar rules.
 		
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
index d794eef05ac9..2b444b898bc8 100644
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ b/dev-haskell/shakespeare-js/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+        <email>haskell@gentoo.org</email>
+        <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
 		In this case, the variable type needs a ToJavascript instance.
diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
index 23acf0f1a31c..9bc854773221 100644
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ b/dev-haskell/shakespeare-text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		interpolation with quasi-quotation: stick haskell variables into haskell strings
 		
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index de1e06efa16d..a9a7b8880f0e 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+        <email>haskell@gentoo.org</email>
+        <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
 		
diff --git a/dev-haskell/shellish/metadata.xml b/dev-haskell/shellish/metadata.xml
index 18157033da7a..96c8a5a9d93f 100644
--- a/dev-haskell/shellish/metadata.xml
+++ b/dev-haskell/shellish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The shellisg package provides a single module for convenient
 		\"systems\" programming in Haskell, similar in spirit to POSIX
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 381bd9ff75f3..a5999ad03c26 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Shelly provides convenient systems programming in Haskell,
 		similar in spirit to POSIX shells. Shelly:
diff --git a/dev-haskell/silently/metadata.xml b/dev-haskell/silently/metadata.xml
index 702b8254b56b..f6c78610ea1f 100644
--- a/dev-haskell/silently/metadata.xml
+++ b/dev-haskell/silently/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Prevent or capture writing to stdout and other handles.
 	</longdescription>
diff --git a/dev-haskell/simple-reflect/metadata.xml b/dev-haskell/simple-reflect/metadata.xml
index 71a0501f1cbe..1ee9e4a56f53 100644
--- a/dev-haskell/simple-reflect/metadata.xml
+++ b/dev-haskell/simple-reflect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package allows simple reflection of expressions containing variables.
 		Reflection here means that a Haskell expression is turned into a string.
diff --git a/dev-haskell/simple-sendfile/metadata.xml b/dev-haskell/simple-sendfile/metadata.xml
index 6d0fbcbcbe97..e65080bd0747 100644
--- a/dev-haskell/simple-sendfile/metadata.xml
+++ b/dev-haskell/simple-sendfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cross platform library for the sendfile system call.
 		This library tries to call minimum system calls which
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 02c87685459b..1718df609a15 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Skein (&lt;http://www.skein-hash.info/&gt;) is a family of fast
 		secure cryptographic hash functions designed by Niels
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
index 48f179deb48f..3ff7f4ceb822 100644
--- a/dev-haskell/smallcheck/metadata.xml
+++ b/dev-haskell/smallcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		SmallCheck is similar to QuickCheck (Claessen and Hughes 2000-) but
 		instead of testing for a sample of randomly generated values, SmallCheck
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
index c5821ca89cc4..2802c119bf38 100644
--- a/dev-haskell/snap-core/metadata.xml
+++ b/dev-haskell/snap-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="portable">No non-haskell unportable code.</flag>
 	</use>
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
index b90bc558cebe..35cf7bbdec27 100644
--- a/dev-haskell/snap-server/metadata.xml
+++ b/dev-haskell/snap-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
 		<flag name="portable">no non-haskell unportable code.</flag>
diff --git a/dev-haskell/socks/metadata.xml b/dev-haskell/socks/metadata.xml
index 9640b4f06324..e0905fa85297 100644
--- a/dev-haskell/socks/metadata.xml
+++ b/dev-haskell/socks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Socks proxy (version 5) implementation.
 	</longdescription>
diff --git a/dev-haskell/split/metadata.xml b/dev-haskell/split/metadata.xml
index 38868db63b34..df49067e4a19 100644
--- a/dev-haskell/split/metadata.xml
+++ b/dev-haskell/split/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Combinator library and utility functions for splitting lists.
 	</longdescription>
diff --git a/dev-haskell/statevar/metadata.xml b/dev-haskell/statevar/metadata.xml
index 0a2f92612ea0..7954c8087d38 100644
--- a/dev-haskell/statevar/metadata.xml
+++ b/dev-haskell/statevar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains state variables, which are references in the IO monad,
 		like IORefs or parts of the OpenGL state.
diff --git a/dev-haskell/statistics/metadata.xml b/dev-haskell/statistics/metadata.xml
index 1a9198b13f33..eee557ac6fd1 100644
--- a/dev-haskell/statistics/metadata.xml
+++ b/dev-haskell/statistics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library provides a number of common functions and types useful
 		in statistics.  We focus on high performance, numerical robustness,
diff --git a/dev-haskell/stm-chans/metadata.xml b/dev-haskell/stm-chans/metadata.xml
index 450ec1e67634..d32b375547ac 100644
--- a/dev-haskell/stm-chans/metadata.xml
+++ b/dev-haskell/stm-chans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Additional types of channels for STM.
 	</longdescription>
diff --git a/dev-haskell/stm/metadata.xml b/dev-haskell/stm/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/stm/metadata.xml
+++ b/dev-haskell/stm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/stmonadtrans/metadata.xml b/dev-haskell/stmonadtrans/metadata.xml
index d67126646e2c..4de039b371dc 100644
--- a/dev-haskell/stmonadtrans/metadata.xml
+++ b/dev-haskell/stmonadtrans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A monad transformer version of the ST monad
 		Warning! This monad transformer should not be used with monads that
diff --git a/dev-haskell/stream/metadata.xml b/dev-haskell/stream/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/stream/metadata.xml
+++ b/dev-haskell/stream/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/streaming-commons/metadata.xml b/dev-haskell/streaming-commons/metadata.xml
index b5fe9cc26185..911d9c1499e1 100644
--- a/dev-haskell/streaming-commons/metadata.xml
+++ b/dev-haskell/streaming-commons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides low-dependency functionality commonly needed by various streaming data libraries, such as conduit and pipes.
 	</longdescription>
diff --git a/dev-haskell/strict/metadata.xml b/dev-haskell/strict/metadata.xml
index 1d05a51d5598..db2c4f83d622 100644
--- a/dev-haskell/strict/metadata.xml
+++ b/dev-haskell/strict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides strict versions of some standard Haskell data
 		types (pairs, Maybe and Either). It also contains strict IO
diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
index f0e023fb920f..bb9466213059 100644
--- a/dev-haskell/stringable/metadata.xml
+++ b/dev-haskell/stringable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		'Data.Stringable' provides a type class with a set of functions for
 		converting to and from the most often used string-linke types in
diff --git a/dev-haskell/stringbuilder/metadata.xml b/dev-haskell/stringbuilder/metadata.xml
index 4c84bea06f48..108dcdb99dc7 100644
--- a/dev-haskell/stringbuilder/metadata.xml
+++ b/dev-haskell/stringbuilder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		&lt;https://github.com/sol/stringbuilder#readme&gt;
 	</longdescription>
diff --git a/dev-haskell/stringprep/metadata.xml b/dev-haskell/stringprep/metadata.xml
index 6ec355137791..75e6d331061d 100644
--- a/dev-haskell/stringprep/metadata.xml
+++ b/dev-haskell/stringprep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Implements the "StringPrep" algorithm
 	</longdescription>
diff --git a/dev-haskell/stringsearch/metadata.xml b/dev-haskell/stringsearch/metadata.xml
index 293df3faa240..378a48a8a4f0 100644
--- a/dev-haskell/stringsearch/metadata.xml
+++ b/dev-haskell/stringsearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides several functions to quickly
 		search for substrings in strict or lazy ByteStrings.
diff --git a/dev-haskell/syb-with-class/metadata.xml b/dev-haskell/syb-with-class/metadata.xml
index dbedb1c93b80..86a62ced2dfe 100644
--- a/dev-haskell/syb-with-class/metadata.xml
+++ b/dev-haskell/syb-with-class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Classes, and Template Haskell code to generate instances, for the
 		Scrap Your Boilerplate With Class system.
diff --git a/dev-haskell/syb/metadata.xml b/dev-haskell/syb/metadata.xml
index 4e8ae96747d6..49b58dd4111c 100644
--- a/dev-haskell/syb/metadata.xml
+++ b/dev-haskell/syb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains the generics system described in the
 		"Scrap Your Boilerplate" papers (see http://www.cs.uu.nl/wiki/GenericProgramming/SYB).
diff --git a/dev-haskell/system-fileio/metadata.xml b/dev-haskell/system-fileio/metadata.xml
index cdc2fd39dfce..ffa991ff1680 100644
--- a/dev-haskell/system-fileio/metadata.xml
+++ b/dev-haskell/system-fileio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a small wrapper around the \"directory\", \"unix\", and \"Win32\"
 		packages, for use with \"system-filepath\". It provides a consistent API
diff --git a/dev-haskell/system-filepath/metadata.xml b/dev-haskell/system-filepath/metadata.xml
index fe24026213ec..9eaa08c89171 100644
--- a/dev-haskell/system-filepath/metadata.xml
+++ b/dev-haskell/system-filepath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		High-level, byte-based file and directory path manipulations
 	</longdescription>
diff --git a/dev-haskell/tagged/metadata.xml b/dev-haskell/tagged/metadata.xml
index 5deb44d56133..d86f170cfeb7 100644
--- a/dev-haskell/tagged/metadata.xml
+++ b/dev-haskell/tagged/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments
 	</longdescription>
diff --git a/dev-haskell/tagsoup/metadata.xml b/dev-haskell/tagsoup/metadata.xml
index d9b6822345e9..b89d63be13b1 100644
--- a/dev-haskell/tagsoup/metadata.xml
+++ b/dev-haskell/tagsoup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		TagSoup is a library for parsing HTML/XML. It supports the HTML 5 specification,
 		and can be used to parse either well-formed XML, or unstructured and malformed HTML
diff --git a/dev-haskell/tagstream-conduit/metadata.xml b/dev-haskell/tagstream-conduit/metadata.xml
index 87a8ae5d5831..eeb0f89e39d4 100644
--- a/dev-haskell/tagstream-conduit/metadata.xml
+++ b/dev-haskell/tagstream-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Tag-stream is a library for parsing HTML//XML to a token stream.
 		It can parse unstructured and malformed HTML from the web.
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
index bcef3450c64c..dc47576fc6cc 100644
--- a/dev-haskell/tar/metadata.xml
+++ b/dev-haskell/tar/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This library is for working with .tar@ archive files. It
 		can read and write a range of common variations of archive
diff --git a/dev-haskell/tasty-ant-xml/metadata.xml b/dev-haskell/tasty-ant-xml/metadata.xml
index ce21776fe5ff..34b5fdda5205 100644
--- a/dev-haskell/tasty-ant-xml/metadata.xml
+++ b/dev-haskell/tasty-ant-xml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.
 	</longdescription>
diff --git a/dev-haskell/tasty-golden/metadata.xml b/dev-haskell/tasty-golden/metadata.xml
index 14a6d43c8ea1..351e7dde3e65 100644
--- a/dev-haskell/tasty-golden/metadata.xml
+++ b/dev-haskell/tasty-golden/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides support for «golden testing».
 		A golden test is an IO action that writes its result to a file.
diff --git a/dev-haskell/tasty-hunit/metadata.xml b/dev-haskell/tasty-hunit/metadata.xml
index f44280cc0b9f..5a5d8e889f41 100644
--- a/dev-haskell/tasty-hunit/metadata.xml
+++ b/dev-haskell/tasty-hunit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HUnit support for the Tasty test framework.
 	</longdescription>
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
index ce42eff6cab0..39fe3f9a2111 100644
--- a/dev-haskell/tasty-kat/metadata.xml
+++ b/dev-haskell/tasty-kat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Tests running from simple KATs file (different formats/helper supported)
 	</longdescription>
diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
index f5025fd97243..ccc60806450f 100644
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ b/dev-haskell/tasty-quickcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		QuickCheck support for the Tasty test framework.
 	</longdescription>
diff --git a/dev-haskell/tasty-rerun/metadata.xml b/dev-haskell/tasty-rerun/metadata.xml
index 537300adc406..aecb4d8606de 100644
--- a/dev-haskell/tasty-rerun/metadata.xml
+++ b/dev-haskell/tasty-rerun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This ingredient adds the ability to run tests by first filtering the test tree
 		based on the result of a previous test run. For example, you can use this to
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
index c965a8e55276..43fa1e4688b5 100644
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ b/dev-haskell/tasty-smallcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		SmallCheck support for the Tasty test framework.
 	</longdescription>
diff --git a/dev-haskell/tasty-th/metadata.xml b/dev-haskell/tasty-th/metadata.xml
index b8049b35668d..82404ef43687 100644
--- a/dev-haskell/tasty-th/metadata.xml
+++ b/dev-haskell/tasty-th/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A fork of of test-framework-th modified to use tasty instead of test-framework.
 	</longdescription>
diff --git a/dev-haskell/tasty/metadata.xml b/dev-haskell/tasty/metadata.xml
index af35eda52e02..297c77ffb9d6 100644
--- a/dev-haskell/tasty/metadata.xml
+++ b/dev-haskell/tasty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		See &lt;http://documentup.com/feuerbach/tasty&gt;
 	</longdescription>
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index cbf8cac94c23..5026f9a19f39 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
 		package contains some good ones, but they aren't portable to Windows.
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index 4abec69ed8cc..fd678f88eb98 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
 		package contains some good ones, but they aren't portable to Windows.
diff --git a/dev-haskell/tensor/metadata.xml b/dev-haskell/tensor/metadata.xml
index f7375cc05f2c..e6ac7844dc70 100644
--- a/dev-haskell/tensor/metadata.xml
+++ b/dev-haskell/tensor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains tensor data types and their instances for some basic
 		type classes.
diff --git a/dev-haskell/terminal-size/metadata.xml b/dev-haskell/terminal-size/metadata.xml
index 556b13547cb3..121a84234ec7 100644
--- a/dev-haskell/terminal-size/metadata.xml
+++ b/dev-haskell/terminal-size/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Get terminal window height and width without ncurses dependency
 		
diff --git a/dev-haskell/terminfo/metadata.xml b/dev-haskell/terminfo/metadata.xml
index 1dc14a93f834..8079756a53de 100644
--- a/dev-haskell/terminfo/metadata.xml
+++ b/dev-haskell/terminfo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/test-framework-hunit/metadata.xml b/dev-haskell/test-framework-hunit/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/test-framework-hunit/metadata.xml
+++ b/dev-haskell/test-framework-hunit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/test-framework-quickcheck2/metadata.xml b/dev-haskell/test-framework-quickcheck2/metadata.xml
index 257947e8e3f3..da18f972e943 100644
--- a/dev-haskell/test-framework-quickcheck2/metadata.xml
+++ b/dev-haskell/test-framework-quickcheck2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		QuickCheck2 support for the test-framework package.
 	</longdescription>
diff --git a/dev-haskell/test-framework-th-prime/metadata.xml b/dev-haskell/test-framework-th-prime/metadata.xml
index e3aa08ff6f98..e9d0eb1451b7 100644
--- a/dev-haskell/test-framework-th-prime/metadata.xml
+++ b/dev-haskell/test-framework-th-prime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Automatically generates a Test list for
 		HUnit, doctest and QuickCheck2.
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
index 03be45ce38cf..c2c344e349a6 100644
--- a/dev-haskell/test-framework-th/metadata.xml
+++ b/dev-haskell/test-framework-th/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
 		
diff --git a/dev-haskell/test-framework/metadata.xml b/dev-haskell/test-framework/metadata.xml
index e4478b465827..c8be77557740 100644
--- a/dev-haskell/test-framework/metadata.xml
+++ b/dev-haskell/test-framework/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
 		parallel (but reported in deterministic order, to aid diff interpretation) and filtered and controlled by
diff --git a/dev-haskell/testpack/metadata.xml b/dev-haskell/testpack/metadata.xml
index 4f1f7ec55a81..cf50f4795abc 100644
--- a/dev-haskell/testpack/metadata.xml
+++ b/dev-haskell/testpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Testpack provides utilities for both HUnit and QuickCheck.  These include
 		tools for running QuickCheck properties as HUnit test cases, allowing you to
diff --git a/dev-haskell/texmath/metadata.xml b/dev-haskell/texmath/metadata.xml
index c75920dace40..adc852633ff0 100644
--- a/dev-haskell/texmath/metadata.xml
+++ b/dev-haskell/texmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The texmathml library provides functions to convert LaTeX
 		math formulas to presentation MathML. It supports
diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
index 90f31b5abece..2365e507ddbc 100644
--- a/dev-haskell/text-icu/metadata.xml
+++ b/dev-haskell/text-icu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Haskell bindings to the International Components for Unicode (ICU)
 		libraries.  These libraries provide robust and full-featured Unicode
diff --git a/dev-haskell/text-stream-decode/metadata.xml b/dev-haskell/text-stream-decode/metadata.xml
index d76328ffa81b..fcdc221832b7 100644
--- a/dev-haskell/text-stream-decode/metadata.xml
+++ b/dev-haskell/text-stream-decode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The @text@ package provides high performance functions for decoding strict and lazy @ByteString@s into @Text@. However, these functions present two issues for streaming data libraries: they throw exceptions from pure code, and are not designed for incremental consumption. This library addresses both issues with a unified API for UTF-8, -16LE, -16BE, -32LE, and -32BE. It is intended for use by high level streaming data libraries, such as conduit, enumerator, iteratee, and pipes.
 	</longdescription>
diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml
index 639b8acc5c83..8a7994c36dd7 100644
--- a/dev-haskell/text/metadata.xml
+++ b/dev-haskell/text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		
 		An efficient packed, immutable Unicode text type (both strict and
diff --git a/dev-haskell/tf-random/metadata.xml b/dev-haskell/tf-random/metadata.xml
index 7e48a8633b06..aad8d913b95a 100644
--- a/dev-haskell/tf-random/metadata.xml
+++ b/dev-haskell/tf-random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains an implementation of a high-quality splittable pseudorandom number generator. The generator is based on a cryptographic hash function built on top of the ThreeFish block cipher. See the paper /Splittable Pseudorandom Number Generators Using Cryptographic Hashing/ by Claessen, PaBka for details and the rationale of the design.
 		
diff --git a/dev-haskell/th-expand-syns/metadata.xml b/dev-haskell/th-expand-syns/metadata.xml
index dfeb12b474d4..965d40a68c30 100644
--- a/dev-haskell/th-expand-syns/metadata.xml
+++ b/dev-haskell/th-expand-syns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Expands type synonyms in Template Haskell ASTs
 	</longdescription>
diff --git a/dev-haskell/th-lift/metadata.xml b/dev-haskell/th-lift/metadata.xml
index 84eef94f8f17..21c36036c1c8 100644
--- a/dev-haskell/th-lift/metadata.xml
+++ b/dev-haskell/th-lift/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Derive Template Haskell's Lift class for datatypes.
 	</longdescription>
diff --git a/dev-haskell/th-orphans/metadata.xml b/dev-haskell/th-orphans/metadata.xml
index 6b4efe7232a6..814908dfd452 100644
--- a/dev-haskell/th-orphans/metadata.xml
+++ b/dev-haskell/th-orphans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Orphan instances for TH datatypes.  In particular, instances
 		for Ord and Lift, as well as a few missing Show / Eq.  These
diff --git a/dev-haskell/th-reify-many/metadata.xml b/dev-haskell/th-reify-many/metadata.xml
index 8e50ef4bd70c..58bb6ee1ec09 100644
--- a/dev-haskell/th-reify-many/metadata.xml
+++ b/dev-haskell/th-reify-many/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		@th-reify-many@ provides functions for recursively reifying top
 		level declarations.  The main intended use case is for enumerating
diff --git a/dev-haskell/threads/metadata.xml b/dev-haskell/threads/metadata.xml
index 563f8dea4fd6..5250e2c3602d 100644
--- a/dev-haskell/threads/metadata.xml
+++ b/dev-haskell/threads/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides functions to fork threads and
 		wait for their result, whether it's an exception or a
diff --git a/dev-haskell/time-compat/metadata.xml b/dev-haskell/time-compat/metadata.xml
index 3285b1ad1d6e..547cb00ce7e9 100644
--- a/dev-haskell/time-compat/metadata.xml
+++ b/dev-haskell/time-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Compatibility with the &lt;old-time&gt; package for the \"new\"
 		&lt;time&gt; package.
diff --git a/dev-haskell/time-locale-compat/metadata.xml b/dev-haskell/time-locale-compat/metadata.xml
index 620e14c1a40e..b1b3035e2a19 100644
--- a/dev-haskell/time-locale-compat/metadata.xml
+++ b/dev-haskell/time-locale-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package contains wrapped name module for TimeLocale.
 	</longdescription>
diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
index 8305a0c8c3f4..7aa45a983f43 100644
--- a/dev-haskell/timezone-olson/metadata.xml
+++ b/dev-haskell/timezone-olson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A parser and renderer for binary Olson timezone
 		files whose format is specified by the tzfile(5)
diff --git a/dev-haskell/timezone-series/metadata.xml b/dev-haskell/timezone-series/metadata.xml
index c860af6a17f4..9fdca2bb9242 100644
--- a/dev-haskell/timezone-series/metadata.xml
+++ b/dev-haskell/timezone-series/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package endows Data.Time, from the time
 		package, with several data types and functions
diff --git a/dev-haskell/tls-extra/metadata.xml b/dev-haskell/tls-extra/metadata.xml
index 24a2bf8a5fc6..20be89fe2b3d 100644
--- a/dev-haskell/tls-extra/metadata.xml
+++ b/dev-haskell/tls-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		a set of extra definitions, default values and helpers for tls.
 	</longdescription>
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index bb8953c9b1ce..c44ff9c3439e 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Native Haskell TLS and SSL protocol implementation for server and client.
 		
diff --git a/dev-haskell/top/metadata.xml b/dev-haskell/top/metadata.xml
index e5eb48356de0..f7bf0e92de22 100644
--- a/dev-haskell/top/metadata.xml
+++ b/dev-haskell/top/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		At its most general, Top is a framework for constructing abstract interpretations
 		which focuses on giving good feedback on why an abstract interpretation does not give
diff --git a/dev-haskell/torrent/metadata.xml b/dev-haskell/torrent/metadata.xml
index 1eaa6d097c2a..87409b7c88a6 100644
--- a/dev-haskell/torrent/metadata.xml
+++ b/dev-haskell/torrent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		BitTorrent file parser and generater
 	</longdescription>
diff --git a/dev-haskell/transformers-base/metadata.xml b/dev-haskell/transformers-base/metadata.xml
index d03356f095e4..0dd405f23e3e 100644
--- a/dev-haskell/transformers-base/metadata.xml
+++ b/dev-haskell/transformers-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a straightforward port of @monadLib@'s BaseM
 		typeclass to @transformers@.
diff --git a/dev-haskell/transformers-compat/metadata.xml b/dev-haskell/transformers-compat/metadata.xml
index b25d0fb30cae..a331da959396 100644
--- a/dev-haskell/transformers-compat/metadata.xml
+++ b/dev-haskell/transformers-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package includes backported versions of types that were added
 		to transformers in transformers 0.3 for users who need strict
diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
index 4e0c755e1bf7..50dca517fc60 100644
--- a/dev-haskell/transformers/metadata.xml
+++ b/dev-haskell/transformers/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Haskell 98 part of a monad transformer library, inspired by the paper
 		\"Functional Programming with Overloading and Higher-Order Polymorphism\",
diff --git a/dev-haskell/unbounded-delays/metadata.xml b/dev-haskell/unbounded-delays/metadata.xml
index 4ff46e8da1ef..d6a9928b6924 100644
--- a/dev-haskell/unbounded-delays/metadata.xml
+++ b/dev-haskell/unbounded-delays/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The @threadDelay@ and @timeout@ functions from the @base@ library
 		use the bounded @Int@ type for specifying the delay or timeout
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index 8885d422f610..082cf8e4e816 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Uniplate is library for writing simple and concise generic operations.
 		Uniplate has similar goals to the original Scrap Your Boilerplate work,
diff --git a/dev-haskell/uniqueid/metadata.xml b/dev-haskell/uniqueid/metadata.xml
index 37fc7d42a40f..c2f154baf2c1 100644
--- a/dev-haskell/uniqueid/metadata.xml
+++ b/dev-haskell/uniqueid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides splittable supplies of unique
 		identifiers. The implementation mimics (only) essential
diff --git a/dev-haskell/unix-compat/metadata.xml b/dev-haskell/unix-compat/metadata.xml
index 350e9881468c..60bea1bb5d8b 100644
--- a/dev-haskell/unix-compat/metadata.xml
+++ b/dev-haskell/unix-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides portable implementations of parts
 		of the unix package. This package re-exports the unix
diff --git a/dev-haskell/unix-time/metadata.xml b/dev-haskell/unix-time/metadata.xml
index 594d557a2d65..313aa7e2875d 100644
--- a/dev-haskell/unix-time/metadata.xml
+++ b/dev-haskell/unix-time/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Fast parser\/formatter\/utilities for Unix time
 	</longdescription>
diff --git a/dev-haskell/unixutils/metadata.xml b/dev-haskell/unixutils/metadata.xml
index ea5bf928d68e..d92d66ae1cde 100644
--- a/dev-haskell/unixutils/metadata.xml
+++ b/dev-haskell/unixutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A collection of useful and mildly useful functions that you might
 		expect to find in System.* which a heavy bias towards Unix-type operating systems.
diff --git a/dev-haskell/unordered-containers/metadata.xml b/dev-haskell/unordered-containers/metadata.xml
index ba7e94bfc66a..f7529e7506af 100644
--- a/dev-haskell/unordered-containers/metadata.xml
+++ b/dev-haskell/unordered-containers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Efficient hashing-based container types.  The containers have been
 		optimized for performance critical use, both in terms of large data
diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
index f030de8c0519..f5c3cf665cfd 100644
--- a/dev-haskell/uri/metadata.xml
+++ b/dev-haskell/uri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Library for working with URIs, including parsing, rendering, merging, escaping
 	</longdescription>
diff --git a/dev-haskell/url/metadata.xml b/dev-haskell/url/metadata.xml
index 23121966a9d2..b08ab153be60 100644
--- a/dev-haskell/url/metadata.xml
+++ b/dev-haskell/url/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A library for working with URLs.
 	</longdescription>
diff --git a/dev-haskell/utf8-light/metadata.xml b/dev-haskell/utf8-light/metadata.xml
index 886a060376cd..dd71f429d103 100644
--- a/dev-haskell/utf8-light/metadata.xml
+++ b/dev-haskell/utf8-light/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Lightweight UTF8 handling.
 	</longdescription>
diff --git a/dev-haskell/utf8-string/metadata.xml b/dev-haskell/utf8-string/metadata.xml
index dcb1c5a682ee..87e4b34b68d5 100644
--- a/dev-haskell/utf8-string/metadata.xml
+++ b/dev-haskell/utf8-string/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/uuagc-cabal/metadata.xml b/dev-haskell/uuagc-cabal/metadata.xml
index 3d8999b2ca4f..61208c23bf6d 100644
--- a/dev-haskell/uuagc-cabal/metadata.xml
+++ b/dev-haskell/uuagc-cabal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Cabal plugin for UUAGC
 	</longdescription>
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
index 7d775a85c91d..5eab9cd4d81e 100644
--- a/dev-haskell/uuagc/metadata.xml
+++ b/dev-haskell/uuagc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="bootstrap_external">Use an external uuagc executable for bootstrapping.</flag>
 	</use>
diff --git a/dev-haskell/uuid-types/metadata.xml b/dev-haskell/uuid-types/metadata.xml
index 8f68c3ec9fd5..303d27034231 100644
--- a/dev-haskell/uuid-types/metadata.xml
+++ b/dev-haskell/uuid-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library contains type definitions for Universally Unique Identifiers
 		and basic conversion functions.
diff --git a/dev-haskell/uuid/metadata.xml b/dev-haskell/uuid/metadata.xml
index 3c84af6a4982..b015b4ccd53c 100644
--- a/dev-haskell/uuid/metadata.xml
+++ b/dev-haskell/uuid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This library is useful for creating, comparing, parsing and
 		printing Universally Unique Identifiers.
diff --git a/dev-haskell/uulib/metadata.xml b/dev-haskell/uulib/metadata.xml
index 2ea0814da376..b7fb1fea3731 100644
--- a/dev-haskell/uulib/metadata.xml
+++ b/dev-haskell/uulib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/vault/metadata.xml b/dev-haskell/vault/metadata.xml
index dc591c4402ff..f00f819e1ecd 100644
--- a/dev-haskell/vault/metadata.xml
+++ b/dev-haskell/vault/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A /vault/ is a typed, persistent store for values of arbitrary types.
 		It's like having first-class access to the storage space behind IORefs.
diff --git a/dev-haskell/vector-algorithms/metadata.xml b/dev-haskell/vector-algorithms/metadata.xml
index 8d94d901c80b..61da3f0a844e 100644
--- a/dev-haskell/vector-algorithms/metadata.xml
+++ b/dev-haskell/vector-algorithms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="bench">Build a benchmarking program.</flag>
 		<flag name="boundschecks">Enable bounds checking.</flag>
diff --git a/dev-haskell/vector-binary-instances/metadata.xml b/dev-haskell/vector-binary-instances/metadata.xml
index 82ae408d0ad8..8ffc8f44cd5c 100644
--- a/dev-haskell/vector-binary-instances/metadata.xml
+++ b/dev-haskell/vector-binary-instances/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Instances for Binary for the types defined in the vector package,
 		making it easy to serialize vectors to and from disk. We use the
diff --git a/dev-haskell/vector-instances/metadata.xml b/dev-haskell/vector-instances/metadata.xml
index ab6840253d06..99d86c33a117 100644
--- a/dev-haskell/vector-instances/metadata.xml
+++ b/dev-haskell/vector-instances/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Orphan Instances for 'Data.Vector'
 	</longdescription>
diff --git a/dev-haskell/vector-th-unbox/metadata.xml b/dev-haskell/vector-th-unbox/metadata.xml
index 25a618b239f3..a9de8bd9d1ae 100644
--- a/dev-haskell/vector-th-unbox/metadata.xml
+++ b/dev-haskell/vector-th-unbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Template Haskell deriver for unboxed vectors, given a pair of coercion
 		functions to and from some existing type with an Unbox instance.
diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml
index bcb6edfb532b..fe83c8e779bc 100644
--- a/dev-haskell/vector/metadata.xml
+++ b/dev-haskell/vector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		
 		An efficient implementation of Int-indexed arrays (both mutable
diff --git a/dev-haskell/void/metadata.xml b/dev-haskell/void/metadata.xml
index 4c3a9ad04c11..1bffb37f32dc 100644
--- a/dev-haskell/void/metadata.xml
+++ b/dev-haskell/void/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell 98 logically uninhabited data type. Used to indicate that a given term should not exist.
 	</longdescription>
diff --git a/dev-haskell/wai-app-static/metadata.xml b/dev-haskell/wai-app-static/metadata.xml
index 9df95da02592..eed408a8012a 100644
--- a/dev-haskell/wai-app-static/metadata.xml
+++ b/dev-haskell/wai-app-static/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+        <email>haskell@gentoo.org</email>
+        <name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Also provides some helper functions and datatypes for use outside of WAI.
 	</longdescription>
diff --git a/dev-haskell/wai-conduit/metadata.xml b/dev-haskell/wai-conduit/metadata.xml
index 84250b3f450e..b66a520a6a53 100644
--- a/dev-haskell/wai-conduit/metadata.xml
+++ b/dev-haskell/wai-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Since version 3.0.0, WAI has no built-in streaming data abstraction.
 		This library provides similar functionality to what existed in WAI 2.x.
diff --git a/dev-haskell/wai-extra/metadata.xml b/dev-haskell/wai-extra/metadata.xml
index 590ea35ec232..103e16c8fdc8 100644
--- a/dev-haskell/wai-extra/metadata.xml
+++ b/dev-haskell/wai-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The goal here is to provide common features without many dependencies.
 	</longdescription>
diff --git a/dev-haskell/wai-logger/metadata.xml b/dev-haskell/wai-logger/metadata.xml
index abb576199edf..b50117338a30 100644
--- a/dev-haskell/wai-logger/metadata.xml
+++ b/dev-haskell/wai-logger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A logging system for WAI
 	</longdescription>
diff --git a/dev-haskell/wai-test/metadata.xml b/dev-haskell/wai-test/metadata.xml
index 7b345e9452df..ade106ee9cf1 100644
--- a/dev-haskell/wai-test/metadata.xml
+++ b/dev-haskell/wai-test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Unit test framework (built on HUnit) for WAI applications.
 	</longdescription>
diff --git a/dev-haskell/wai/metadata.xml b/dev-haskell/wai/metadata.xml
index eecf974de7c4..14a1159445c0 100644
--- a/dev-haskell/wai/metadata.xml
+++ b/dev-haskell/wai/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides a common protocol for communication between web applications and web servers.
 	</longdescription>
diff --git a/dev-haskell/warp-tls/metadata.xml b/dev-haskell/warp-tls/metadata.xml
index 545bfc6a8d96..2af963de8505 100644
--- a/dev-haskell/warp-tls/metadata.xml
+++ b/dev-haskell/warp-tls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		HTTP over SSL/TLS support for Warp via the TLS package.
 	</longdescription>
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index c6dcef1a8feb..95e7727e15e1 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
 	</longdescription>
diff --git a/dev-haskell/wl-pprint/metadata.xml b/dev-haskell/wl-pprint/metadata.xml
index 3b54eb510613..03497591e7e2 100644
--- a/dev-haskell/wl-pprint/metadata.xml
+++ b/dev-haskell/wl-pprint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This is a pretty printing library based on Wadler's paper "A Prettier
 		Printer".  See the haddocks for full info.  This version allows the
diff --git a/dev-haskell/word8/metadata.xml b/dev-haskell/word8/metadata.xml
index f5adcbeaf2d9..fa6bfaa53b40 100644
--- a/dev-haskell/word8/metadata.xml
+++ b/dev-haskell/word8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Word8 library to be used with Data.ByteString
 	</longdescription>
diff --git a/dev-haskell/wxc/metadata.xml b/dev-haskell/wxc/metadata.xml
index 3a1ee8a5c4a8..2fad421069e1 100644
--- a/dev-haskell/wxc/metadata.xml
+++ b/dev-haskell/wxc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		wxHaskell is a portable and native GUI library for Haskell. It is
 		built on top of wxWidgets, a comprehensive C++ library that is
diff --git a/dev-haskell/wxcore/metadata.xml b/dev-haskell/wxcore/metadata.xml
index 0bd87c21f878..9dc7a3bf7867 100644
--- a/dev-haskell/wxcore/metadata.xml
+++ b/dev-haskell/wxcore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		wxHaskell is a portable and native GUI library for Haskell. It is
 		built on top of wxWidgets, a comprehensive C++ library that is
diff --git a/dev-haskell/wxdirect/metadata.xml b/dev-haskell/wxdirect/metadata.xml
index d523786ee0b7..143634aff3fa 100644
--- a/dev-haskell/wxdirect/metadata.xml
+++ b/dev-haskell/wxdirect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		wxHaskell is a portable and native GUI library for Haskell. It is built on
 		top of wxWidgets, a comprehensive C++ library that is portable across all
diff --git a/dev-haskell/wxhaskell/metadata.xml b/dev-haskell/wxhaskell/metadata.xml
index 2131b97237a9..1375e046ab35 100644
--- a/dev-haskell/wxhaskell/metadata.xml
+++ b/dev-haskell/wxhaskell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		wxHaskell is a portable and native GUI library for Haskell.  It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X.  This version works with wxWidgets 2.8 only.
 	</longdescription>
diff --git a/dev-haskell/x11-xft/metadata.xml b/dev-haskell/x11-xft/metadata.xml
index 8c66906af531..828a3d6e5ab3 100644
--- a/dev-haskell/x11-xft/metadata.xml
+++ b/dev-haskell/x11-xft/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 972d01a5574a..4d459dc607cd 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A Haskell binding to the X11 graphics library.
 		The binding is a direct translation of the C binding; for
diff --git a/dev-haskell/x509-store/metadata.xml b/dev-haskell/x509-store/metadata.xml
index e94695b8bbf4..2691bf48c862 100644
--- a/dev-haskell/x509-store/metadata.xml
+++ b/dev-haskell/x509-store/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="executable">Build the executable</flag>
 	</use>
diff --git a/dev-haskell/x509-system/metadata.xml b/dev-haskell/x509-system/metadata.xml
index 20f5a6c88b08..c4a94c96c35b 100644
--- a/dev-haskell/x509-system/metadata.xml
+++ b/dev-haskell/x509-system/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		System X.509 handling
 	</longdescription>
diff --git a/dev-haskell/x509-validation/metadata.xml b/dev-haskell/x509-validation/metadata.xml
index ba887b04c9f7..e96b71f68d8b 100644
--- a/dev-haskell/x509-validation/metadata.xml
+++ b/dev-haskell/x509-validation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		X.509 Certificate and CRL validation
 	</longdescription>
diff --git a/dev-haskell/x509/metadata.xml b/dev-haskell/x509/metadata.xml
index c9bb207ff808..85de0a498f3c 100644
--- a/dev-haskell/x509/metadata.xml
+++ b/dev-haskell/x509/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		X509 reader and writer
 	</longdescription>
diff --git a/dev-haskell/xhtml/metadata.xml b/dev-haskell/xhtml/metadata.xml
index 48a085074bc9..8d9927082e26 100644
--- a/dev-haskell/xhtml/metadata.xml
+++ b/dev-haskell/xhtml/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/dev-haskell/xml-conduit/metadata.xml b/dev-haskell/xml-conduit/metadata.xml
index a8c6684bc6f2..3b89b43734be 100644
--- a/dev-haskell/xml-conduit/metadata.xml
+++ b/dev-haskell/xml-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides parsing and rendering functions for XML. It is based on the datatypes found in the xml-types package. This package is broken up into the following modules:
 		
diff --git a/dev-haskell/xml-hamlet/metadata.xml b/dev-haskell/xml-hamlet/metadata.xml
index d71b1ebf4e59..42d3a95f60ff 100644
--- a/dev-haskell/xml-hamlet/metadata.xml
+++ b/dev-haskell/xml-hamlet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Hamlet-style quasiquoter for XML content
 	</longdescription>
diff --git a/dev-haskell/xml-types/metadata.xml b/dev-haskell/xml-types/metadata.xml
index c38855fe424c..08c5742b9a54 100644
--- a/dev-haskell/xml-types/metadata.xml
+++ b/dev-haskell/xml-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Basic types for representing XML
 	</longdescription>
diff --git a/dev-haskell/xml/metadata.xml b/dev-haskell/xml/metadata.xml
index 24b0f5da4db1..118419a54fc3 100644
--- a/dev-haskell/xml/metadata.xml
+++ b/dev-haskell/xml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A simple XML library.
 	</longdescription>
diff --git a/dev-haskell/xss-sanitize/metadata.xml b/dev-haskell/xss-sanitize/metadata.xml
index 406c7dc9c2fe..ccd5b7c43cdd 100644
--- a/dev-haskell/xss-sanitize/metadata.xml
+++ b/dev-haskell/xss-sanitize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent XSS attacks. see README.md &lt;https://github.com/yesodweb/haskell-xss-sanitize&gt; for more details
 	</longdescription>
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index a3d6b5a61a42..2a66d9ecd098 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides support for parsing and emitting Yaml documents.
 		
diff --git a/dev-haskell/yesod-auth-hashdb/metadata.xml b/dev-haskell/yesod-auth-hashdb/metadata.xml
index 5bc22bb0d021..2512064f40cd 100644
--- a/dev-haskell/yesod-auth-hashdb/metadata.xml
+++ b/dev-haskell/yesod-auth-hashdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package is the Yesod.Auth.HashDB plugin, originally included in yesod-auth, but now modified to be more secure and placed in a separate package.
 	</longdescription>
diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
index ea87983d1486..eadf7bcebe57 100644
--- a/dev-haskell/yesod-auth/metadata.xml
+++ b/dev-haskell/yesod-auth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>haskell</herd>
+        <maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+        </maintainer>
         <longdescription>
                 Authentication for Yesod.
         </longdescription>
diff --git a/dev-haskell/yesod-core/metadata.xml b/dev-haskell/yesod-core/metadata.xml
index cb5f4c8ce082..6492efc248df 100644
--- a/dev-haskell/yesod-core/metadata.xml
+++ b/dev-haskell/yesod-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
 		
diff --git a/dev-haskell/yesod-default/metadata.xml b/dev-haskell/yesod-default/metadata.xml
index 4d6c9ec108d3..1750d6ff47a6 100644
--- a/dev-haskell/yesod-default/metadata.xml
+++ b/dev-haskell/yesod-default/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Convenient wrappers for your the configuration and
 		execution of your yesod application
diff --git a/dev-haskell/yesod-form/metadata.xml b/dev-haskell/yesod-form/metadata.xml
index c6237ef64f73..7b907e66a4f6 100644
--- a/dev-haskell/yesod-form/metadata.xml
+++ b/dev-haskell/yesod-form/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>haskell</herd>
+        <maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+        </maintainer>
         <longdescription>
                 Form handling support for Yesod Web Framework
         </longdescription>
diff --git a/dev-haskell/yesod-json/metadata.xml b/dev-haskell/yesod-json/metadata.xml
index eefb77cfb17d..2bcf735e9946 100644
--- a/dev-haskell/yesod-json/metadata.xml
+++ b/dev-haskell/yesod-json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Generate content for Yesod using the aeson package.
 	</longdescription>
diff --git a/dev-haskell/yesod-persistent/metadata.xml b/dev-haskell/yesod-persistent/metadata.xml
index 2966c2ba2b93..9aefed41b97b 100644
--- a/dev-haskell/yesod-persistent/metadata.xml
+++ b/dev-haskell/yesod-persistent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Some helpers for using Persistent from Yesod.
 	</longdescription>
diff --git a/dev-haskell/yesod-platform/metadata.xml b/dev-haskell/yesod-platform/metadata.xml
index 21648c4e6a41..d9c6fa5d0d17 100644
--- a/dev-haskell/yesod-platform/metadata.xml
+++ b/dev-haskell/yesod-platform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Instead of allowing version ranges of dependencies, this package requires specific versions to avoid dependency hell
 	</longdescription>
diff --git a/dev-haskell/yesod-routes/metadata.xml b/dev-haskell/yesod-routes/metadata.xml
index e6b30e2807b8..29acbc285fc2 100644
--- a/dev-haskell/yesod-routes/metadata.xml
+++ b/dev-haskell/yesod-routes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Provides an efficient routing system, a parser and TH code generation.
 	</longdescription>
diff --git a/dev-haskell/yesod-static/metadata.xml b/dev-haskell/yesod-static/metadata.xml
index 3eb80fc66d38..833711623240 100644
--- a/dev-haskell/yesod-static/metadata.xml
+++ b/dev-haskell/yesod-static/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Static file serving subsite for Yesod Web Framework.
 	</longdescription>
diff --git a/dev-haskell/yesod-test/metadata.xml b/dev-haskell/yesod-test/metadata.xml
index cb9a220ba4ca..6fa48bde3969 100644
--- a/dev-haskell/yesod-test/metadata.xml
+++ b/dev-haskell/yesod-test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Behaviour Oriented integration Testing for Yesod Applications
 	</longdescription>
diff --git a/dev-haskell/yesod/metadata.xml b/dev-haskell/yesod/metadata.xml
index 805906d58626..500676425b2d 100644
--- a/dev-haskell/yesod/metadata.xml
+++ b/dev-haskell/yesod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
 		
diff --git a/dev-haskell/zip-archive/metadata.xml b/dev-haskell/zip-archive/metadata.xml
index dc57badf80c0..a5edbb804fe2 100644
--- a/dev-haskell/zip-archive/metadata.xml
+++ b/dev-haskell/zip-archive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		The zip-archive library provides functions for creating, modifying,
 		and extracting files from zip archives.
diff --git a/dev-haskell/zlib-bindings/metadata.xml b/dev-haskell/zlib-bindings/metadata.xml
index e18648afdcdc..e35fc10581cf 100644
--- a/dev-haskell/zlib-bindings/metadata.xml
+++ b/dev-haskell/zlib-bindings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Low-level bindings to the zlib package.
 	</longdescription>
diff --git a/dev-haskell/zlib-conduit/metadata.xml b/dev-haskell/zlib-conduit/metadata.xml
index abaee86cef49..0d0a26a78a3a 100644
--- a/dev-haskell/zlib-conduit/metadata.xml
+++ b/dev-haskell/zlib-conduit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Streaming compression/decompression via conduits.
 	</longdescription>
diff --git a/dev-haskell/zlib-enum/metadata.xml b/dev-haskell/zlib-enum/metadata.xml
index 1f0cdeb10188..4937765f5a88 100644
--- a/dev-haskell/zlib-enum/metadata.xml
+++ b/dev-haskell/zlib-enum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		zlib-enum is a stop-gap package to provide enumeratees for
 		zlib compression/decompression.
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index 2f012e4ca524..82f965ecd2d9 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
diff --git a/dev-java/absolutelayout/metadata.xml b/dev-java/absolutelayout/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/absolutelayout/metadata.xml
+++ b/dev-java/absolutelayout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
index 345632415647..b91b22f12c69 100644
--- a/dev-java/annogen/metadata.xml
+++ b/dev-java/annogen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">codehaus/annogen</remote-id>
 	</upstream>
diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/ant-antlr/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-antlr/metadata.xml
+++ b/dev-java/ant-antlr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/ant-apache-bcel/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-bcel/metadata.xml
+++ b/dev-java/ant-apache-bcel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/ant-apache-bsf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-bsf/metadata.xml
+++ b/dev-java/ant-apache-bsf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/ant-apache-log4j/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-log4j/metadata.xml
+++ b/dev-java/ant-apache-log4j/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-oro/metadata.xml
+++ b/dev-java/ant-apache-oro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-regexp/metadata.xml
+++ b/dev-java/ant-apache-regexp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-resolver/metadata.xml
+++ b/dev-java/ant-apache-resolver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-apache-xalan2/metadata.xml
+++ b/dev-java/ant-apache-xalan2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-commons-logging/metadata.xml
+++ b/dev-java/ant-commons-logging/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-commons-net/metadata.xml
+++ b/dev-java/ant-commons-net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 9452de6d1452..081b075e162f 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ant-contrib</remote-id>
 	</upstream>
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-core/metadata.xml
+++ b/dev-java/ant-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-eclipse-ecj/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml
index f685f4a1f625..aa5246dd4e0c 100644
--- a/dev-java/ant-eclipse-ecj/metadata.xml
+++ b/dev-java/ant-eclipse-ecj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 ECJ is the Eclipse Compiler for Java. It's a separate packaging of
 the embedded Java compiler that comes with Eclipse. It can be used
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index e97bb1c449fb..b4089e3bca10 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Ivy is a powerful dependencies manager with transitive dependencies
 		support and much more features.
diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-jai/metadata.xml
+++ b/dev-java/ant-jai/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-javamail/metadata.xml
+++ b/dev-java/ant-javamail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-jdepend/metadata.xml
+++ b/dev-java/ant-jdepend/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-jmf/metadata.xml
+++ b/dev-java/ant-jmf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-jsch/metadata.xml
+++ b/dev-java/ant-jsch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-junit/metadata.xml
+++ b/dev-java/ant-junit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-junit4/metadata.xml
+++ b/dev-java/ant-junit4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-nodeps/metadata.xml b/dev-java/ant-nodeps/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-nodeps/metadata.xml
+++ b/dev-java/ant-nodeps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-owanttask/metadata.xml b/dev-java/ant-owanttask/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/ant-owanttask/metadata.xml
+++ b/dev-java/ant-owanttask/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-swing/metadata.xml
+++ b/dev-java/ant-swing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-testutil/metadata.xml
+++ b/dev-java/ant-testutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant-trax/metadata.xml b/dev-java/ant-trax/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ant-trax/metadata.xml
+++ b/dev-java/ant-trax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 6cfffe619d55..2fd11cd840e7 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="antlr">Enable ANTLR Ant tasks</flag>
     <flag name="bcel">Enable bcel (bytecode manipulation) Ant tasks</flag>
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index e00adfd1a91e..6d446a1e0d43 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
 		  gUnit is a "Unit Test" framework for ANTLR grammars
diff --git a/dev-java/aopalliance/metadata.xml b/dev-java/aopalliance/metadata.xml
index 33f1f323e4c2..59bc361c7dd3 100644
--- a/dev-java/aopalliance/metadata.xml
+++ b/dev-java/aopalliance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aopalliance</remote-id>
 	</upstream>
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
index 54f3f7f0aa6f..ec20935cb981 100644
--- a/dev-java/appframework/metadata.xml
+++ b/dev-java/appframework/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		 The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
 
diff --git a/dev-java/apple-java-extensions-bin/metadata.xml b/dev-java/apple-java-extensions-bin/metadata.xml
index 3b7bcf54f1d2..6e6d25dc49e0 100644
--- a/dev-java/apple-java-extensions-bin/metadata.xml
+++ b/dev-java/apple-java-extensions-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 This is a pluggable jar of stub classes representing the new Apple eAWT
 and eIO APIs for Java 1.4 on Mac OS X. The purpose of these stubs is to
diff --git a/dev-java/apple-jdk-bin/metadata.xml b/dev-java/apple-jdk-bin/metadata.xml
index 4561e552bd04..4609b17cbb97 100644
--- a/dev-java/apple-jdk-bin/metadata.xml
+++ b/dev-java/apple-jdk-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/apt-mirror/metadata.xml b/dev-java/apt-mirror/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/apt-mirror/metadata.xml
+++ b/dev-java/apt-mirror/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/args4j/metadata.xml b/dev-java/args4j/metadata.xml
index a620379538aa..5cb3f66dbecb 100644
--- a/dev-java/args4j/metadata.xml
+++ b/dev-java/args4j/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-<maintainer>
+	<maintainer>
 	<email>monsieurp@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
index 1ef28abc2f17..76a3242ed8a5 100644
--- a/dev-java/asm/metadata.xml
+++ b/dev-java/asm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 
 	<longdescription>
 	ASM is a Java bytecode manipulation framework. It can be used to
diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
index dd06c6df5bc8..f1fdcf93e6b9 100644
--- a/dev-java/assertj-core/metadata.xml
+++ b/dev-java/assertj-core/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>AssertJ core is a Java library that provides a fluent interface for writing assertions. Its main goal is to improve test code readability and make maintenance of tests easier. AssertJ core provides assertions for JDK standard types can be used with either JUnit or TestNG.</longdescription>
 </pkgmetadata>
diff --git a/dev-java/avalon-framework/metadata.xml b/dev-java/avalon-framework/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/avalon-framework/metadata.xml
+++ b/dev-java/avalon-framework/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/avalon-logkit/metadata.xml b/dev-java/avalon-logkit/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/avalon-logkit/metadata.xml
+++ b/dev-java/avalon-logkit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/backport-util-concurrent/metadata.xml b/dev-java/backport-util-concurrent/metadata.xml
index c61248a4b1f7..0e7ac782ba96 100644
--- a/dev-java/backport-util-concurrent/metadata.xml
+++ b/dev-java/backport-util-concurrent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		This package is the backport of java.util.concurrent API, introduced
 		in Java 5.0, to Java 1.4, and from Java 6.0 to Java 5.0"
diff --git a/dev-java/balloontip/metadata.xml b/dev-java/balloontip/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/balloontip/metadata.xml
+++ b/dev-java/balloontip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml
index d44ab745e7a9..0c9ccea8d6b0 100644
--- a/dev-java/batik/metadata.xml
+++ b/dev-java/batik/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 	Java toolkit for applications or applets that want to use
 	images in the Scalable Vector Graphics (SVG) format for various
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
index 4fc74595c959..426d84bc9a45 100644
--- a/dev-java/bcel/metadata.xml
+++ b/dev-java/bcel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
  This is the main Reference implementation of the BCEL JavaClass API.
  The Byte Code Engineering Library (formerly known as JavaClass) is intended 
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
index c8910f13df43..5580d24e4890 100644
--- a/dev-java/bcmail/metadata.xml
+++ b/dev-java/bcmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Lightweight Java cryptography APIs that work with everything
 		from the J2ME to the JDK 1.6
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/bcpg/metadata.xml
+++ b/dev-java/bcpg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/bcpkix/metadata.xml
+++ b/dev-java/bcpkix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/bctsp/metadata.xml b/dev-java/bctsp/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/dev-java/bctsp/metadata.xml
+++ b/dev-java/bctsp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/beansbinding/metadata.xml b/dev-java/beansbinding/metadata.xml
index 12d1c22ce4b1..38c652e73623 100644
--- a/dev-java/beansbinding/metadata.xml
+++ b/dev-java/beansbinding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 Beans Binding (JSR 295) is about keeping the properties of two beans in sync. This project provides the reference implementation of Beans Binding, with an additional emphasis on the ability to bind to Swing components, and easy integration with IDEs such as NetBeans.
 </longdescription>
diff --git a/dev-java/blowfishj/metadata.xml b/dev-java/blowfishj/metadata.xml
index 0df99acfebe9..dac47e868d24 100644
--- a/dev-java/blowfishj/metadata.xml
+++ b/dev-java/blowfishj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	The Blowfish implementation in Java, provides very fast ECB and CBC encryption.
 	Comes with the BlowfishEasy class for simple string encryption, plus a solution
diff --git a/dev-java/bnd-junit/metadata.xml b/dev-java/bnd-junit/metadata.xml
index f74b561cfceb..cf3e06b82357 100644
--- a/dev-java/bnd-junit/metadata.xml
+++ b/dev-java/bnd-junit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bndtools/bnd</remote-id>
   </upstream>
diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml
index f74b561cfceb..cf3e06b82357 100644
--- a/dev-java/bndlib/metadata.xml
+++ b/dev-java/bndlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bndtools/bnd</remote-id>
   </upstream>
diff --git a/dev-java/browserlauncher2/metadata.xml b/dev-java/browserlauncher2/metadata.xml
index 698f4bd621e1..c1416a45b30e 100644
--- a/dev-java/browserlauncher2/metadata.xml
+++ b/dev-java/browserlauncher2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		BrowserLauncher2, a continuation of the BrowserLauncher project, is a
 		library that facilitates opening a browser from a Java application and
diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml
index 45f6df3b429c..7ae44befe99e 100644
--- a/dev-java/bsf/metadata.xml
+++ b/dev-java/bsf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 Bean Scripting Framework (BSF) is a set of Java classes which provides
diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/bsh/metadata.xml
+++ b/dev-java/bsh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/byaccj/metadata.xml b/dev-java/byaccj/metadata.xml
index 02d618cd67cf..2cef1bac9aae 100644
--- a/dev-java/byaccj/metadata.xml
+++ b/dev-java/byaccj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">byaccj</remote-id>
 	</upstream>
diff --git a/dev-java/bytecode/metadata.xml b/dev-java/bytecode/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/bytecode/metadata.xml
+++ b/dev-java/bytecode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/bytelist/metadata.xml b/dev-java/bytelist/metadata.xml
index 9ef38f82b2b4..0b090fff2153 100644
--- a/dev-java/bytelist/metadata.xml
+++ b/dev-java/bytelist/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>java@gentoo.org</email>
   </maintainer>
diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml
index b8f3288b7250..0b020d47129a 100644
--- a/dev-java/c3p0/metadata.xml
+++ b/dev-java/c3p0/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">c3p0</remote-id>
 	</upstream>
diff --git a/dev-java/cacao/metadata.xml b/dev-java/cacao/metadata.xml
index 5bb6d0ce062e..2d4442a2f49f 100644
--- a/dev-java/cacao/metadata.xml
+++ b/dev-java/cacao/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 CACAO is started out as a research JIT compiler for Java to explore new 
diff --git a/dev-java/cal10n/metadata.xml b/dev-java/cal10n/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/cal10n/metadata.xml
+++ b/dev-java/cal10n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/cdegroot-db/metadata.xml b/dev-java/cdegroot-db/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/cdegroot-db/metadata.xml
+++ b/dev-java/cdegroot-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/cdi-api/metadata.xml b/dev-java/cdi-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/cdi-api/metadata.xml
+++ b/dev-java/cdi-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
index 80d7a322ef6b..3b143e2062e7 100644
--- a/dev-java/cglib/metadata.xml
+++ b/dev-java/cglib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		cglib is a powerful, high performance and quality Code Generation
 		Library, It is used to extend JAVA classes and implements interfaces
diff --git a/dev-java/charva/metadata.xml b/dev-java/charva/metadata.xml
index ec76855e0cb7..d0fb2ece4baa 100644
--- a/dev-java/charva/metadata.xml
+++ b/dev-java/charva/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">charva</remote-id>
 	</upstream>
diff --git a/dev-java/classmate/metadata.xml b/dev-java/classmate/metadata.xml
index d3dc620ccddc..944c5639c036 100644
--- a/dev-java/classmate/metadata.xml
+++ b/dev-java/classmate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">cowtowncoder/java-classmate</remote-id>
 	</upstream>
diff --git a/dev-java/cldc-api/metadata.xml b/dev-java/cldc-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/cldc-api/metadata.xml
+++ b/dev-java/cldc-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/codemodel/metadata.xml b/dev-java/codemodel/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/codemodel/metadata.xml
+++ b/dev-java/codemodel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/cofoja/metadata.xml b/dev-java/cofoja/metadata.xml
index 679fd98f7efc..e76795a221fa 100644
--- a/dev-java/cofoja/metadata.xml
+++ b/dev-java/cofoja/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">cofoja</remote-id>
 		<remote-id type="github">nhatminhle/cofoja</remote-id>
@@ -10,4 +9,8 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/colt/metadata.xml b/dev-java/colt/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/colt/metadata.xml
+++ b/dev-java/colt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-beanutils/metadata.xml b/dev-java/commons-beanutils/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-beanutils/metadata.xml
+++ b/dev-java/commons-beanutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-betwixt/metadata.xml b/dev-java/commons-betwixt/metadata.xml
index 392662d241d0..cb3f412968fb 100644
--- a/dev-java/commons-betwixt/metadata.xml
+++ b/dev-java/commons-betwixt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 	The Betwixt library provides an XML introspection mechanism for mapping
diff --git a/dev-java/commons-chain/metadata.xml b/dev-java/commons-chain/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/commons-chain/metadata.xml
+++ b/dev-java/commons-chain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-cli/metadata.xml b/dev-java/commons-cli/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-cli/metadata.xml
+++ b/dev-java/commons-cli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-codec/metadata.xml b/dev-java/commons-codec/metadata.xml
index 51152b11636f..e33475f4045d 100644
--- a/dev-java/commons-codec/metadata.xml
+++ b/dev-java/commons-codec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 Codec was formed as an attempt to focus development effort on one
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index e6724cbe148d..688c799b6fb2 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="test-framework">Install the test framework</flag>
   </use>
diff --git a/dev-java/commons-configuration/metadata.xml b/dev-java/commons-configuration/metadata.xml
index 8f76559d3618..58d24b80e436 100644
--- a/dev-java/commons-configuration/metadata.xml
+++ b/dev-java/commons-configuration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Commons Configuration provides a generic configuration interface
 		which enables an application to read configuration data from
diff --git a/dev-java/commons-daemon/metadata.xml b/dev-java/commons-daemon/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-daemon/metadata.xml
+++ b/dev-java/commons-daemon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-dbcp/metadata.xml b/dev-java/commons-dbcp/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-dbcp/metadata.xml
+++ b/dev-java/commons-dbcp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-dbutils/metadata.xml b/dev-java/commons-dbutils/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/commons-dbutils/metadata.xml
+++ b/dev-java/commons-dbutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-digester/metadata.xml
+++ b/dev-java/commons-digester/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-discovery/metadata.xml b/dev-java/commons-discovery/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-discovery/metadata.xml
+++ b/dev-java/commons-discovery/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-el/metadata.xml b/dev-java/commons-el/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-el/metadata.xml
+++ b/dev-java/commons-el/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-email/metadata.xml b/dev-java/commons-email/metadata.xml
index a620379538aa..5cb3f66dbecb 100644
--- a/dev-java/commons-email/metadata.xml
+++ b/dev-java/commons-email/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-<maintainer>
+	<maintainer>
 	<email>monsieurp@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-fileupload/metadata.xml b/dev-java/commons-fileupload/metadata.xml
index 43fc180bed4c..66f5c53c8973 100644
--- a/dev-java/commons-fileupload/metadata.xml
+++ b/dev-java/commons-fileupload/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Commons FileUpload package makes it easy to add robust,
 		high-performance, file upload capability to your servlets and web
diff --git a/dev-java/commons-graph/metadata.xml b/dev-java/commons-graph/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-graph/metadata.xml
+++ b/dev-java/commons-graph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-httpclient/metadata.xml b/dev-java/commons-httpclient/metadata.xml
index 5fdcd222f17f..b3fbd14a6f06 100644
--- a/dev-java/commons-httpclient/metadata.xml
+++ b/dev-java/commons-httpclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Jakarta Commons HttpClient provides an efficient, up-to-date,
 		and feature-rich package implementing the client side of the most
diff --git a/dev-java/commons-io/metadata.xml b/dev-java/commons-io/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-io/metadata.xml
+++ b/dev-java/commons-io/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-jelly/metadata.xml b/dev-java/commons-jelly/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-jelly/metadata.xml
+++ b/dev-java/commons-jelly/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-jexl/metadata.xml b/dev-java/commons-jexl/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-jexl/metadata.xml
+++ b/dev-java/commons-jexl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-jxpath/metadata.xml
+++ b/dev-java/commons-jxpath/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-lang/metadata.xml b/dev-java/commons-lang/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-lang/metadata.xml
+++ b/dev-java/commons-lang/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-launcher/metadata.xml b/dev-java/commons-launcher/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-launcher/metadata.xml
+++ b/dev-java/commons-launcher/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index 47d5d795f1ab..d74208f56d70 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="avalon-framework">Add optional support for avalon-framework</flag>
     <flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
diff --git a/dev-java/commons-math/metadata.xml b/dev-java/commons-math/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/commons-math/metadata.xml
+++ b/dev-java/commons-math/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-net/metadata.xml b/dev-java/commons-net/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-net/metadata.xml
+++ b/dev-java/commons-net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-pool/metadata.xml b/dev-java/commons-pool/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-pool/metadata.xml
+++ b/dev-java/commons-pool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
index 7c6a776fc643..848f06dbdaaf 100644
--- a/dev-java/commons-primitives/metadata.xml
+++ b/dev-java/commons-primitives/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
  Apache Jakarta Commons Primitives provides a collection of types and
diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/commons-validator/metadata.xml
+++ b/dev-java/commons-validator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/commons-vfs/metadata.xml b/dev-java/commons-vfs/metadata.xml
index 6f34aa065948..e52574cebc76 100644
--- a/dev-java/commons-vfs/metadata.xml
+++ b/dev-java/commons-vfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Commons VFS provides a single API for accessing various different file
 		systems. It presents a uniform view of the files from various different
diff --git a/dev-java/concurrent-util/metadata.xml b/dev-java/concurrent-util/metadata.xml
index 444ba069e86e..d025302ae663 100644
--- a/dev-java/concurrent-util/metadata.xml
+++ b/dev-java/concurrent-util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Doug Lea's concurrency utilities provide standardized, efficient
 		versions of utility classes commonly encountered in concurrent Java
diff --git a/dev-java/constantine/metadata.xml b/dev-java/constantine/metadata.xml
index ba09c8509174..e310aed072d7 100644
--- a/dev-java/constantine/metadata.xml
+++ b/dev-java/constantine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">wmeissner/jnr-constants</remote-id>
   </upstream>
diff --git a/dev-java/cortado/metadata.xml b/dev-java/cortado/metadata.xml
index ff5db0ba4080..008db89d6294 100644
--- a/dev-java/cortado/metadata.xml
+++ b/dev-java/cortado/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cortado is an open-source cross-browser and cross-platform video
 		playback solution based upon Java technology. Leveraging the huge
diff --git a/dev-java/cpptasks/metadata.xml b/dev-java/cpptasks/metadata.xml
index 9452de6d1452..081b075e162f 100644
--- a/dev-java/cpptasks/metadata.xml
+++ b/dev-java/cpptasks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ant-contrib</remote-id>
 	</upstream>
diff --git a/dev-java/cssparser/metadata.xml b/dev-java/cssparser/metadata.xml
index 84b2b66a12cc..9c05ce2a056a 100644
--- a/dev-java/cssparser/metadata.xml
+++ b/dev-java/cssparser/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cssparser</remote-id>
 	</upstream>
diff --git a/dev-java/db4o-jdk11/metadata.xml b/dev-java/db4o-jdk11/metadata.xml
index 08b5ba84ac21..8ae89739c4ef 100644
--- a/dev-java/db4o-jdk11/metadata.xml
+++ b/dev-java/db4o-jdk11/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-java/db4o-jdk12/metadata.xml b/dev-java/db4o-jdk12/metadata.xml
index 08b5ba84ac21..8ae89739c4ef 100644
--- a/dev-java/db4o-jdk12/metadata.xml
+++ b/dev-java/db4o-jdk12/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-java/db4o-jdk5/metadata.xml b/dev-java/db4o-jdk5/metadata.xml
index 08b5ba84ac21..8ae89739c4ef 100644
--- a/dev-java/db4o-jdk5/metadata.xml
+++ b/dev-java/db4o-jdk5/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-java/dbus-java/metadata.xml b/dev-java/dbus-java/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/dbus-java/metadata.xml
+++ b/dev-java/dbus-java/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/dict4j/metadata.xml b/dev-java/dict4j/metadata.xml
index 095f02ced4e2..9d760a414332 100644
--- a/dev-java/dict4j/metadata.xml
+++ b/dev-java/dict4j/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dict4j</remote-id>
 	</upstream>
diff --git a/dev-java/disruptor/metadata.xml b/dev-java/disruptor/metadata.xml
index 4c16b6dfec73..349b5c514a7e 100644
--- a/dev-java/disruptor/metadata.xml
+++ b/dev-java/disruptor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">LMAX-Exchange/disruptor</remote-id>
 	</upstream>
diff --git a/dev-java/dnsjava/metadata.xml b/dev-java/dnsjava/metadata.xml
index 5da579a2afa2..9121a4fc56b6 100644
--- a/dev-java/dnsjava/metadata.xml
+++ b/dev-java/dnsjava/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		dnsjava is an implementation of DNS in Java. It supports all defined record 
 		ypes (including the DNSSEC types), and unknown types. It can be used for queries,
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index c2307b378c9f..8549cb39904f 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Easy to use, open source library for working with XML, XPath and
 		XSLT on the Java platform using the Java Collections Framework
diff --git a/dev-java/dsiutils/metadata.xml b/dev-java/dsiutils/metadata.xml
index aa2a2dcd0eac..3454456a0e6f 100644
--- a/dev-java/dsiutils/metadata.xml
+++ b/dev-java/dsiutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		The DSI utilities are a mish mash of classes accumulated during the last
 		ten years in projects developed at the DSI (Dipartimento di Scienze
diff --git a/dev-java/dtdparser/metadata.xml b/dev-java/dtdparser/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/dtdparser/metadata.xml
+++ b/dev-java/dtdparser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/dynalang/metadata.xml b/dev-java/dynalang/metadata.xml
index 028fe36423df..b7ebaef7b59a 100644
--- a/dev-java/dynalang/metadata.xml
+++ b/dev-java/dynalang/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dynalang</remote-id>
 	</upstream>
diff --git a/dev-java/easymock-classextension/metadata.xml b/dev-java/easymock-classextension/metadata.xml
index 5a7239683c94..3f70c745aab2 100644
--- a/dev-java/easymock-classextension/metadata.xml
+++ b/dev-java/easymock-classextension/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">easymock</remote-id>
 	</upstream>
diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index 5a7239683c94..3f70c745aab2 100644
--- a/dev-java/easymock/metadata.xml
+++ b/dev-java/easymock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">easymock</remote-id>
 	</upstream>
diff --git a/dev-java/easyneurons/metadata.xml b/dev-java/easyneurons/metadata.xml
index b88f3d4a8c7c..3e050018c403 100644
--- a/dev-java/easyneurons/metadata.xml
+++ b/dev-java/easyneurons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">neuroph</remote-id>
 	</upstream>
diff --git a/dev-java/echo2/metadata.xml b/dev-java/echo2/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/echo2/metadata.xml
+++ b/dev-java/echo2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml
index b16b316310ca..bc565d10d4b9 100644
--- a/dev-java/ecj-gcj/metadata.xml
+++ b/dev-java/ecj-gcj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <use>
 	<flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag>
 </use>
diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
index 2b50537a62dd..76d1aefc9012 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 ECJ is the Eclipse Compiler for Java. It's a separate packaging of
 the embedded Java compiler that comes with Eclipse. It can be used
diff --git a/dev-java/eclipsito/metadata.xml b/dev-java/eclipsito/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/eclipsito/metadata.xml
+++ b/dev-java/eclipsito/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ecs/metadata.xml b/dev-java/ecs/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/ecs/metadata.xml
+++ b/dev-java/ecs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/edtftpj/metadata.xml b/dev-java/edtftpj/metadata.xml
index 78e4b70b2dfe..692ef285c04c 100644
--- a/dev-java/edtftpj/metadata.xml
+++ b/dev-java/edtftpj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		edtFTPj is the first choice of Java developers worldwide
 		for incorporating FTP functionality into their applications.
diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
index fbc3b22c98e8..61b4a6e831d1 100644
--- a/dev-java/ehcache/metadata.xml
+++ b/dev-java/ehcache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ehcache</remote-id>
 	</upstream>
diff --git a/dev-java/emma/metadata.xml b/dev-java/emma/metadata.xml
index 45e018e0f406..be7ba704d229 100644
--- a/dev-java/emma/metadata.xml
+++ b/dev-java/emma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		EMMA is an open-source toolkit for measuring and reporting Java code
 		coverage. EMMA distinguishes itself from other tools by going after
diff --git a/dev-java/fastinfoset/metadata.xml b/dev-java/fastinfoset/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/fastinfoset/metadata.xml
+++ b/dev-java/fastinfoset/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/fastutil/metadata.xml b/dev-java/fastutil/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/fastutil/metadata.xml
+++ b/dev-java/fastutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index 54d08367e6a4..ac88bc2c87de 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">onionnetworks</remote-id>
 	</upstream>
diff --git a/dev-java/felix-bundlerepository/metadata.xml b/dev-java/felix-bundlerepository/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/felix-bundlerepository/metadata.xml
+++ b/dev-java/felix-bundlerepository/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/felix-gogo-command/metadata.xml b/dev-java/felix-gogo-command/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/felix-gogo-command/metadata.xml
+++ b/dev-java/felix-gogo-command/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/felix-gogo-runtime/metadata.xml
+++ b/dev-java/felix-gogo-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/felix-shell/metadata.xml b/dev-java/felix-shell/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/felix-shell/metadata.xml
+++ b/dev-java/felix-shell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/felix-utils/metadata.xml
+++ b/dev-java/felix-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/flyingsaucer/metadata.xml b/dev-java/flyingsaucer/metadata.xml
index 7cac896c1d96..46b1da979fd4 100644
--- a/dev-java/flyingsaucer/metadata.xml
+++ b/dev-java/flyingsaucer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 
 	<longdescription lang="en">
 		Flying Saucer is a 100% Java XHTML+CSS renderer, including support
diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
index bc6017be62d3..66960223405e 100644
--- a/dev-java/fontbox/metadata.xml
+++ b/dev-java/fontbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		FontBox is a Java font library used to obtain low level information
 		from font files.
diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/fop/metadata.xml
+++ b/dev-java/fop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/forehead/metadata.xml b/dev-java/forehead/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/forehead/metadata.xml
+++ b/dev-java/forehead/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-export/metadata.xml b/dev-java/freehep-export/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-export/metadata.xml
+++ b/dev-java/freehep-export/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphics2d/metadata.xml b/dev-java/freehep-graphics2d/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphics2d/metadata.xml
+++ b/dev-java/freehep-graphics2d/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-emf/metadata.xml b/dev-java/freehep-graphicsio-emf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-emf/metadata.xml
+++ b/dev-java/freehep-graphicsio-emf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-java/metadata.xml b/dev-java/freehep-graphicsio-java/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-java/metadata.xml
+++ b/dev-java/freehep-graphicsio-java/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-pdf/metadata.xml b/dev-java/freehep-graphicsio-pdf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-pdf/metadata.xml
+++ b/dev-java/freehep-graphicsio-pdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-ps/metadata.xml b/dev-java/freehep-graphicsio-ps/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-ps/metadata.xml
+++ b/dev-java/freehep-graphicsio-ps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-svg/metadata.xml b/dev-java/freehep-graphicsio-svg/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-svg/metadata.xml
+++ b/dev-java/freehep-graphicsio-svg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-swf/metadata.xml b/dev-java/freehep-graphicsio-swf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-swf/metadata.xml
+++ b/dev-java/freehep-graphicsio-swf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-tests/metadata.xml b/dev-java/freehep-graphicsio-tests/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio-tests/metadata.xml
+++ b/dev-java/freehep-graphicsio-tests/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-graphicsio/metadata.xml
+++ b/dev-java/freehep-graphicsio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-io/metadata.xml b/dev-java/freehep-io/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-io/metadata.xml
+++ b/dev-java/freehep-io/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-mcfio/metadata.xml b/dev-java/freehep-mcfio/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-mcfio/metadata.xml
+++ b/dev-java/freehep-mcfio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-misc-deps/metadata.xml b/dev-java/freehep-misc-deps/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-misc-deps/metadata.xml
+++ b/dev-java/freehep-misc-deps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-parameterdatabase/metadata.xml b/dev-java/freehep-parameterdatabase/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-parameterdatabase/metadata.xml
+++ b/dev-java/freehep-parameterdatabase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-record/metadata.xml b/dev-java/freehep-record/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-record/metadata.xml
+++ b/dev-java/freehep-record/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-rootio/metadata.xml b/dev-java/freehep-rootio/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-rootio/metadata.xml
+++ b/dev-java/freehep-rootio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-rtti/metadata.xml b/dev-java/freehep-rtti/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-rtti/metadata.xml
+++ b/dev-java/freehep-rtti/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-sio/metadata.xml b/dev-java/freehep-sio/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-sio/metadata.xml
+++ b/dev-java/freehep-sio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-stdhep/metadata.xml b/dev-java/freehep-stdhep/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-stdhep/metadata.xml
+++ b/dev-java/freehep-stdhep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-swing/metadata.xml b/dev-java/freehep-swing/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-swing/metadata.xml
+++ b/dev-java/freehep-swing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-util/metadata.xml b/dev-java/freehep-util/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-util/metadata.xml
+++ b/dev-java/freehep-util/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-xdr/metadata.xml b/dev-java/freehep-xdr/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-xdr/metadata.xml
+++ b/dev-java/freehep-xdr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freehep-xml/metadata.xml b/dev-java/freehep-xml/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/freehep-xml/metadata.xml
+++ b/dev-java/freehep-xml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
index 5425ccbe2950..c87289b784f0 100644
--- a/dev-java/freemarker/metadata.xml
+++ b/dev-java/freemarker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freemarker</remote-id>
 	</upstream>
diff --git a/dev-java/fscript/metadata.xml b/dev-java/fscript/metadata.xml
index 86bbc9c8ca2a..0758f6a7a0c9 100644
--- a/dev-java/fscript/metadata.xml
+++ b/dev-java/fscript/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fscript</remote-id>
 	</upstream>
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index 2d881e81e328..8620520ad180 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gnu_andrew@member.fsf.org</email>
 		<name>Andrew John Hughes</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
 	<use>
 		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
diff --git a/dev-java/gjdoc/metadata.xml b/dev-java/gjdoc/metadata.xml
index a247e16439ae..5c4965809f69 100644
--- a/dev-java/gjdoc/metadata.xml
+++ b/dev-java/gjdoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
 Gjdoc provides a framework for generating documentation in various
 formats from java source files.  It implements all features of the
diff --git a/dev-java/glassfish-connector-api/metadata.xml b/dev-java/glassfish-connector-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/glassfish-connector-api/metadata.xml
+++ b/dev-java/glassfish-connector-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-deployment-api/metadata.xml b/dev-java/glassfish-deployment-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/glassfish-deployment-api/metadata.xml
+++ b/dev-java/glassfish-deployment-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-ejb-api/metadata.xml b/dev-java/glassfish-ejb-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/glassfish-ejb-api/metadata.xml
+++ b/dev-java/glassfish-ejb-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-interceptor-api/metadata.xml b/dev-java/glassfish-interceptor-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/glassfish-interceptor-api/metadata.xml
+++ b/dev-java/glassfish-interceptor-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-jms-api/metadata.xml b/dev-java/glassfish-jms-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/glassfish-jms-api/metadata.xml
+++ b/dev-java/glassfish-jms-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-persistence/metadata.xml b/dev-java/glassfish-persistence/metadata.xml
index 407583277d87..cf8e7b830130 100644
--- a/dev-java/glassfish-persistence/metadata.xml
+++ b/dev-java/glassfish-persistence/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>java@gentoo.org</email>
 </maintainer>
diff --git a/dev-java/glassfish-servlet-api/metadata.xml b/dev-java/glassfish-servlet-api/metadata.xml
index 0bd86abdd107..ed22faba53ae 100644
--- a/dev-java/glassfish-servlet-api/metadata.xml
+++ b/dev-java/glassfish-servlet-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	The Glassfish Reference implementation of the Servlet/JSP API
 	specifications.
diff --git a/dev-java/glassfish-transaction-api/metadata.xml b/dev-java/glassfish-transaction-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/glassfish-transaction-api/metadata.xml
+++ b/dev-java/glassfish-transaction-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glassfish-xmlrpc-api/metadata.xml b/dev-java/glassfish-xmlrpc-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/glassfish-xmlrpc-api/metadata.xml
+++ b/dev-java/glassfish-xmlrpc-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/glazedlists/metadata.xml
+++ b/dev-java/glazedlists/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/gnu-classpath-inetlib/metadata.xml b/dev-java/gnu-classpath-inetlib/metadata.xml
index b4e799858ee6..874452d3942c 100644
--- a/dev-java/gnu-classpath-inetlib/metadata.xml
+++ b/dev-java/gnu-classpath-inetlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 GNU Classpath inetlib is an extension library to provide extra network
diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
index c3e3a6886b16..8311e2f92f09 100644
--- a/dev-java/gnu-classpath/metadata.xml
+++ b/dev-java/gnu-classpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="alsa">Build with ALSA javax.sound.midi provider</flag>
 		<flag name="dssi">Build with DSSI javax.sound.midi provider</flag>
diff --git a/dev-java/gnu-crypto/metadata.xml b/dev-java/gnu-crypto/metadata.xml
index 4d78ca2eb771..29acdac8f0c7 100644
--- a/dev-java/gnu-crypto/metadata.xml
+++ b/dev-java/gnu-crypto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 GNU Crypto, part of the GNU project, released under the aegis of GNU,
diff --git a/dev-java/gnu-hylafax/metadata.xml b/dev-java/gnu-hylafax/metadata.xml
index 00c3849387b1..f86c2acc0854 100644
--- a/dev-java/gnu-hylafax/metadata.xml
+++ b/dev-java/gnu-hylafax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnu-hylafax</remote-id>
 	</upstream>
diff --git a/dev-java/gnu-jaf/metadata.xml b/dev-java/gnu-jaf/metadata.xml
index 003d6fb8d011..08258b710f6e 100644
--- a/dev-java/gnu-jaf/metadata.xml
+++ b/dev-java/gnu-jaf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 GNU JAF is a framework for declaring what beans operate on what MIME
diff --git a/dev-java/gnu-javamail/metadata.xml b/dev-java/gnu-javamail/metadata.xml
index 5a19a2b896f4..f49b83c9d25b 100644
--- a/dev-java/gnu-javamail/metadata.xml
+++ b/dev-java/gnu-javamail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 GNU JavaMail is a free implementation of the JavaMail API specification,
diff --git a/dev-java/gnu-regexp/metadata.xml b/dev-java/gnu-regexp/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/gnu-regexp/metadata.xml
+++ b/dev-java/gnu-regexp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml
index 8d6b20b7ccdb..b3ef6b73cd03 100644
--- a/dev-java/groovy/metadata.xml
+++ b/dev-java/groovy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">apache/incubator-groovy</remote-id>
   </upstream>
diff --git a/dev-java/gson/metadata.xml b/dev-java/gson/metadata.xml
index f384ea9a98d2..c2ed4326539b 100644
--- a/dev-java/gson/metadata.xml
+++ b/dev-java/gson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
 	<upstream>
 		<remote-id type="github">google/gson</remote-id>
diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
index 706a5f4b27fe..84449da4a880 100644
--- a/dev-java/guava/metadata.xml
+++ b/dev-java/guava/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">The Guava project contains several of Google's core libraries that we rely on in our Java-based projects: collections, caching, primitives support, concurrency libraries, common annotations, string processing, I/O, and so forth.</longdescription>
 	<upstream>
 		<remote-id type="github">google/guava</remote-id>
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
index b8ec531e902a..55ffd9504f02 100644
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">google-guice</remote-id>
 		<remote-id type="github">google/guice</remote-id>
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index 1676f06714ee..1fd1fecc7a22 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
 		<remote-id type="github">hamcrest/</remote-id>
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 1676f06714ee..1fd1fecc7a22 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
 		<remote-id type="github">hamcrest/</remote-id>
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
index fe6095912db3..290123e3bab7 100644
--- a/dev-java/hamcrest-integration/metadata.xml
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index 1676f06714ee..1fd1fecc7a22 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
 		<remote-id type="github">hamcrest/</remote-id>
diff --git a/dev-java/hawtjni-runtime/metadata.xml b/dev-java/hawtjni-runtime/metadata.xml
index 4d45ef179a0f..0313937daeb5 100644
--- a/dev-java/hawtjni-runtime/metadata.xml
+++ b/dev-java/hawtjni-runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fusesource/hawtjni</remote-id>
   </upstream>
diff --git a/dev-java/headius-options/metadata.xml b/dev-java/headius-options/metadata.xml
index 8ca4e73e458b..122a0e69fb47 100644
--- a/dev-java/headius-options/metadata.xml
+++ b/dev-java/headius-options/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">headius/options</remote-id>
   </upstream>
diff --git a/dev-java/helpgui/metadata.xml b/dev-java/helpgui/metadata.xml
index 325982e4f9ee..65385e1391db 100644
--- a/dev-java/helpgui/metadata.xml
+++ b/dev-java/helpgui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">helpgui</remote-id>
 	</upstream>
diff --git a/dev-java/hessian/metadata.xml b/dev-java/hessian/metadata.xml
index 656536970396..4517feb39031 100644
--- a/dev-java/hessian/metadata.xml
+++ b/dev-java/hessian/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 The Hessian binary web service protocol makes web services usable without
 requiring a large framework, and without learning yet another alphabet soup
diff --git a/dev-java/higlayout/metadata.xml b/dev-java/higlayout/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/higlayout/metadata.xml
+++ b/dev-java/higlayout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/hoteqn/metadata.xml b/dev-java/hoteqn/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/hoteqn/metadata.xml
+++ b/dev-java/hoteqn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/htmlcleaner/metadata.xml b/dev-java/htmlcleaner/metadata.xml
index c1a63678b5f1..3be4cbbdad3d 100644
--- a/dev-java/htmlcleaner/metadata.xml
+++ b/dev-java/htmlcleaner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>HtmlCleaner is an open source HTML parser written in Java. HTML found on the Web is usually dirty, ill-formed and unsuitable for further processing. For any serious consumption of such documents, it is necessary to first clean up the mess and bring some order to the tags, attributes and ordinary text. For any given HTML document, HtmlCleaner reorders individual elements and produces well-formed XML. By default, it follows similar rules that the most of web browsers use in order to create the Document Object Model. However, you can provide custom tag and rule sets for tag filtering and balancing.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">htmlcleaner</remote-id>
diff --git a/dev-java/htmlparser-org/metadata.xml b/dev-java/htmlparser-org/metadata.xml
index b4339a64621b..d4dfa673157c 100644
--- a/dev-java/htmlparser-org/metadata.xml
+++ b/dev-java/htmlparser-org/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">htmlparser</remote-id>
 	</upstream>
diff --git a/dev-java/htmlparser/metadata.xml b/dev-java/htmlparser/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/htmlparser/metadata.xml
+++ b/dev-java/htmlparser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/httpcomponents-client/metadata.xml b/dev-java/httpcomponents-client/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/httpcomponents-client/metadata.xml
+++ b/dev-java/httpcomponents-client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/httpcomponents-core/metadata.xml b/dev-java/httpcomponents-core/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/httpcomponents-core/metadata.xml
+++ b/dev-java/httpcomponents-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ibm-jdk-bin/metadata.xml b/dev-java/ibm-jdk-bin/metadata.xml
index 6844eea2bce0..365f455da59a 100644
--- a/dev-java/ibm-jdk-bin/metadata.xml
+++ b/dev-java/ibm-jdk-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>IBM SDK Development kit.</longdescription>
   <use>
     <flag name="javacomm">Enable Java Communications API support</flag>
diff --git a/dev-java/ibm-jre-bin/metadata.xml b/dev-java/ibm-jre-bin/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/ibm-jre-bin/metadata.xml
+++ b/dev-java/ibm-jre-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ical4j/metadata.xml b/dev-java/ical4j/metadata.xml
index fb19e8790932..5a63d04e8ecb 100644
--- a/dev-java/ical4j/metadata.xml
+++ b/dev-java/ical4j/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		iCal4j is a Java library used to read and write iCalendar data streams
 		as defined in RFC2445. The iCalendar standard provides a common data
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index c1fbf8dce06d..af6e067d27d9 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+  </maintainer>
 <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
   <flag name="nss">Enable NSS security provider support</flag>
diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml
index c254d5eecdf9..7c1100b2fa71 100644
--- a/dev-java/icedtea-sound/metadata.xml
+++ b/dev-java/icedtea-sound/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>gnu_andrew@member.fsf.org</email>
     <name>Andrew John Hughes</name>
     <description>Proxy Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>
     Plugins for javax.sound, including the PulseAudio support formerly bundled with IcedTea.
   </longdescription>
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index a415350271b8..f4e095bb73d6 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>
     FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
   </longdescription>
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 83663b2e76bd..1bdb94921cd6 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>gnu_andrew@member.fsf.org</email>
   <name>Andrew John Hughes</name>
@@ -13,6 +11,14 @@
   <name>James Le Cuirot</name>
   <description>Committer</description>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
 <use>
   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
diff --git a/dev-java/icu4j/metadata.xml b/dev-java/icu4j/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/icu4j/metadata.xml
+++ b/dev-java/icu4j/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ini4j/metadata.xml b/dev-java/ini4j/metadata.xml
index 03761a053e66..1b3e9d362057 100644
--- a/dev-java/ini4j/metadata.xml
+++ b/dev-java/ini4j/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">ini4j</remote-id>
   </upstream>
diff --git a/dev-java/invokebinder/metadata.xml b/dev-java/invokebinder/metadata.xml
index c7bd4c31246b..fbdfa92c57c0 100644
--- a/dev-java/invokebinder/metadata.xml
+++ b/dev-java/invokebinder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">headius/invokebinder</remote-id>
   </upstream>
diff --git a/dev-java/iso-relax/metadata.xml b/dev-java/iso-relax/metadata.xml
index 5445e91c9e59..348c6058f472 100644
--- a/dev-java/iso-relax/metadata.xml
+++ b/dev-java/iso-relax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">iso-relax</remote-id>
 	</upstream>
diff --git a/dev-java/istack-commons-buildtools/metadata.xml b/dev-java/istack-commons-buildtools/metadata.xml
index 669672a6dee3..780ce920e2a1 100644
--- a/dev-java/istack-commons-buildtools/metadata.xml
+++ b/dev-java/istack-commons-buildtools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-<maintainer>
+  <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/istack-commons-runtime/metadata.xml b/dev-java/istack-commons-runtime/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/istack-commons-runtime/metadata.xml
+++ b/dev-java/istack-commons-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/istack-commons-soimp/metadata.xml b/dev-java/istack-commons-soimp/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/istack-commons-soimp/metadata.xml
+++ b/dev-java/istack-commons-soimp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/istack-commons-tools/metadata.xml b/dev-java/istack-commons-tools/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/istack-commons-tools/metadata.xml
+++ b/dev-java/istack-commons-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
index 73d4832148ee..b6e8f75f22da 100644
--- a/dev-java/itext/metadata.xml
+++ b/dev-java/itext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		iText is a library that allows you to generate PDF files on
 		the fly. The iText classes are very useful for people who need
diff --git a/dev-java/j2ssh/metadata.xml b/dev-java/j2ssh/metadata.xml
index 3917c9cd3fa5..9db70fd8dfb2 100644
--- a/dev-java/j2ssh/metadata.xml
+++ b/dev-java/j2ssh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		SSHTools is a suite of Java SSH applications providing a Java SSH API,
 		SSH Terminal, SSH secured VNC client, SFTP client and SSH Daemon.
diff --git a/dev-java/jackrabbit-webdav/metadata.xml b/dev-java/jackrabbit-webdav/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jackrabbit-webdav/metadata.xml
+++ b/dev-java/jackrabbit-webdav/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jackson-annotations/metadata.xml b/dev-java/jackson-annotations/metadata.xml
index 9dda24479931..b14e663ae0f2 100644
--- a/dev-java/jackson-annotations/metadata.xml
+++ b/dev-java/jackson-annotations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">FasterXML/jackson-annotations</remote-id>
   </upstream>
diff --git a/dev-java/jackson-databind/metadata.xml b/dev-java/jackson-databind/metadata.xml
index b39646c241a9..0132df8dccc6 100644
--- a/dev-java/jackson-databind/metadata.xml
+++ b/dev-java/jackson-databind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">FasterXML/jackson-databind</remote-id>
   </upstream>
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
index bb7d6955d4c0..dcba55d81ea8 100644
--- a/dev-java/jackson-dataformat-xml/metadata.xml
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	  This projects contains Jackson extension component for reading and writing XML encoded data.
 
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
index b14634f2bf70..4a1b2a6de892 100644
--- a/dev-java/jackson-dataformat-yaml/metadata.xml
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>This project contains Jackson extension component for reading and writing YAML encoded data. SnakeYAML library is used for low-level YAML parsing. This project adds necessary abstractions on top to make things work with other Jackson functionality.</longdescription>
   <upstream>
     <remote-id type="github">FasterXML/jackson-dataformat-yaml</remote-id>
diff --git a/dev-java/jackson-module-jaxb-annotations/metadata.xml b/dev-java/jackson-module-jaxb-annotations/metadata.xml
index 47a80b4c0e9d..e4e9dbd05846 100644
--- a/dev-java/jackson-module-jaxb-annotations/metadata.xml
+++ b/dev-java/jackson-module-jaxb-annotations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>This Jackson extension module provides support for using JAXB (javax.xml.bind) annotations as an alternative to native Jackson annotations. It is most often used to make it easier to reuse existing data beans that used with JAXB framework to read and write XML.</longdescription>
   <upstream>
     <remote-id type="github">FasterXML/jackson-module-jaxb-annotations</remote-id>
diff --git a/dev-java/jackson/metadata.xml b/dev-java/jackson/metadata.xml
index 32cb17ad1925..5658f9a1155f 100644
--- a/dev-java/jackson/metadata.xml
+++ b/dev-java/jackson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">FasterXML/jackson-core</remote-id>
   </upstream>
diff --git a/dev-java/jacl/metadata.xml b/dev-java/jacl/metadata.xml
index 6b283ec84313..1ca21b220b1e 100644
--- a/dev-java/jacl/metadata.xml
+++ b/dev-java/jacl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 The Tcl/Java project's goal is to make integrating the Java platform and the
 Tcl scripting language as easy as possible. The project actually consists of
diff --git a/dev-java/jacoco/metadata.xml b/dev-java/jacoco/metadata.xml
index 55f62111c613..0bf891d23c89 100644
--- a/dev-java/jacoco/metadata.xml
+++ b/dev-java/jacoco/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jad-bin/metadata.xml b/dev-java/jad-bin/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jad-bin/metadata.xml
+++ b/dev-java/jad-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jade/metadata.xml b/dev-java/jade/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jade/metadata.xml
+++ b/dev-java/jade/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaffl/metadata.xml b/dev-java/jaffl/metadata.xml
index e5bc2e7bb499..e98909c5ebbc 100644
--- a/dev-java/jaffl/metadata.xml
+++ b/dev-java/jaffl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		A native function invocation interface that can have multiple different
 		low level implementations (e.g. JNA, JFFI or Maxine)
diff --git a/dev-java/jakarta-oro/metadata.xml b/dev-java/jakarta-oro/metadata.xml
index 3423fc466439..318a4fc4e7c0 100644
--- a/dev-java/jakarta-oro/metadata.xml
+++ b/dev-java/jakarta-oro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		A set of text-processing Java classes that provide Perl5 compatible
 		regular expressions, AWK-like regular expressions, glob expressions,
diff --git a/dev-java/jakarta-regexp/metadata.xml b/dev-java/jakarta-regexp/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jakarta-regexp/metadata.xml
+++ b/dev-java/jakarta-regexp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jakarta-slide-webdavclient/metadata.xml b/dev-java/jakarta-slide-webdavclient/metadata.xml
index 04727dbb34c2..07942179b0d8 100644
--- a/dev-java/jakarta-slide-webdavclient/metadata.xml
+++ b/dev-java/jakarta-slide-webdavclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Slide is a content repository which can serve as a basis for a
 		content management system / framework and other purposes"
diff --git a/dev-java/jal/metadata.xml b/dev-java/jal/metadata.xml
index 5e0ade05138e..e9eeae6c8ffa 100644
--- a/dev-java/jal/metadata.xml
+++ b/dev-java/jal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 Jal is a partial port of the STL by the C++ Standard Template Library, done by
diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jama/metadata.xml
+++ b/dev-java/jama/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jamon/metadata.xml b/dev-java/jamon/metadata.xml
index 7ab7fd707165..611a8105ef2b 100644
--- a/dev-java/jamon/metadata.xml
+++ b/dev-java/jamon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	A free, simple, high performance, thread safe, Java API that allows
 	developers to easily monitor production applications
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
index a98889672a9e..6915daa68c48 100644
--- a/dev-java/jamvm/metadata.xml
+++ b/dev-java/jamvm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jamvm</remote-id>
 	</upstream>
diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/janino/metadata.xml
+++ b/dev-java/janino/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jansi-native/metadata.xml b/dev-java/jansi-native/metadata.xml
index 5321c600db61..fe13a63aa1b2 100644
--- a/dev-java/jansi-native/metadata.xml
+++ b/dev-java/jansi-native/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fusesource/jansi-native</remote-id>
   </upstream>
diff --git a/dev-java/jansi/metadata.xml b/dev-java/jansi/metadata.xml
index efba57d4059e..167cbf94da18 100644
--- a/dev-java/jansi/metadata.xml
+++ b/dev-java/jansi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Jansi is a small java library that allows you to use ANSI escape sequences to format your console output which works even on windows.
 	</longdescription>
diff --git a/dev-java/japitools/metadata.xml b/dev-java/japitools/metadata.xml
index 8759b6fb051b..359ea3a6c385 100644
--- a/dev-java/japitools/metadata.xml
+++ b/dev-java/japitools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 Japitools consists of two simple tools designed to test for compatibility
diff --git a/dev-java/jarbundler/metadata.xml b/dev-java/jarbundler/metadata.xml
index 8a38e058a825..e1c2d3757ade 100644
--- a/dev-java/jarbundler/metadata.xml
+++ b/dev-java/jarbundler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jarbundler</remote-id>
 	</upstream>
diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml
index e5bb5f676564..703eec2fdfe8 100644
--- a/dev-java/jargs/metadata.xml
+++ b/dev-java/jargs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+	  <email>java@gentoo.org</email>
+	  <name>Java</name>
+  </maintainer>
   <upstream>
 	  <remote-id type="github">purcell/jargs</remote-id>
   </upstream>
diff --git a/dev-java/jarjar/metadata.xml b/dev-java/jarjar/metadata.xml
index 87a5c9534ae4..08c22a32cfe8 100644
--- a/dev-java/jarjar/metadata.xml
+++ b/dev-java/jarjar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jarjar</remote-id>
 	</upstream>
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
index 0715bc757941..3e512c84d327 100644
--- a/dev-java/java-apicheck/metadata.xml
+++ b/dev-java/java-apicheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">gentoo/java-apicheck</remote-id>
 	</upstream>
diff --git a/dev-java/java-config-wrapper/metadata.xml b/dev-java/java-config-wrapper/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/java-config-wrapper/metadata.xml
+++ b/dev-java/java-config-wrapper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml
index 7e8e0030c863..53adfbb03972 100644
--- a/dev-java/java-config/metadata.xml
+++ b/dev-java/java-config/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		java-config is used to configure the Java subsystem on your Gentoo
 		installation. In particular, it can be used to configure system-wide and
diff --git a/dev-java/java-dep-check/metadata.xml b/dev-java/java-dep-check/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/java-dep-check/metadata.xml
+++ b/dev-java/java-dep-check/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/java-getopt/metadata.xml b/dev-java/java-getopt/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/java-getopt/metadata.xml
+++ b/dev-java/java-getopt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/java-gnome/metadata.xml b/dev-java/java-gnome/metadata.xml
index cf264ec1790c..37ef77c723ad 100644
--- a/dev-java/java-gnome/metadata.xml
+++ b/dev-java/java-gnome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		An elegant set of language bindings to allow you to write
 		native GNOME/GTK applications in Java. Works with both
diff --git a/dev-java/java-sdk-docs/metadata.xml b/dev-java/java-sdk-docs/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/java-sdk-docs/metadata.xml
+++ b/dev-java/java-sdk-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml
index b0f898a4620b..b05331f69bb5 100644
--- a/dev-java/java-service-wrapper/metadata.xml
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Java Service Wrapper is an application which has evolved out of a desire 
 		to solve a number of problems common to many Java applications:
diff --git a/dev-java/javacc/metadata.xml b/dev-java/javacc/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/javacc/metadata.xml
+++ b/dev-java/javacc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/javacsv/metadata.xml b/dev-java/javacsv/metadata.xml
index 765da51c0271..5554f7aba21f 100644
--- a/dev-java/javacsv/metadata.xml
+++ b/dev-java/javacsv/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">javacsv</remote-id>
 	</upstream>
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/javacup/metadata.xml
+++ b/dev-java/javacup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/javahelp/metadata.xml b/dev-java/javahelp/metadata.xml
index fc5ba13dc08f..cd2ec9048c53 100644
--- a/dev-java/javahelp/metadata.xml
+++ b/dev-java/javahelp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		The JavaHelp system is an online help system that developers can
 		use to add online help to their Java platform applications. The
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index 84b2638e6231..4beab5c6e17b 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jboss</remote-id>
 		<remote-id type="github">jboss-javassist/javassist</remote-id>
diff --git a/dev-java/javatoolkit/metadata.xml b/dev-java/javatoolkit/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/javatoolkit/metadata.xml
+++ b/dev-java/javatoolkit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/javax-inject/metadata.xml b/dev-java/javax-inject/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/javax-inject/metadata.xml
+++ b/dev-java/javax-inject/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/javolution/metadata.xml b/dev-java/javolution/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/javolution/metadata.xml
+++ b/dev-java/javolution/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jax-ws-api/metadata.xml b/dev-java/jax-ws-api/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jax-ws-api/metadata.xml
+++ b/dev-java/jax-ws-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jax-ws-tools/metadata.xml b/dev-java/jax-ws-tools/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jax-ws-tools/metadata.xml
+++ b/dev-java/jax-ws-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jax-ws/metadata.xml b/dev-java/jax-ws/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jax-ws/metadata.xml
+++ b/dev-java/jax-ws/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxb-tools/metadata.xml b/dev-java/jaxb-tools/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jaxb-tools/metadata.xml
+++ b/dev-java/jaxb-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxb/metadata.xml b/dev-java/jaxb/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jaxb/metadata.xml
+++ b/dev-java/jaxb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxme/metadata.xml b/dev-java/jaxme/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jaxme/metadata.xml
+++ b/dev-java/jaxme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxp/metadata.xml b/dev-java/jaxp/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jaxp/metadata.xml
+++ b/dev-java/jaxp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxr/metadata.xml b/dev-java/jaxr/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jaxr/metadata.xml
+++ b/dev-java/jaxr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jazzy/metadata.xml b/dev-java/jazzy/metadata.xml
index 51b51082a589..535d804ff094 100644
--- a/dev-java/jazzy/metadata.xml
+++ b/dev-java/jazzy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jazzy</remote-id>
 	</upstream>
diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml
index 5e22ec6a4346..fab654d655f9 100644
--- a/dev-java/jboss-logging/metadata.xml
+++ b/dev-java/jboss-logging/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jboss-logging/jboss-logging</remote-id>
 	</upstream>
diff --git a/dev-java/jboss-logmanager/metadata.xml b/dev-java/jboss-logmanager/metadata.xml
index df30504ba03f..bea198a16624 100644
--- a/dev-java/jboss-logmanager/metadata.xml
+++ b/dev-java/jboss-logmanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jboss-logging/jboss-logmanager</remote-id>
 	</upstream>
diff --git a/dev-java/jboss-marshalling/metadata.xml b/dev-java/jboss-marshalling/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jboss-marshalling/metadata.xml
+++ b/dev-java/jboss-marshalling/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jboss-modules/metadata.xml b/dev-java/jboss-modules/metadata.xml
index 176bc36cba95..bf906a262b3b 100644
--- a/dev-java/jboss-modules/metadata.xml
+++ b/dev-java/jboss-modules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jboss-modules/jboss-modules</remote-id>
 	</upstream>
diff --git a/dev-java/jcalendar/metadata.xml b/dev-java/jcalendar/metadata.xml
index 9c205cdd6af5..7696e0d22302 100644
--- a/dev-java/jcalendar/metadata.xml
+++ b/dev-java/jcalendar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
index 636867dbfc6b..652eee1110cb 100644
--- a/dev-java/jchardet/metadata.xml
+++ b/dev-java/jchardet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jchardet</remote-id>
 	</upstream>
diff --git a/dev-java/jcharts/metadata.xml b/dev-java/jcharts/metadata.xml
index 808861f03622..1c8c881f4af3 100644
--- a/dev-java/jcharts/metadata.xml
+++ b/dev-java/jcharts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		jCharts is a 100% Java based charting utility that outputs a
 		variety of charts. This package has been designed from the
diff --git a/dev-java/jcifs/metadata.xml b/dev-java/jcifs/metadata.xml
index be2aa8daeda8..7e07f23119e7 100644
--- a/dev-java/jcifs/metadata.xml
+++ b/dev-java/jcifs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/jcip-annotations/metadata.xml b/dev-java/jcip-annotations/metadata.xml
index f71022b22834..959d7b666ec8 100644
--- a/dev-java/jcip-annotations/metadata.xml
+++ b/dev-java/jcip-annotations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>The JCIP Annotations are really useful, however they are released under the Creative Commons Attribution License, which is not recommended for licensing software and may therefore cause issues for some people.</longdescription>
   <upstream>
     <remote-id type="github">stephenc/jcip-annotations</remote-id>
diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml
index 53357752d126..4d03826c6a00 100644
--- a/dev-java/jclasslib/metadata.xml
+++ b/dev-java/jclasslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jclasslib</remote-id>
 	</upstream>
diff --git a/dev-java/jcmdline/metadata.xml b/dev-java/jcmdline/metadata.xml
index df9de2927648..6443ac9ec82c 100644
--- a/dev-java/jcmdline/metadata.xml
+++ b/dev-java/jcmdline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		This package facilitates parsing/handling of command line parameters
 		with an aim at adding consistency across various applications.
diff --git a/dev-java/jcodings/metadata.xml b/dev-java/jcodings/metadata.xml
index 6f87dc795546..ca3def1ad77f 100644
--- a/dev-java/jcodings/metadata.xml
+++ b/dev-java/jcodings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jruby/jcodings</remote-id>
   </upstream>
diff --git a/dev-java/jcommander/metadata.xml b/dev-java/jcommander/metadata.xml
index 22361399799c..392ba759c8c2 100644
--- a/dev-java/jcommander/metadata.xml
+++ b/dev-java/jcommander/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cbeust/jcommander</remote-id>
   </upstream>
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jcommon/metadata.xml
index b23178874827..6a7bfd60a2dc 100644
--- a/dev-java/jcommon/metadata.xml
+++ b/dev-java/jcommon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jfreechart</remote-id>
 	</upstream>
diff --git a/dev-java/jcs/metadata.xml b/dev-java/jcs/metadata.xml
index 106955320fec..9cc307e07f59 100644
--- a/dev-java/jcs/metadata.xml
+++ b/dev-java/jcs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="admin">Enable JCS Admin servlets</flag>
   </use>
diff --git a/dev-java/jdbc-informix/metadata.xml b/dev-java/jdbc-informix/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jdbc-informix/metadata.xml
+++ b/dev-java/jdbc-informix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jdbc-jaybird/metadata.xml b/dev-java/jdbc-jaybird/metadata.xml
index 4ba4af7fc1c1..e4b5daeb3fed 100644
--- a/dev-java/jdbc-jaybird/metadata.xml
+++ b/dev-java/jdbc-jaybird/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Jaybird is a JCA/JDBC driver suite for the Firebird database server.
 	This package includes both a type 2 and 4 JDBC driver.
diff --git a/dev-java/jdbc-mssqlserver/metadata.xml b/dev-java/jdbc-mssqlserver/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jdbc-mssqlserver/metadata.xml
+++ b/dev-java/jdbc-mssqlserver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
index 958717a296e1..0c75ea485211 100644
--- a/dev-java/jdbc-mysql/metadata.xml
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="c3p0">Enable c3p0 support</flag>
     <flag name="log4j">Enable log4 support</flag>
diff --git a/dev-java/jdbc-oracle-bin/metadata.xml b/dev-java/jdbc-oracle-bin/metadata.xml
index 48cc1ddff0e9..df29f9935565 100644
--- a/dev-java/jdbc-oracle-bin/metadata.xml
+++ b/dev-java/jdbc-oracle-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="dms">Enable support for the Oracle Dynamic Monitoring Service</flag>
     <flag name="ons">Enable support for the Oracle Notification Services (ONS) deamon</flag>
diff --git a/dev-java/jdbc-postgresql/metadata.xml b/dev-java/jdbc-postgresql/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jdbc-postgresql/metadata.xml
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jdbc2-stdext/metadata.xml b/dev-java/jdbc2-stdext/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jdbc2-stdext/metadata.xml
+++ b/dev-java/jdbc2-stdext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jdbm/metadata.xml b/dev-java/jdbm/metadata.xml
index 47a0ce099855..43050879cba0 100644
--- a/dev-java/jdbm/metadata.xml
+++ b/dev-java/jdbm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jdbm</remote-id>
 	</upstream>
diff --git a/dev-java/jdepend/metadata.xml b/dev-java/jdepend/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jdepend/metadata.xml
+++ b/dev-java/jdepend/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jdom-jaxen/metadata.xml b/dev-java/jdom-jaxen/metadata.xml
index eff3654ac325..30005aaf6097 100644
--- a/dev-java/jdom-jaxen/metadata.xml
+++ b/dev-java/jdom-jaxen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 Jaxen binding for jdom.  Split from jdom to resolve circular dependencies.
 </longdescription>
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
index e7bff1427ecd..ed6fa1521bf6 100644
--- a/dev-java/jdom/metadata.xml
+++ b/dev-java/jdom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hunterhacker/jdom</remote-id>
 	</upstream>
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
index 414086548e0d..2005603ae869 100644
--- a/dev-java/jdynamite/metadata.xml
+++ b/dev-java/jdynamite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jdynamite</remote-id>
 	</upstream>
diff --git a/dev-java/jebl/metadata.xml b/dev-java/jebl/metadata.xml
index 5399c3e7fd8f..d03234f9c917 100644
--- a/dev-java/jebl/metadata.xml
+++ b/dev-java/jebl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jebl</remote-id>
 	</upstream>
diff --git a/dev-java/jempbox/metadata.xml b/dev-java/jempbox/metadata.xml
index 2e638b0fd25a..559ca5eb167d 100644
--- a/dev-java/jempbox/metadata.xml
+++ b/dev-java/jempbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jempbox</remote-id>
 	</upstream>
diff --git a/dev-java/jettison/metadata.xml b/dev-java/jettison/metadata.xml
index ba1dabe1995d..f85d1c8ecb4d 100644
--- a/dev-java/jettison/metadata.xml
+++ b/dev-java/jettison/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mike@weisso.com</email>
 		<name>Mike Weissman</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Jettison is a collection of Java APIs (like STaX and DOM) which read and
 		write JSON. This allows nearly transparent enablement of JSON based web
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
index 51e8d055387b..666a1051f0e8 100644
--- a/dev-java/jexcelapi/metadata.xml
+++ b/dev-java/jexcelapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 
  Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
diff --git a/dev-java/jffi/metadata.xml b/dev-java/jffi/metadata.xml
index 16e36e4cef41..e59099433fa2 100644
--- a/dev-java/jffi/metadata.xml
+++ b/dev-java/jffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnr/jffi</remote-id>
   </upstream>
diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
index 7b350e8431cd..ff6f0f6010f6 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 JFlex is a lexical analyzer generator (also known as scanner generator) for
 Java(tm).
diff --git a/dev-java/jformatstring/metadata.xml b/dev-java/jformatstring/metadata.xml
index be188d74bc12..39f9fefae5bb 100644
--- a/dev-java/jformatstring/metadata.xml
+++ b/dev-java/jformatstring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>This code is designed to allow for compile time checking of Java format strings. It can check that the format string is valid, that the proper number of arguments are supplied and that they are of the correct type.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">findbugs</remote-id>
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
index c70c3f8a99f0..70123e64b864 100644
--- a/dev-java/jfreechart/metadata.xml
+++ b/dev-java/jfreechart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="servlet">Build a servlet using the servlet API.</flag>
 	</use>
diff --git a/dev-java/jfreesvg/metadata.xml b/dev-java/jfreesvg/metadata.xml
index 3253c0e8b45d..51d301603e1e 100644
--- a/dev-java/jfreesvg/metadata.xml
+++ b/dev-java/jfreesvg/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="debug">
 			Enable debugging during compilation.
diff --git a/dev-java/jgoodies-animation/metadata.xml b/dev-java/jgoodies-animation/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jgoodies-animation/metadata.xml
+++ b/dev-java/jgoodies-animation/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jgoodies-binding/metadata.xml b/dev-java/jgoodies-binding/metadata.xml
index c19e65bb0058..95d6fa04dcb3 100644
--- a/dev-java/jgoodies-binding/metadata.xml
+++ b/dev-java/jgoodies-binding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		A library to bind object properties to UI components.
 	</longdescription>
diff --git a/dev-java/jgoodies-common/metadata.xml b/dev-java/jgoodies-common/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jgoodies-common/metadata.xml
+++ b/dev-java/jgoodies-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jgoodies-forms/metadata.xml
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jgoodies-looks/metadata.xml b/dev-java/jgoodies-looks/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jgoodies-looks/metadata.xml
+++ b/dev-java/jgoodies-looks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jgraph/metadata.xml
index 675eebf3a12f..5c676dd14649 100644
--- a/dev-java/jgraph/metadata.xml
+++ b/dev-java/jgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jgraph</remote-id>
 	</upstream>
diff --git a/dev-java/jgrapht/metadata.xml b/dev-java/jgrapht/metadata.xml
index b6ac288e0445..056d721339ba 100644
--- a/dev-java/jgrapht/metadata.xml
+++ b/dev-java/jgrapht/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jgrapht</remote-id>
 	</upstream>
diff --git a/dev-java/jgroups/metadata.xml b/dev-java/jgroups/metadata.xml
index 135a729b92b4..04013553e994 100644
--- a/dev-java/jgroups/metadata.xml
+++ b/dev-java/jgroups/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">javagroups</remote-id>
 	</upstream>
diff --git a/dev-java/jibx-tools/metadata.xml b/dev-java/jibx-tools/metadata.xml
index bc6fbe14e0bb..6c5c1adbae95 100644
--- a/dev-java/jibx-tools/metadata.xml
+++ b/dev-java/jibx-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jibx</remote-id>
 	</upstream>
diff --git a/dev-java/jibx/metadata.xml b/dev-java/jibx/metadata.xml
index bc6fbe14e0bb..6c5c1adbae95 100644
--- a/dev-java/jibx/metadata.xml
+++ b/dev-java/jibx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jibx</remote-id>
 	</upstream>
diff --git a/dev-java/jicmp/metadata.xml b/dev-java/jicmp/metadata.xml
index 1827a10ec19a..cced447d101d 100644
--- a/dev-java/jicmp/metadata.xml
+++ b/dev-java/jicmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	</longdescription>
 	<upstream>
diff --git a/dev-java/jid3/metadata.xml b/dev-java/jid3/metadata.xml
index 5c85ecc2bd69..1218414088af 100644
--- a/dev-java/jid3/metadata.xml
+++ b/dev-java/jid3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		JID3 is a class library, written in Java and licensed under the LGPL,
 		which provides the required functionality for editing ID3 tags commonly
diff --git a/dev-java/jikes/metadata.xml b/dev-java/jikes/metadata.xml
index 42250a2eee59..dbbde68bc4a8 100644
--- a/dev-java/jikes/metadata.xml
+++ b/dev-java/jikes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jikes</remote-id>
 	</upstream>
diff --git a/dev-java/jinklevel/metadata.xml b/dev-java/jinklevel/metadata.xml
index 6a298fd15827..6eea05a26e4c 100644
--- a/dev-java/jinklevel/metadata.xml
+++ b/dev-java/jinklevel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/jinput/metadata.xml b/dev-java/jinput/metadata.xml
index e00447ceff66..247d53c7a812 100644
--- a/dev-java/jinput/metadata.xml
+++ b/dev-java/jinput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>The JInput Project hosts an implementation of an API for game controller discovery and polled input. It is part of a suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems with intention of making the development of high performance games in Java a reality.</longdescription>
   <upstream>
     <remote-id type="github">jinput/jinput</remote-id>
diff --git a/dev-java/jisp/metadata.xml b/dev-java/jisp/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jisp/metadata.xml
+++ b/dev-java/jisp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jlayer/metadata.xml b/dev-java/jlayer/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jlayer/metadata.xml
+++ b/dev-java/jlayer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jlex/metadata.xml b/dev-java/jlex/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jlex/metadata.xml
+++ b/dev-java/jlex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jlfgr/metadata.xml b/dev-java/jlfgr/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jlfgr/metadata.xml
+++ b/dev-java/jlfgr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
index 459701f25eb3..8746f9f3b489 100644
--- a/dev-java/jlibeps/metadata.xml
+++ b/dev-java/jlibeps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jlibeps</remote-id>
 	</upstream>
diff --git a/dev-java/jline/metadata.xml b/dev-java/jline/metadata.xml
index 293f4fc0e205..248bd322add0 100644
--- a/dev-java/jline/metadata.xml
+++ b/dev-java/jline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jline/jline2</remote-id>
     <remote-id type="sourceforge">jline</remote-id>
diff --git a/dev-java/jmdns/metadata.xml b/dev-java/jmdns/metadata.xml
index d35fc3014bda..aac06bfe51a5 100644
--- a/dev-java/jmdns/metadata.xml
+++ b/dev-java/jmdns/metadata.xml
@@ -6,7 +6,10 @@
 		It supports service discovery and service registration.
 		It is fully interoperable with Apple's Rendezvous.
 	</longdescription>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jmdns</remote-id>
 	</upstream>
diff --git a/dev-java/jmf-bin/metadata.xml b/dev-java/jmf-bin/metadata.xml
index c91146ece995..36d1dd4c4bc7 100644
--- a/dev-java/jmf-bin/metadata.xml
+++ b/dev-java/jmf-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Java Media Framework API (JMF) enables audio, video and other
 		time-based media to be added to Java applications and applets.
diff --git a/dev-java/jmi-interface/metadata.xml b/dev-java/jmi-interface/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jmi-interface/metadata.xml
+++ b/dev-java/jmi-interface/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jmock/metadata.xml b/dev-java/jmock/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jmock/metadata.xml
+++ b/dev-java/jmock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index ee633d5a6f4e..9a1036b71758 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="awt">Enables support for Java AWT</flag>
     <flag name="nio-buffers">Enables support for NIO buffers</flag>
diff --git a/dev-java/jnlp-api/metadata.xml b/dev-java/jnlp-api/metadata.xml
index 52eb200eefa7..7baad7ffd5cb 100644
--- a/dev-java/jnlp-api/metadata.xml
+++ b/dev-java/jnlp-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	JNLP API classes (javax/jnlp), repackaged from the icedtea-web fork of netx.
 	</longdescription>
diff --git a/dev-java/jnr-constants/metadata.xml b/dev-java/jnr-constants/metadata.xml
index ba2f491aacad..e215b0d93702 100644
--- a/dev-java/jnr-constants/metadata.xml
+++ b/dev-java/jnr-constants/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-java/jnr-enxio/metadata.xml b/dev-java/jnr-enxio/metadata.xml
index a491448173c8..8f79b86fffcd 100644
--- a/dev-java/jnr-enxio/metadata.xml
+++ b/dev-java/jnr-enxio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnr/jnr-enxio</remote-id>
   </upstream>
diff --git a/dev-java/jnr-ffi/metadata.xml b/dev-java/jnr-ffi/metadata.xml
index 17c4d243e37c..43b9d304a6bc 100644
--- a/dev-java/jnr-ffi/metadata.xml
+++ b/dev-java/jnr-ffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-java/jnr-netdb/metadata.xml b/dev-java/jnr-netdb/metadata.xml
index 9aec21dc0728..029a85fa7f5e 100644
--- a/dev-java/jnr-netdb/metadata.xml
+++ b/dev-java/jnr-netdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		jnr-netdb is a java interface to getservbyname(3), getservbyport(3).
 
diff --git a/dev-java/jnr-posix/metadata.xml b/dev-java/jnr-posix/metadata.xml
index e0a552f82ee5..1e96e588c53d 100644
--- a/dev-java/jnr-posix/metadata.xml
+++ b/dev-java/jnr-posix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnr/jnr-posix</remote-id>
   </upstream>
diff --git a/dev-java/jnr-unixsocket/metadata.xml b/dev-java/jnr-unixsocket/metadata.xml
index 73c0445e5459..1600f7e2d9a8 100644
--- a/dev-java/jnr-unixsocket/metadata.xml
+++ b/dev-java/jnr-unixsocket/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnr/jnr-unixsocket</remote-id>
   </upstream>
diff --git a/dev-java/jnr-x86asm/metadata.xml b/dev-java/jnr-x86asm/metadata.xml
index cb30f9995320..8df315f7c1fe 100644
--- a/dev-java/jnr-x86asm/metadata.xml
+++ b/dev-java/jnr-x86asm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnr/jnr-x86asm</remote-id>
   </upstream>
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index ef639372017b..95fc94a010e2 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">joda-convert</remote-id>
 	</upstream>
diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
index 10dc6005cb33..df2e5ca4c748 100644
--- a/dev-java/joda-time/metadata.xml
+++ b/dev-java/joda-time/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">JodaOrg/joda-time</remote-id>
     <remote-id type="sourceforge">joda-time</remote-id>
diff --git a/dev-java/joni/metadata.xml b/dev-java/joni/metadata.xml
index 0a200766983d..308b55858998 100644
--- a/dev-java/joni/metadata.xml
+++ b/dev-java/joni/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jruby/joni</remote-id>
   </upstream>
diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index 82362bdfd09b..0c29565ff03c 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pholser/jopt-simple</remote-id>
 	</upstream>
diff --git a/dev-java/jortho/metadata.xml b/dev-java/jortho/metadata.xml
index 2901eeea8413..18446ced7cb4 100644
--- a/dev-java/jortho/metadata.xml
+++ b/dev-java/jortho/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
   </longdescription>
 	<upstream>
diff --git a/dev-java/jreleaseinfo/metadata.xml b/dev-java/jreleaseinfo/metadata.xml
index 65839deefef8..35cc053f16ff 100644
--- a/dev-java/jreleaseinfo/metadata.xml
+++ b/dev-java/jreleaseinfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jreleaseinfo</remote-id>
 	</upstream>
diff --git a/dev-java/jrexx/metadata.xml b/dev-java/jrexx/metadata.xml
index 83e2fb6cc275..494c8b1aaaac 100644
--- a/dev-java/jrexx/metadata.xml
+++ b/dev-java/jrexx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jrexx</remote-id>
 	</upstream>
diff --git a/dev-java/jrobin/metadata.xml b/dev-java/jrobin/metadata.xml
index a99edeb6c598..3d2734b9ef62 100644
--- a/dev-java/jrobin/metadata.xml
+++ b/dev-java/jrobin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	JRobin is a 100% pure Java alternative to RRDTool, with about exactly
 	the same specifications. If you provide the same data to RRDTool and
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
index 3ca4f82f4e2d..2a189f19e3ec 100644
--- a/dev-java/jrrd/metadata.xml
+++ b/dev-java/jrrd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Java Interface to Tobias Oetiker's RRDtool
 	</longdescription>
diff --git a/dev-java/jruby/metadata.xml b/dev-java/jruby/metadata.xml
index 0b153778e653..1b0bbb179a60 100644
--- a/dev-java/jruby/metadata.xml
+++ b/dev-java/jruby/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+<maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
index f67c76a9769d..f8b234817227 100644
--- a/dev-java/jsap/metadata.xml
+++ b/dev-java/jsap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jsap</remote-id>
 	</upstream>
diff --git a/dev-java/jsch/metadata.xml b/dev-java/jsch/metadata.xml
index 50449828380b..f320db5cce0e 100644
--- a/dev-java/jsch/metadata.xml
+++ b/dev-java/jsch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jsch</remote-id>
 	</upstream>
diff --git a/dev-java/json-simple/metadata.xml b/dev-java/json-simple/metadata.xml
index 71c785e5bc52..eabd8fe35ab4 100644
--- a/dev-java/json-simple/metadata.xml
+++ b/dev-java/json-simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">Why the Simple Java toolkit (also named as JSON.simple) for JSON?
 	When I use JSON as the data exchange format between the AJAX client and JSP
 	for the first time, what worry me mostly is how to encode Java strings and
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index d9dd049b59c2..836ce46ca4be 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<longdescription lang="en">
 		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
 	</longdescription>
@@ -14,4 +13,8 @@
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsoup/metadata.xml b/dev-java/jsoup/metadata.xml
index 3aa5cfe290d6..50f35e1efb7e 100644
--- a/dev-java/jsoup/metadata.xml
+++ b/dev-java/jsoup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jhy/jsoup</remote-id>
 	</upstream>
diff --git a/dev-java/jspeex/metadata.xml b/dev-java/jspeex/metadata.xml
index 76fec185fc9b..b78363ae28ca 100644
--- a/dev-java/jspeex/metadata.xml
+++ b/dev-java/jspeex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jspeex</remote-id>
 	</upstream>
diff --git a/dev-java/jsr101/metadata.xml b/dev-java/jsr101/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr101/metadata.xml
+++ b/dev-java/jsr101/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr173/metadata.xml b/dev-java/jsr173/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jsr173/metadata.xml
+++ b/dev-java/jsr173/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr181/metadata.xml b/dev-java/jsr181/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr181/metadata.xml
+++ b/dev-java/jsr181/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr223/metadata.xml b/dev-java/jsr223/metadata.xml
index 407583277d87..cf8e7b830130 100644
--- a/dev-java/jsr223/metadata.xml
+++ b/dev-java/jsr223/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>java@gentoo.org</email>
 </maintainer>
diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
index 8ae3c2a233ff..b15c1fe9ff19 100644
--- a/dev-java/jsr225/metadata.xml
+++ b/dev-java/jsr225/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>java@gentoo.org</email>
   </maintainer>
diff --git a/dev-java/jsr250/metadata.xml b/dev-java/jsr250/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr250/metadata.xml
+++ b/dev-java/jsr250/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr305/metadata.xml b/dev-java/jsr305/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr305/metadata.xml
+++ b/dev-java/jsr305/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr311-api/metadata.xml b/dev-java/jsr311-api/metadata.xml
index 0f01f6e07537..5e6124c6df18 100644
--- a/dev-java/jsr311-api/metadata.xml
+++ b/dev-java/jsr311-api/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr322/metadata.xml b/dev-java/jsr322/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr322/metadata.xml
+++ b/dev-java/jsr322/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr67/metadata.xml b/dev-java/jsr67/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr67/metadata.xml
+++ b/dev-java/jsr67/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jsr93/metadata.xml b/dev-java/jsr93/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/jsr93/metadata.xml
+++ b/dev-java/jsr93/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
index 5ecb9a00a01c..dd5bd6825d23 100644
--- a/dev-java/jss/metadata.xml
+++ b/dev-java/jss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/jssc/metadata.xml b/dev-java/jssc/metadata.xml
index 308fe8a3fe6b..6f9899ea41cd 100644
--- a/dev-java/jssc/metadata.xml
+++ b/dev-java/jssc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">scream3r/java-simple-serial-connector</remote-id>
   </upstream>
diff --git a/dev-java/jstun/metadata.xml b/dev-java/jstun/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jstun/metadata.xml
+++ b/dev-java/jstun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jta/metadata.xml b/dev-java/jta/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/jta/metadata.xml
+++ b/dev-java/jta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
index 7e2346bcf86f..e8b94ec63538 100644
--- a/dev-java/jtds/metadata.xml
+++ b/dev-java/jtds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
 Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
diff --git a/dev-java/jtidy/metadata.xml b/dev-java/jtidy/metadata.xml
index dde84c30de46..98821eabdc36 100644
--- a/dev-java/jtidy/metadata.xml
+++ b/dev-java/jtidy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jtidy</remote-id>
 	</upstream>
diff --git a/dev-java/jtreemap/metadata.xml b/dev-java/jtreemap/metadata.xml
index 091965f6213c..1a56d6b53fed 100644
--- a/dev-java/jtreemap/metadata.xml
+++ b/dev-java/jtreemap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/juel/metadata.xml b/dev-java/juel/metadata.xml
index 86ea5076699c..537597bf94c3 100644
--- a/dev-java/juel/metadata.xml
+++ b/dev-java/juel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-java/jump/metadata.xml b/dev-java/jump/metadata.xml
index c6c19da3cdd6..2c3f60f52bcf 100644
--- a/dev-java/jump/metadata.xml
+++ b/dev-java/jump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jump-math</remote-id>
 	</upstream>
diff --git a/dev-java/jung/metadata.xml b/dev-java/jung/metadata.xml
index 0d3245c368a0..473af175e215 100644
--- a/dev-java/jung/metadata.xml
+++ b/dev-java/jung/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		A software library that provides a common and extendible language for
 		the modeling, analysis, and visualization of data that can be
diff --git a/dev-java/junit-addons/metadata.xml b/dev-java/junit-addons/metadata.xml
index f13871da48ea..fe6df7b8695c 100644
--- a/dev-java/junit-addons/metadata.xml
+++ b/dev-java/junit-addons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		JUnit-addons is a collection of helper classes for JUnit.
 		This library can be used with both JUnit 3.7 and JUnit 3.8.x
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index 7ca84b8014ca..c7eee983c74a 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">junit-team/junit</remote-id>
 		<remote-id type="sourceforge">junit</remote-id>
diff --git a/dev-java/junitperf/metadata.xml b/dev-java/junitperf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/junitperf/metadata.xml
+++ b/dev-java/junitperf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/junrar/metadata.xml b/dev-java/junrar/metadata.xml
index d3985d9456c2..ccb7119e5376 100644
--- a/dev-java/junrar/metadata.xml
+++ b/dev-java/junrar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">edmund-wagner/junrar</remote-id>
 	</upstream>
diff --git a/dev-java/jupidator/metadata.xml b/dev-java/jupidator/metadata.xml
index 4e84a8985356..0526500be282 100644
--- a/dev-java/jupidator/metadata.xml
+++ b/dev-java/jupidator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jupidator</remote-id>
 	</upstream>
diff --git a/dev-java/jusb/metadata.xml b/dev-java/jusb/metadata.xml
index 90eb95966c36..ec27f9ae6eff 100644
--- a/dev-java/jusb/metadata.xml
+++ b/dev-java/jusb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jusb</remote-id>
 	</upstream>
diff --git a/dev-java/jutils/metadata.xml b/dev-java/jutils/metadata.xml
index 9a92eab9f523..2dc525c0a5b8 100644
--- a/dev-java/jutils/metadata.xml
+++ b/dev-java/jutils/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>The JUtils project hosts an implementation of a set of APIs utilized by other Java Game Technology Group projects (e.g. JInput, JOAl, JOGL). Some of those other projects may have build and/or run-time dependencies on the jutils.jar file.</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jvmstat/metadata.xml b/dev-java/jvmstat/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jvmstat/metadata.xml
+++ b/dev-java/jvmstat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jvyaml/metadata.xml b/dev-java/jvyaml/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/jvyaml/metadata.xml
+++ b/dev-java/jvyaml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
index 76c4f7b31ad5..9136b316799e 100644
--- a/dev-java/jvyamlb/metadata.xml
+++ b/dev-java/jvyamlb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index cb4143017627..561adfc865c6 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="readline">Use GNU readline instead of jline</flag>
     <flag name="servletapi">Add optional support for servlet-api</flag>
diff --git a/dev-java/jzlib/metadata.xml b/dev-java/jzlib/metadata.xml
index 6648e4f650d6..7ab8393fdca7 100644
--- a/dev-java/jzlib/metadata.xml
+++ b/dev-java/jzlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ymnk/jzlib</remote-id>
   </upstream>
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
index 649088ab7d53..74f8c5d65e22 100644
--- a/dev-java/kryo/metadata.xml
+++ b/dev-java/kryo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Kryo is a fast and efficient object graph serialization framework for Java.
 	The goals of the project are speed, efficiency, and an easy to use API. The project
diff --git a/dev-java/kunststoff/metadata.xml b/dev-java/kunststoff/metadata.xml
index 816c7ea588c6..fdb1f3ecf832 100644
--- a/dev-java/kunststoff/metadata.xml
+++ b/dev-java/kunststoff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/kxml/metadata.xml b/dev-java/kxml/metadata.xml
index 43e3aa909990..3124d353cc45 100644
--- a/dev-java/kxml/metadata.xml
+++ b/dev-java/kxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kxml</remote-id>
 	</upstream>
diff --git a/dev-java/l2fprod-common/metadata.xml b/dev-java/l2fprod-common/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/l2fprod-common/metadata.xml
+++ b/dev-java/l2fprod-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/laf-plugin/metadata.xml b/dev-java/laf-plugin/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/laf-plugin/metadata.xml
+++ b/dev-java/laf-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
index ffc14a2e7281..09012089567f 100644
--- a/dev-java/ldapsdk/metadata.xml
+++ b/dev-java/ldapsdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml
index f74b561cfceb..cf3e06b82357 100644
--- a/dev-java/libg/metadata.xml
+++ b/dev-java/libg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bndtools/bnd</remote-id>
   </upstream>
diff --git a/dev-java/libmatthew-java/metadata.xml b/dev-java/libmatthew-java/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/libmatthew-java/metadata.xml
+++ b/dev-java/libmatthew-java/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/libmso/metadata.xml b/dev-java/libmso/metadata.xml
index 6a298fd15827..6eea05a26e4c 100644
--- a/dev-java/libmso/metadata.xml
+++ b/dev-java/libmso/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
index fae0e728371b..82e93e65b29c 100644
--- a/dev-java/libreadline-java/metadata.xml
+++ b/dev-java/libreadline-java/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">java-readline</remote-id>
 	</upstream>
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
index d5511ab42436..52aaa897f994 100644
--- a/dev-java/log4j/metadata.xml
+++ b/dev-java/log4j/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="javamail">Build the SMTPAppender</flag>
     <flag name="jms">Build the JMSAppender</flag>
diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml
index 662ba21fb28d..b627919d5f61 100644
--- a/dev-java/logback/metadata.xml
+++ b/dev-java/logback/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="tomcat">Builds Apache Tomcat support</flag>
 	</use>
diff --git a/dev-java/lucene-analyzers/metadata.xml b/dev-java/lucene-analyzers/metadata.xml
index 63e203f20049..386d65572a9c 100644
--- a/dev-java/lucene-analyzers/metadata.xml
+++ b/dev-java/lucene-analyzers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 	Set of analyzers (for various languages) to be used with the Lucene search library.
 	An analyzer's job is to take a string of text and give back a stream of tokens
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index d0ed9f72966f..73a05a984d63 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
   <description>Maintainer for actual Lucene issues.</description>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 <use>
   <flag name="contrib">Include extra functionality from contrib/</flag>
 </use>
diff --git a/dev-java/lzma/metadata.xml b/dev-java/lzma/metadata.xml
index 5856244767dd..6717fb0fc275 100644
--- a/dev-java/lzma/metadata.xml
+++ b/dev-java/lzma/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sevenzip</remote-id>
 	</upstream>
diff --git a/dev-java/lzmajio/metadata.xml b/dev-java/lzmajio/metadata.xml
index 08b5ba84ac21..8ae89739c4ef 100644
--- a/dev-java/lzmajio/metadata.xml
+++ b/dev-java/lzmajio/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>java</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
index 3316a10f58a2..be901db4d849 100644
--- a/dev-java/matrix-toolkits-java/metadata.xml
+++ b/dev-java/matrix-toolkits-java/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">matrix-toolkits-java</remote-id>
     <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
diff --git a/dev-java/maven-bin/metadata.xml b/dev-java/maven-bin/metadata.xml
index a553df7d5aba..973f272f34a8 100644
--- a/dev-java/maven-bin/metadata.xml
+++ b/dev-java/maven-bin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM.</longdescription>
 </pkgmetadata>
diff --git a/dev-java/mchange-commons/metadata.xml b/dev-java/mchange-commons/metadata.xml
index 885373c1666a..5758c91c1dbe 100644
--- a/dev-java/mchange-commons/metadata.xml
+++ b/dev-java/mchange-commons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">swaldman/mchange-commons-java</remote-id>
   </upstream>
diff --git a/dev-java/mersennetwister/metadata.xml b/dev-java/mersennetwister/metadata.xml
index 00f569801896..6aa9f5bd1de3 100644
--- a/dev-java/mersennetwister/metadata.xml
+++ b/dev-java/mersennetwister/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-<herd>java</herd>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
index d8e75a94dca2..30a09b7cec51 100644
--- a/dev-java/metadata-extractor/metadata.xml
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		A general metadata extraction framework. Support currently exists for
 		Exif and Iptc metadata segments. Extraction of these segments is
diff --git a/dev-java/metainf-services/metadata.xml b/dev-java/metainf-services/metadata.xml
index f70091621a3d..22a5b11e4a1d 100644
--- a/dev-java/metainf-services/metadata.xml
+++ b/dev-java/metainf-services/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kohsuke/metainf-services</remote-id>
   </upstream>
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
index ff6f3454ea40..f4842142110b 100644
--- a/dev-java/microba/metadata.xml
+++ b/dev-java/microba/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">microba</remote-id>
 	</upstream>
diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
index 94b0e5548075..91cf83661d22 100644
--- a/dev-java/miglayout/metadata.xml
+++ b/dev-java/miglayout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
 For Java developers writing GUI layouts by hand that wants simplicity, power and automatic per platform fidelity, that are dissatisfied with the current layout managers in Swing, JavaFX and SWT, MigLayout solves your layout problems. User interfaces created with MigLayout is easy to maintain, you will understand how the layout will look like just by looking at the source code.
   </longdescription>
diff --git a/dev-java/milton-api/metadata.xml b/dev-java/milton-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/milton-api/metadata.xml
+++ b/dev-java/milton-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/milton-mail-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/milton-mail-api/metadata.xml
+++ b/dev-java/milton-mail-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
index 1b75d71e9ca1..31f2c96ee72a 100644
--- a/dev-java/mimepull/metadata.xml
+++ b/dev-java/mimepull/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
     This provides a streaming API to access attachments parts in a MIME message.
 	Often times, a large MIME message cannot be loaded into memory. Hence the
diff --git a/dev-java/mina-core/metadata.xml b/dev-java/mina-core/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/mina-core/metadata.xml
+++ b/dev-java/mina-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
index 598be601708d..23d167079ab0 100644
--- a/dev-java/minlog/metadata.xml
+++ b/dev-java/minlog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">EsotericSoftware/minlog</remote-id>
 	</upstream>
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
index 25f5acc3ae1b..5af90a999207 100644
--- a/dev-java/mockito/metadata.xml
+++ b/dev-java/mockito/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mockito</remote-id>
 		<remote-id type="github">mockito/mockito</remote-id>
diff --git a/dev-java/mojarra/metadata.xml b/dev-java/mojarra/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/mojarra/metadata.xml
+++ b/dev-java/mojarra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
index aec296600961..3d027f894fbf 100644
--- a/dev-java/msv/metadata.xml
+++ b/dev-java/msv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
 to validate XML documents against several kinds of XML schemata.
diff --git a/dev-java/myfaces-api/metadata.xml b/dev-java/myfaces-api/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/myfaces-api/metadata.xml
+++ b/dev-java/myfaces-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/myfaces-builder-annotations/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/myfaces-builder-annotations/metadata.xml
+++ b/dev-java/myfaces-builder-annotations/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/nachocalendar/metadata.xml b/dev-java/nachocalendar/metadata.xml
index 71dbb743752c..0be951d99daf 100644
--- a/dev-java/nachocalendar/metadata.xml
+++ b/dev-java/nachocalendar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/nailgun/metadata.xml b/dev-java/nailgun/metadata.xml
index b25a04437581..02c78e80c6a4 100644
--- a/dev-java/nailgun/metadata.xml
+++ b/dev-java/nailgun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Nailgun is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead. Programs run in the server (which is implemented in Java), and are triggered by the client (written in C), which handles all I/O.
 	</longdescription>
diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/nanoxml/metadata.xml
index 3ae0a268103a..1f349300f9f7 100644
--- a/dev-java/nanoxml/metadata.xml
+++ b/dev-java/nanoxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nanoxml</remote-id>
 	</upstream>
diff --git a/dev-java/nekohtml/metadata.xml b/dev-java/nekohtml/metadata.xml
index 6ecee9585b31..6b6373cf88dc 100644
--- a/dev-java/nekohtml/metadata.xml
+++ b/dev-java/nekohtml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nekohtml</remote-id>
 	</upstream>
diff --git a/dev-java/netbeans-apisupport/metadata.xml b/dev-java/netbeans-apisupport/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-apisupport/metadata.xml
+++ b/dev-java/netbeans-apisupport/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-cnd/metadata.xml b/dev-java/netbeans-cnd/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-cnd/metadata.xml
+++ b/dev-java/netbeans-cnd/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-dlight/metadata.xml b/dev-java/netbeans-dlight/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-dlight/metadata.xml
+++ b/dev-java/netbeans-dlight/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-enterprise/metadata.xml b/dev-java/netbeans-enterprise/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-enterprise/metadata.xml
+++ b/dev-java/netbeans-enterprise/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-ergonomics/metadata.xml b/dev-java/netbeans-ergonomics/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-ergonomics/metadata.xml
+++ b/dev-java/netbeans-ergonomics/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-extide/metadata.xml b/dev-java/netbeans-extide/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-extide/metadata.xml
+++ b/dev-java/netbeans-extide/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-groovy/metadata.xml b/dev-java/netbeans-groovy/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-groovy/metadata.xml
+++ b/dev-java/netbeans-groovy/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-harness/metadata.xml b/dev-java/netbeans-harness/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-harness/metadata.xml
+++ b/dev-java/netbeans-harness/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-ide/metadata.xml b/dev-java/netbeans-ide/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-ide/metadata.xml
+++ b/dev-java/netbeans-ide/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-java/metadata.xml b/dev-java/netbeans-java/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-java/metadata.xml
+++ b/dev-java/netbeans-java/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-javacard/metadata.xml b/dev-java/netbeans-javacard/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-javacard/metadata.xml
+++ b/dev-java/netbeans-javacard/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-javadoc/metadata.xml b/dev-java/netbeans-javadoc/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-javadoc/metadata.xml
+++ b/dev-java/netbeans-javadoc/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-javafx/metadata.xml b/dev-java/netbeans-javafx/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-javafx/metadata.xml
+++ b/dev-java/netbeans-javafx/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-mobility/metadata.xml b/dev-java/netbeans-mobility/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-mobility/metadata.xml
+++ b/dev-java/netbeans-mobility/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-nb/metadata.xml b/dev-java/netbeans-nb/metadata.xml
index 8598dae6395c..975c0cf777da 100644
--- a/dev-java/netbeans-nb/metadata.xml
+++ b/dev-java/netbeans-nb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 <use>
   <flag name="keychain">Automatically starts keychain on netbeans start and loads
   specified keys so Netbeans can use them.</flag>
diff --git a/dev-java/netbeans-php/metadata.xml b/dev-java/netbeans-php/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-php/metadata.xml
+++ b/dev-java/netbeans-php/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-platform/metadata.xml b/dev-java/netbeans-platform/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-platform/metadata.xml
+++ b/dev-java/netbeans-platform/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-profiler/metadata.xml b/dev-java/netbeans-profiler/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-profiler/metadata.xml
+++ b/dev-java/netbeans-profiler/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-webcommon/metadata.xml b/dev-java/netbeans-webcommon/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-webcommon/metadata.xml
+++ b/dev-java/netbeans-webcommon/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netbeans-websvccommon/metadata.xml b/dev-java/netbeans-websvccommon/metadata.xml
index a735655e737f..0881a8e7944c 100644
--- a/dev-java/netbeans-websvccommon/metadata.xml
+++ b/dev-java/netbeans-websvccommon/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>fordfrog@gentoo.org</email>
   <name>Miroslav Šulc</name>
 </maintainer>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/netty-buffer/metadata.xml b/dev-java/netty-buffer/metadata.xml
index 9af12552d298..1f13f98a0814 100644
--- a/dev-java/netty-buffer/metadata.xml
+++ b/dev-java/netty-buffer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">netty/netty</remote-id>
   </upstream>
diff --git a/dev-java/netty-codec/metadata.xml b/dev-java/netty-codec/metadata.xml
index 9af12552d298..1f13f98a0814 100644
--- a/dev-java/netty-codec/metadata.xml
+++ b/dev-java/netty-codec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">netty/netty</remote-id>
   </upstream>
diff --git a/dev-java/netty-common/metadata.xml b/dev-java/netty-common/metadata.xml
index 9af12552d298..1f13f98a0814 100644
--- a/dev-java/netty-common/metadata.xml
+++ b/dev-java/netty-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">netty/netty</remote-id>
   </upstream>
diff --git a/dev-java/netty-handler/metadata.xml b/dev-java/netty-handler/metadata.xml
index 9af12552d298..1f13f98a0814 100644
--- a/dev-java/netty-handler/metadata.xml
+++ b/dev-java/netty-handler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">netty/netty</remote-id>
   </upstream>
diff --git a/dev-java/netty-transport/metadata.xml b/dev-java/netty-transport/metadata.xml
index 9af12552d298..1f13f98a0814 100644
--- a/dev-java/netty-transport/metadata.xml
+++ b/dev-java/netty-transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">netty/netty</remote-id>
   </upstream>
diff --git a/dev-java/neuroph/metadata.xml b/dev-java/neuroph/metadata.xml
index b88f3d4a8c7c..3e050018c403 100644
--- a/dev-java/neuroph/metadata.xml
+++ b/dev-java/neuroph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">neuroph</remote-id>
 	</upstream>
diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
index 613a16804d56..9870a4caaffa 100644
--- a/dev-java/objenesis/metadata.xml
+++ b/dev-java/objenesis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">objenesis</remote-id>
 	</upstream>
diff --git a/dev-java/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/odfdom/metadata.xml
+++ b/dev-java/odfdom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/offo-hyphenation/metadata.xml b/dev-java/offo-hyphenation/metadata.xml
index 12697493b88a..e41da9ead214 100644
--- a/dev-java/offo-hyphenation/metadata.xml
+++ b/dev-java/offo-hyphenation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">offo</remote-id>
 	</upstream>
diff --git a/dev-java/ognl/metadata.xml b/dev-java/ognl/metadata.xml
index 686a81439b85..410796fecd6f 100644
--- a/dev-java/ognl/metadata.xml
+++ b/dev-java/ognl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jkuhnert/ognl</remote-id>
   </upstream>
diff --git a/dev-java/opencsv/metadata.xml b/dev-java/opencsv/metadata.xml
index 6eab0f966490..e848fbf624be 100644
--- a/dev-java/opencsv/metadata.xml
+++ b/dev-java/opencsv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opencsv</remote-id>
 	</upstream>
diff --git a/dev-java/oracle-javamail/metadata.xml b/dev-java/oracle-javamail/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/oracle-javamail/metadata.xml
+++ b/dev-java/oracle-javamail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 665634310c44..a509ac6975a5 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
   <use>
     <flag name="derby">Install bundled Derby (Java database)</flag>
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index 2e6cc1725621..66303f54f52a 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
   <use>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/oscache/metadata.xml b/dev-java/oscache/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/oscache/metadata.xml
+++ b/dev-java/oscache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/osgi-compendium/metadata.xml b/dev-java/osgi-compendium/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/osgi-compendium/metadata.xml
+++ b/dev-java/osgi-compendium/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/osgi-core-api/metadata.xml
+++ b/dev-java/osgi-core-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/dev-java/osgi-enterprise-api/metadata.xml
+++ b/dev-java/osgi-enterprise-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/osgi-foundation/metadata.xml b/dev-java/osgi-foundation/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/osgi-foundation/metadata.xml
+++ b/dev-java/osgi-foundation/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/osgi-obr/metadata.xml b/dev-java/osgi-obr/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/osgi-obr/metadata.xml
+++ b/dev-java/osgi-obr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/pat/metadata.xml b/dev-java/pat/metadata.xml
index 44346b6e6c3d..c50ac58120f2 100644
--- a/dev-java/pat/metadata.xml
+++ b/dev-java/pat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Package pat provides a mechanism for compiling and matching regular
 		expressions in java.
diff --git a/dev-java/pdf-renderer/metadata.xml b/dev-java/pdf-renderer/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/pdf-renderer/metadata.xml
+++ b/dev-java/pdf-renderer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
index ce693b535768..4a88ffb7df17 100644
--- a/dev-java/pdfbox/metadata.xml
+++ b/dev-java/pdfbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pdfbox</remote-id>
 	</upstream>
diff --git a/dev-java/piccolo/metadata.xml b/dev-java/piccolo/metadata.xml
index ac174a7752db..11db25501f79 100644
--- a/dev-java/piccolo/metadata.xml
+++ b/dev-java/piccolo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">piccolo</remote-id>
 	</upstream>
diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml
index 06017385f9db..ba2229c2fe8b 100644
--- a/dev-java/piccolo2d/metadata.xml
+++ b/dev-java/piccolo2d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">piccolo2d</remote-id>
 	</upstream>
diff --git a/dev-java/picocontainer/metadata.xml b/dev-java/picocontainer/metadata.xml
index 896e47a05b0c..e4beb07917f3 100644
--- a/dev-java/picocontainer/metadata.xml
+++ b/dev-java/picocontainer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 PicoContainer is very simple container for very simple components.  It
 honors the Inversion of control pattern (IoC) in a way that we calling
diff --git a/dev-java/plexus-classworlds/metadata.xml b/dev-java/plexus-classworlds/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/plexus-classworlds/metadata.xml
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/portletapi/metadata.xml b/dev-java/portletapi/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/portletapi/metadata.xml
+++ b/dev-java/portletapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
index aa580f769c29..ea07f782a623 100644
--- a/dev-java/prefuse/metadata.xml
+++ b/dev-java/prefuse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		User interface toolkit for building highly interactive visualizations
 		of structured and unstructured data.
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
index e53d61d2885e..d20d1933fdd5 100644
--- a/dev-java/proguard/metadata.xml
+++ b/dev-java/proguard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
 		<flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index ec07d717eb8f..bb175c6e786c 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		High speed, small footprint parser for extracting class/interface/method
 		definitions from source files complete with JavaDoc @tags.
diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
index 0146c4126593..d866feabfbce 100644
--- a/dev-java/radeox/metadata.xml
+++ b/dev-java/radeox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 Radeox API is a lightwight wiki markup rendering engine API to make render
diff --git a/dev-java/rat/metadata.xml b/dev-java/rat/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/rat/metadata.xml
+++ b/dev-java/rat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/reflectasm/metadata.xml b/dev-java/reflectasm/metadata.xml
index 3388b15fec74..fdae6e9f5794 100644
--- a/dev-java/reflectasm/metadata.xml
+++ b/dev-java/reflectasm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">EsotericSoftware/reflectasm</remote-id>
 	</upstream>
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
index 4e7ae7699d82..bfdc338160dc 100644
--- a/dev-java/reflections/metadata.xml
+++ b/dev-java/reflections/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>Reflections scans your classpath, indexes the metadata, allows you to query it on runtime and may save and collect that information for many modules within your project.</longdescription>
 	<upstream>
 		<remote-id type="github">ronmamo/reflections</remote-id>
diff --git a/dev-java/relaxng-datatype/metadata.xml b/dev-java/relaxng-datatype/metadata.xml
index de9b803e551e..1af33dd051ac 100644
--- a/dev-java/relaxng-datatype/metadata.xml
+++ b/dev-java/relaxng-datatype/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">relaxng</remote-id>
 	</upstream>
diff --git a/dev-java/relaxngcc/metadata.xml b/dev-java/relaxngcc/metadata.xml
index cee33cced394..362aa9f1d34b 100644
--- a/dev-java/relaxngcc/metadata.xml
+++ b/dev-java/relaxngcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">relaxngcc</remote-id>
 	</upstream>
diff --git a/dev-java/resin-servlet-api/metadata.xml b/dev-java/resin-servlet-api/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/resin-servlet-api/metadata.xml
+++ b/dev-java/resin-servlet-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/rhino/metadata.xml b/dev-java/rhino/metadata.xml
index 47f3275211c1..22df8204fb1b 100644
--- a/dev-java/rhino/metadata.xml
+++ b/dev-java/rhino/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Rhino is an implementation of JavaScript written entirely in Java.
 		It is typically embedded into Java applications to provide scripting
diff --git a/dev-java/rngom/metadata.xml b/dev-java/rngom/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/rngom/metadata.xml
+++ b/dev-java/rngom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/rome/metadata.xml b/dev-java/rome/metadata.xml
index 407583277d87..cf8e7b830130 100644
--- a/dev-java/rome/metadata.xml
+++ b/dev-java/rome/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
   <email>java@gentoo.org</email>
 </maintainer>
diff --git a/dev-java/rundoc/metadata.xml b/dev-java/rundoc/metadata.xml
index 1eee4a6024e9..bb24681e7508 100644
--- a/dev-java/rundoc/metadata.xml
+++ b/dev-java/rundoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 
 	<longdescription lang="en">
 		rundoc is an Ant task designed to help with the single-sourcing of
diff --git a/dev-java/rxtx/metadata.xml b/dev-java/rxtx/metadata.xml
index 67dbcd454952..9ba036cb20f5 100644
--- a/dev-java/rxtx/metadata.xml
+++ b/dev-java/rxtx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="lfd">Installs and uses LockFileServer daemon (lfd)</flag>
   </use>
diff --git a/dev-java/saaj/metadata.xml b/dev-java/saaj/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/saaj/metadata.xml
+++ b/dev-java/saaj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/sablecc-anttask/metadata.xml b/dev-java/sablecc-anttask/metadata.xml
index 6c817e87bfb4..3cae30f22661 100644
--- a/dev-java/sablecc-anttask/metadata.xml
+++ b/dev-java/sablecc-anttask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sablecc</remote-id>
 	</upstream>
diff --git a/dev-java/sablecc/metadata.xml b/dev-java/sablecc/metadata.xml
index 6c817e87bfb4..3cae30f22661 100644
--- a/dev-java/sablecc/metadata.xml
+++ b/dev-java/sablecc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sablecc</remote-id>
 	</upstream>
diff --git a/dev-java/sac/metadata.xml b/dev-java/sac/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sac/metadata.xml
+++ b/dev-java/sac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sat4j-core/metadata.xml b/dev-java/sat4j-core/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sat4j-core/metadata.xml
+++ b/dev-java/sat4j-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sat4j-pseudo/metadata.xml b/dev-java/sat4j-pseudo/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sat4j-pseudo/metadata.xml
+++ b/dev-java/sat4j-pseudo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sax/metadata.xml b/dev-java/sax/metadata.xml
index 2cfbf2b5202b..ed6b4d51325e 100644
--- a/dev-java/sax/metadata.xml
+++ b/dev-java/sax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sax</remote-id>
 	</upstream>
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
index 9f1123bb2bec..bf189f65a1dc 100644
--- a/dev-java/saxon/metadata.xml
+++ b/dev-java/saxon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">saxon</remote-id>
 	</upstream>
diff --git a/dev-java/saxpath/metadata.xml b/dev-java/saxpath/metadata.xml
index e091065382f5..25178c747725 100644
--- a/dev-java/saxpath/metadata.xml
+++ b/dev-java/saxpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">saxpath</remote-id>
 	</upstream>
diff --git a/dev-java/sblim-cim-client/metadata.xml b/dev-java/sblim-cim-client/metadata.xml
index 48a24992662a..ef3a2534164c 100644
--- a/dev-java/sblim-cim-client/metadata.xml
+++ b/dev-java/sblim-cim-client/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jieryn@gmail.com</email>
 		<name>jieryn</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		An implementation of a WBEM services client that includes an IETF RFC
 		2614 compliant SLP client for CIM service discovery.
diff --git a/dev-java/sbt-bin/metadata.xml b/dev-java/sbt-bin/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sbt-bin/metadata.xml
+++ b/dev-java/sbt-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/servletapi/metadata.xml b/dev-java/servletapi/metadata.xml
index 97d1a13a4e5d..46e882477b62 100644
--- a/dev-java/servletapi/metadata.xml
+++ b/dev-java/servletapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	The Apache Tomcat implementation of the Servlet API specification.
 	</longdescription>
diff --git a/dev-java/shared-objects/metadata.xml b/dev-java/shared-objects/metadata.xml
index b2ba49714fe2..d86f1393c3a0 100644
--- a/dev-java/shared-objects/metadata.xml
+++ b/dev-java/shared-objects/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 A Java Class implementing a core factory for maximal sharing of arbitrary objects.
diff --git a/dev-java/simplyhtml/metadata.xml b/dev-java/simplyhtml/metadata.xml
index 39c18d820a9d..11489c0234ff 100644
--- a/dev-java/simplyhtml/metadata.xml
+++ b/dev-java/simplyhtml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simplyhtml</remote-id>
 	</upstream>
diff --git a/dev-java/sjsxp/metadata.xml b/dev-java/sjsxp/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sjsxp/metadata.xml
+++ b/dev-java/sjsxp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/skinlf/metadata.xml b/dev-java/skinlf/metadata.xml
index 8b21b3ca7780..a3f384856299 100644
--- a/dev-java/skinlf/metadata.xml
+++ b/dev-java/skinlf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
 <maintainer>
 <email>zzam@gentoo.org</email>
 <name>Matthias Schwarzott</name>
 </maintainer>
+<maintainer>
+<email>java@gentoo.org</email>
+<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/slf4j-api/metadata.xml
+++ b/dev-java/slf4j-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/slf4j-ext/metadata.xml
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/slf4j-log4j12/metadata.xml
+++ b/dev-java/slf4j-log4j12/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/slf4j-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/slf4j-nop/metadata.xml
+++ b/dev-java/slf4j-nop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/slf4j-simple/metadata.xml
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/smack/metadata.xml b/dev-java/smack/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/smack/metadata.xml
+++ b/dev-java/smack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index fb133c7e48b4..359d1f635e0e 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">asomov/snakeyaml</remote-id>
 	</upstream>
diff --git a/dev-java/snappy/metadata.xml b/dev-java/snappy/metadata.xml
index 2f78571d1f08..5d8e15ff7378 100644
--- a/dev-java/snappy/metadata.xml
+++ b/dev-java/snappy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">xerial/snappy-java</remote-id>
 	</upstream>
diff --git a/dev-java/snip/metadata.xml b/dev-java/snip/metadata.xml
index 456daabcdd66..7dedfdec11a5 100644
--- a/dev-java/snip/metadata.xml
+++ b/dev-java/snip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		&gt;snip&lt; is an Ant task designed to help with the single-sourcing
 		of program documentation. This task extracts snippets of text from files,
diff --git a/dev-java/soylatte-jdk-bin/metadata.xml b/dev-java/soylatte-jdk-bin/metadata.xml
index d539ee98d50c..eec500eade86 100644
--- a/dev-java/soylatte-jdk-bin/metadata.xml
+++ b/dev-java/soylatte-jdk-bin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 <longdescription>SoyLatte: Java 6 Port for Mac OS X 10.4 and 10.5 (Intel)</longdescription>
 </pkgmetadata>
diff --git a/dev-java/spice-jndikit/metadata.xml b/dev-java/spice-jndikit/metadata.xml
index f43299979e05..0a14a3dc5ff5 100644
--- a/dev-java/spice-jndikit/metadata.xml
+++ b/dev-java/spice-jndikit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription lang="en">
 	Spice JNDIKit: JNDI Kit is a toolkit designed to help with the
diff --git a/dev-java/spin/metadata.xml b/dev-java/spin/metadata.xml
index a15327b8ef8a..5f66e10e66f7 100644
--- a/dev-java/spin/metadata.xml
+++ b/dev-java/spin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">spin</remote-id>
 	</upstream>
diff --git a/dev-java/spring-aop/metadata.xml b/dev-java/spring-aop/metadata.xml
index 6b3354384413..c4c95f0b7e9b 100644
--- a/dev-java/spring-aop/metadata.xml
+++ b/dev-java/spring-aop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Spring Framework provides a comprehensive programming and configuration model for
 		modern Java-based enterprise applications - on any kind of deployment platform. A key
diff --git a/dev-java/spring-beans/metadata.xml b/dev-java/spring-beans/metadata.xml
index 6b3354384413..c4c95f0b7e9b 100644
--- a/dev-java/spring-beans/metadata.xml
+++ b/dev-java/spring-beans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Spring Framework provides a comprehensive programming and configuration model for
 		modern Java-based enterprise applications - on any kind of deployment platform. A key
diff --git a/dev-java/spring-core/metadata.xml b/dev-java/spring-core/metadata.xml
index 6b3354384413..c4c95f0b7e9b 100644
--- a/dev-java/spring-core/metadata.xml
+++ b/dev-java/spring-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Spring Framework provides a comprehensive programming and configuration model for
 		modern Java-based enterprise applications - on any kind of deployment platform. A key
diff --git a/dev-java/spring-expression/metadata.xml b/dev-java/spring-expression/metadata.xml
index 6b3354384413..c4c95f0b7e9b 100644
--- a/dev-java/spring-expression/metadata.xml
+++ b/dev-java/spring-expression/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Spring Framework provides a comprehensive programming and configuration model for
 		modern Java-based enterprise applications - on any kind of deployment platform. A key
diff --git a/dev-java/spring-instrument/metadata.xml b/dev-java/spring-instrument/metadata.xml
index 6b3354384413..c4c95f0b7e9b 100644
--- a/dev-java/spring-instrument/metadata.xml
+++ b/dev-java/spring-instrument/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Spring Framework provides a comprehensive programming and configuration model for
 		modern Java-based enterprise applications - on any kind of deployment platform. A key
diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
index 1558b9fce4a9..006f54bb41e2 100644
--- a/dev-java/spymemcached/metadata.xml
+++ b/dev-java/spymemcached/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="spring">Build support for the spring framework</flag>
 	</use>
diff --git a/dev-java/squareness-jlf/metadata.xml b/dev-java/squareness-jlf/metadata.xml
index 4fb9ade43357..d89ae3cbb498 100644
--- a/dev-java/squareness-jlf/metadata.xml
+++ b/dev-java/squareness-jlf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/stax-ex/metadata.xml b/dev-java/stax-ex/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/stax-ex/metadata.xml
+++ b/dev-java/stax-ex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/stax/metadata.xml b/dev-java/stax/metadata.xml
index 370119aceffe..4b627424ad1f 100644
--- a/dev-java/stax/metadata.xml
+++ b/dev-java/stax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 Features of StAX API: Standard pull parser interface,
 Read/Write API: two levels, "raw" cursor access; object-based "event" access,
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
index 7a57fb0cf6c5..9487c652c376 100644
--- a/dev-java/stax2-api/metadata.xml
+++ b/dev-java/stax2-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>Stax2 API is an extension to standard Stax API ("STandard Api for Xml procesing"), pull-parser API of JDK, added in JDK 6.</longdescription>
   <upstream>
     <remote-id type="github">FasterXML/stax2-api</remote-id>
diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
index 024314461720..a12bad0934b1 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">antlr/stringtemplate4</remote-id>
 	</upstream>
diff --git a/dev-java/struts-core/metadata.xml b/dev-java/struts-core/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/struts-core/metadata.xml
+++ b/dev-java/struts-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/struts-plugins/metadata.xml b/dev-java/struts-plugins/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/struts-plugins/metadata.xml
+++ b/dev-java/struts-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/struts-xwork/metadata.xml b/dev-java/struts-xwork/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/struts-xwork/metadata.xml
+++ b/dev-java/struts-xwork/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/struts/metadata.xml b/dev-java/struts/metadata.xml
index 815c326402df..16e9cc311314 100644
--- a/dev-java/struts/metadata.xml
+++ b/dev-java/struts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 The Struts framework provides the invisible underpinnings every professional
 web application needs to survive. Struts helps you create an extensible
diff --git a/dev-java/sun-dtdparser/metadata.xml b/dev-java/sun-dtdparser/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/sun-dtdparser/metadata.xml
+++ b/dev-java/sun-dtdparser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-httpserver-bin/metadata.xml b/dev-java/sun-httpserver-bin/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/sun-httpserver-bin/metadata.xml
+++ b/dev-java/sun-httpserver-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-j2ee-deployment-bin/metadata.xml b/dev-java/sun-j2ee-deployment-bin/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sun-j2ee-deployment-bin/metadata.xml
+++ b/dev-java/sun-j2ee-deployment-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jacc-api/metadata.xml b/dev-java/sun-jacc-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sun-jacc-api/metadata.xml
+++ b/dev-java/sun-jacc-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jaf/metadata.xml b/dev-java/sun-jaf/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sun-jaf/metadata.xml
+++ b/dev-java/sun-jaf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jai-bin/metadata.xml b/dev-java/sun-jai-bin/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/sun-jai-bin/metadata.xml
+++ b/dev-java/sun-jai-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-java3d-bin/metadata.xml b/dev-java/sun-java3d-bin/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/sun-java3d-bin/metadata.xml
+++ b/dev-java/sun-java3d-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-javamail/metadata.xml b/dev-java/sun-javamail/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sun-javamail/metadata.xml
+++ b/dev-java/sun-javamail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jce-bin/metadata.xml b/dev-java/sun-jce-bin/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/sun-jce-bin/metadata.xml
+++ b/dev-java/sun-jce-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
index 982a85f2eff7..0a7f23bdc2b6 100644
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
   <use>
     <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
diff --git a/dev-java/sun-jimi/metadata.xml b/dev-java/sun-jimi/metadata.xml
index 239a64a49538..0dd44620008e 100644
--- a/dev-java/sun-jimi/metadata.xml
+++ b/dev-java/sun-jimi/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/sun-jms/metadata.xml
index b0850e6c56cd..c99ba72ef8fb 100644
--- a/dev-java/sun-jms/metadata.xml
+++ b/dev-java/sun-jms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The Java Message Service (JMS) API is a messaging standard that
 		allows application components to create, send, receive, and read
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/sun-jmx/metadata.xml
+++ b/dev-java/sun-jmx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sun-jre-bin/metadata.xml b/dev-java/sun-jre-bin/metadata.xml
index 20318a349b45..b03cffc80994 100644
--- a/dev-java/sun-jre-bin/metadata.xml
+++ b/dev-java/sun-jre-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>Sun Java Resource Package, also known as J2SE</longdescription>
   <use>
     <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
diff --git a/dev-java/super-csv/metadata.xml b/dev-java/super-csv/metadata.xml
index e2dcca3eea33..ac86db307691 100644
--- a/dev-java/super-csv/metadata.xml
+++ b/dev-java/super-csv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<upstream>
 		<remote-id type="github">super-csv/super-csv</remote-id>
 	</upstream>
@@ -9,4 +8,8 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/sux4j/metadata.xml b/dev-java/sux4j/metadata.xml
index 89061b7cc01d..182c2e1be015 100644
--- a/dev-java/sux4j/metadata.xml
+++ b/dev-java/sux4j/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Sux in an umbrella nickname for the results of my fiddling with the implementation of basic succinct data strucures.
 
diff --git a/dev-java/svgsalamander/metadata.xml b/dev-java/svgsalamander/metadata.xml
index 7f188e592ff2..5998632bb6e7 100644
--- a/dev-java/svgsalamander/metadata.xml
+++ b/dev-java/svgsalamander/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	SVG Salamander is an SVG engine for Java that's designed to be small,
 	fast, and allow programmers to use it with a minimum of fuss. It's in
diff --git a/dev-java/swarmcache/metadata.xml b/dev-java/swarmcache/metadata.xml
index 386d6ecb34a3..2cdb78c0aec5 100644
--- a/dev-java/swarmcache/metadata.xml
+++ b/dev-java/swarmcache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">swarmcache</remote-id>
 	</upstream>
diff --git a/dev-java/swidgets/metadata.xml b/dev-java/swidgets/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/swidgets/metadata.xml
+++ b/dev-java/swidgets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/swing-layout/metadata.xml b/dev-java/swing-layout/metadata.xml
index 0464ecad005e..6a773e62ddaa 100644
--- a/dev-java/swing-layout/metadata.xml
+++ b/dev-java/swing-layout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Swing Layout Extensions makes it easy to create professional
 	cross platform layouts with Swing. This project has an eye
diff --git a/dev-java/swing-worker/metadata.xml b/dev-java/swing-worker/metadata.xml
index 1ab39fdffc75..cc63abd387a0 100644
--- a/dev-java/swing-worker/metadata.xml
+++ b/dev-java/swing-worker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 swing-worker is a backport for Java 1.5 of the Swing Threading libraries
 available within the Java 1.6 API.
diff --git a/dev-java/swingx/metadata.xml b/dev-java/swingx/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/dev-java/swingx/metadata.xml
+++ b/dev-java/swingx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index 2e5728b03433..67e476082474 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		SWT is the software component that delivers native widget functionality for the
 		Eclipse platform in an operating system independent manner.  It is analogous to
diff --git a/dev-java/tablelayout/metadata.xml b/dev-java/tablelayout/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/tablelayout/metadata.xml
+++ b/dev-java/tablelayout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
index 4618b26cc2d8..197721782412 100644
--- a/dev-java/tagsoup/metadata.xml
+++ b/dev-java/tagsoup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		This is the home page of TagSoup, a SAX-compliant parser written
 		in Java that, instead of parsing well-formed or valid XML, parses
diff --git a/dev-java/tapestry/metadata.xml b/dev-java/tapestry/metadata.xml
index cb5ac0b5cc66..ef0682d6b58e 100644
--- a/dev-java/tapestry/metadata.xml
+++ b/dev-java/tapestry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 Tapestry is a powerful, open-source, all-Java framework for creating leading edge web applications in Java.
 
diff --git a/dev-java/telnetd/metadata.xml b/dev-java/telnetd/metadata.xml
index 84d9df72e3b3..dcae0cbb7550 100644
--- a/dev-java/telnetd/metadata.xml
+++ b/dev-java/telnetd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">telnetd</remote-id>
 	</upstream>
diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/testng/metadata.xml
+++ b/dev-java/testng/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/texhyphj/metadata.xml b/dev-java/texhyphj/metadata.xml
index 9c9f688647b4..0a58e50b4622 100644
--- a/dev-java/texhyphj/metadata.xml
+++ b/dev-java/texhyphj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">texhyphj</remote-id>
 	</upstream>
diff --git a/dev-java/tijmp/metadata.xml b/dev-java/tijmp/metadata.xml
index 02ab5b4213aa..5dd5e5e422fc 100644
--- a/dev-java/tijmp/metadata.xml
+++ b/dev-java/tijmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 JMP is a profiler for java that can be used to trace objects usage and
diff --git a/dev-java/tomcat-jstl-compat/metadata.xml b/dev-java/tomcat-jstl-compat/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/tomcat-jstl-compat/metadata.xml
+++ b/dev-java/tomcat-jstl-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/tomcat-jstl-el/metadata.xml b/dev-java/tomcat-jstl-el/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/tomcat-jstl-el/metadata.xml
+++ b/dev-java/tomcat-jstl-el/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/tomcat-jstl-impl/metadata.xml b/dev-java/tomcat-jstl-impl/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/tomcat-jstl-impl/metadata.xml
+++ b/dev-java/tomcat-jstl-impl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/tomcat-jstl-spec/metadata.xml b/dev-java/tomcat-jstl-spec/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/tomcat-jstl-spec/metadata.xml
+++ b/dev-java/tomcat-jstl-spec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index 356b51e0d53b..70b30f3258b5 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Native library for Tomcat to use the Apache Portable Runtime to
 	provide superior scalability, performance, and better integration with
diff --git a/dev-java/tomcat-servlet-api/metadata.xml b/dev-java/tomcat-servlet-api/metadata.xml
index 97d1a13a4e5d..46e882477b62 100644
--- a/dev-java/tomcat-servlet-api/metadata.xml
+++ b/dev-java/tomcat-servlet-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	The Apache Tomcat implementation of the Servlet API specification.
 	</longdescription>
diff --git a/dev-java/toolbar/metadata.xml b/dev-java/toolbar/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/toolbar/metadata.xml
+++ b/dev-java/toolbar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/touchgraph-graphlayout/metadata.xml b/dev-java/touchgraph-graphlayout/metadata.xml
index ef50d3af37e1..b757574635b0 100644
--- a/dev-java/touchgraph-graphlayout/metadata.xml
+++ b/dev-java/touchgraph-graphlayout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">touchgraph</remote-id>
 	</upstream>
diff --git a/dev-java/treelayout/metadata.xml b/dev-java/treelayout/metadata.xml
index aed73cb01644..671de160b753 100644
--- a/dev-java/treelayout/metadata.xml
+++ b/dev-java/treelayout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>The TreeLayout creates tree layouts for arbitrary trees. It is not restricted to a specific output or format, but can be used for any kind of two dimensional diagram. Examples are Swing based components, SVG files, and many more. This is possible because TreeLayout separates the layout of a tree from the actual rendering.</longdescription>
 	<upstream>
 		<remote-id type="github">abego/treelayout</remote-id>
diff --git a/dev-java/trident/metadata.xml b/dev-java/trident/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/trident/metadata.xml
+++ b/dev-java/trident/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/trove/metadata.xml b/dev-java/trove/metadata.xml
index e0f411981bd4..e4f5bb4fb9f9 100644
--- a/dev-java/trove/metadata.xml
+++ b/dev-java/trove/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">trove4j</remote-id>
 	</upstream>
diff --git a/dev-java/txw2-runtime/metadata.xml b/dev-java/txw2-runtime/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/txw2-runtime/metadata.xml
+++ b/dev-java/txw2-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/typesafe-config/metadata.xml b/dev-java/typesafe-config/metadata.xml
index 09402e6456b2..415d362710f0 100644
--- a/dev-java/typesafe-config/metadata.xml
+++ b/dev-java/typesafe-config/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">typesafehub/config</remote-id>
   </upstream>
diff --git a/dev-java/unkrig-nullanalysis/metadata.xml b/dev-java/unkrig-nullanalysis/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/unkrig-nullanalysis/metadata.xml
+++ b/dev-java/unkrig-nullanalysis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/vecmath/metadata.xml b/dev-java/vecmath/metadata.xml
index 6d4556f25101..ed8fc0305340 100644
--- a/dev-java/vecmath/metadata.xml
+++ b/dev-java/vecmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	3D vector math package, javax.vecmath
 </longdescription>
diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/velocity/metadata.xml
+++ b/dev-java/velocity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
index ee58970de9c5..80bd63ff912b 100644
--- a/dev-java/vldocking/metadata.xml
+++ b/dev-java/vldocking/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<upstream>
 		<remote-id type="github">cmadsen/vldocking</remote-id>
 	</upstream>
@@ -9,4 +8,8 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/werken-xpath/metadata.xml b/dev-java/werken-xpath/metadata.xml
index d09e01fb7226..ca2b5faba844 100644
--- a/dev-java/werken-xpath/metadata.xml
+++ b/dev-java/werken-xpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">werken-xpath</remote-id>
 	</upstream>
diff --git a/dev-java/ws-commons-util/metadata.xml b/dev-java/ws-commons-util/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/ws-commons-util/metadata.xml
+++ b/dev-java/ws-commons-util/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/wsdl4j/metadata.xml b/dev-java/wsdl4j/metadata.xml
index 1236e4d06274..a71938325a90 100644
--- a/dev-java/wsdl4j/metadata.xml
+++ b/dev-java/wsdl4j/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jwsdltck</remote-id>
 	</upstream>
diff --git a/dev-java/wstx/metadata.xml b/dev-java/wstx/metadata.xml
index 06e46c27407e..2639b651b033 100644
--- a/dev-java/wstx/metadata.xml
+++ b/dev-java/wstx/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mike@weisso.com</email>
 		<name>Mike Weissman</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Woodstox is a high-performance validating namespace-aware StAX-compliant
 		(JSR-173) Open Source XML-processor written in Java.
diff --git a/dev-java/xalan-serializer/metadata.xml b/dev-java/xalan-serializer/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xalan-serializer/metadata.xml
+++ b/dev-java/xalan-serializer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xalan/metadata.xml b/dev-java/xalan/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xalan/metadata.xml
+++ b/dev-java/xalan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xerces/metadata.xml
+++ b/dev-java/xerces/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xerial-core/metadata.xml b/dev-java/xerial-core/metadata.xml
index 684a98e1e2b8..9f0a2c731a8a 100644
--- a/dev-java/xerial-core/metadata.xml
+++ b/dev-java/xerial-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">xerial</remote-id>
 	</upstream>
diff --git a/dev-java/xjavac/metadata.xml b/dev-java/xjavac/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xjavac/metadata.xml
+++ b/dev-java/xjavac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xml-commons-external/metadata.xml b/dev-java/xml-commons-external/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xml-commons-external/metadata.xml
+++ b/dev-java/xml-commons-external/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xml-commons-resolver/metadata.xml b/dev-java/xml-commons-resolver/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xml-commons-resolver/metadata.xml
+++ b/dev-java/xml-commons-resolver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
index 2d0c5736c9cf..2890e87f5825 100644
--- a/dev-java/xml-commons/metadata.xml
+++ b/dev-java/xml-commons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/xml-im-exporter/metadata.xml b/dev-java/xml-im-exporter/metadata.xml
index a153dd1cad8d..467e7ec8d6e3 100644
--- a/dev-java/xml-im-exporter/metadata.xml
+++ b/dev-java/xml-im-exporter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		XML Im-/Exporter is a low level library to assist you in the
 		straight forward process of importing and exporting XML from
diff --git a/dev-java/xml-security/metadata.xml b/dev-java/xml-security/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xml-security/metadata.xml
+++ b/dev-java/xml-security/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xml-writer/metadata.xml b/dev-java/xml-writer/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xml-writer/metadata.xml
+++ b/dev-java/xml-writer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
index 79125e187b43..05251765cb30 100644
--- a/dev-java/xml-xmlbeans/metadata.xml
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 
diff --git a/dev-java/xmldb/metadata.xml b/dev-java/xmldb/metadata.xml
index 2b157ce3b0f5..9f3046154498 100644
--- a/dev-java/xmldb/metadata.xml
+++ b/dev-java/xmldb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 XML:DB provides a community for collaborative development of specifications
 for XML databases and data manipulation technologies. Along with each
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-java/xmlgraphics-commons/metadata.xml
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
index 72ca6b4edc74..abd97d274c99 100644
--- a/dev-java/xmlrpc/metadata.xml
+++ b/dev-java/xmlrpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
   Apache XML-RPC (previously known as Helma XML-RPC) is a Java
   implementation of XML-RPC, a popular protocol that uses XML over
diff --git a/dev-java/xmlstreambuffer/metadata.xml b/dev-java/xmlstreambuffer/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/xmlstreambuffer/metadata.xml
+++ b/dev-java/xmlstreambuffer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/xmlunit/metadata.xml b/dev-java/xmlunit/metadata.xml
index 515ace5efb61..3bd55d65cfe2 100644
--- a/dev-java/xmlunit/metadata.xml
+++ b/dev-java/xmlunit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xmlunit</remote-id>
 	</upstream>
diff --git a/dev-java/xom/metadata.xml b/dev-java/xom/metadata.xml
index f202e54d9df3..0b59ea96ccfa 100644
--- a/dev-java/xom/metadata.xml
+++ b/dev-java/xom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		XOM is a new XML object model. It is a tree-based API for processing
 		XML with Java that strives for correctness and simplicity.
diff --git a/dev-java/xp/metadata.xml b/dev-java/xp/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xp/metadata.xml
+++ b/dev-java/xp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xpp2/metadata.xml b/dev-java/xpp2/metadata.xml
index 03397f28c094..6ae69e57c24d 100644
--- a/dev-java/xpp2/metadata.xml
+++ b/dev-java/xpp2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 Xml Pull Parser (in short XPP) is a streaming pull XML parser and should be used when there is a need to process quickly and efficiently all input elements (for example in SOAP processors)
 </longdescription>
diff --git a/dev-java/xpp3/metadata.xml b/dev-java/xpp3/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xpp3/metadata.xml
+++ b/dev-java/xpp3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xsd2jibx/metadata.xml b/dev-java/xsd2jibx/metadata.xml
index bc6fbe14e0bb..6c5c1adbae95 100644
--- a/dev-java/xsd2jibx/metadata.xml
+++ b/dev-java/xsd2jibx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jibx</remote-id>
 	</upstream>
diff --git a/dev-java/xsdlib/metadata.xml b/dev-java/xsdlib/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xsdlib/metadata.xml
+++ b/dev-java/xsdlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xsom/metadata.xml b/dev-java/xsom/metadata.xml
index 250f2d1940ea..1f17adc3a89d 100644
--- a/dev-java/xsom/metadata.xml
+++ b/dev-java/xsom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-java/xstream/metadata.xml b/dev-java/xstream/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/xstream/metadata.xml
+++ b/dev-java/xstream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml
index 1824f19302dd..6aa9f5bd1de3 100644
--- a/dev-java/xz-java/metadata.xml
+++ b/dev-java/xz-java/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/yanfs/metadata.xml b/dev-java/yanfs/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-java/yanfs/metadata.xml
+++ b/dev-java/yanfs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
index 808a4a60d64c..ffd5638b64b3 100644
--- a/dev-java/zemberek/metadata.xml
+++ b/dev-java/zemberek/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
index 92b5efac03a2..6d98d0e0bda2 100644
--- a/dev-java/zeus-jscl/metadata.xml
+++ b/dev-java/zeus-jscl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zeus-jscl</remote-id>
 	</upstream>
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index 1deadcbddd09..1b921ed782af 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   R is GNU S, a system for statistical computation and graphics. It
   consists of a language plus a run-time environment with graphics, a
diff --git a/dev-lang/cfortran/metadata.xml b/dev-lang/cfortran/metadata.xml
index db1151c490fb..b6472016ca8e 100644
--- a/dev-lang/cfortran/metadata.xml
+++ b/dev-lang/cfortran/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   cfortran is a header file to ease bridge between C and FORTRAN. It
   provides an interface  between C and FORTRAN routines and global
diff --git a/dev-lang/cilk/metadata.xml b/dev-lang/cilk/metadata.xml
index 86b18b2b236c..f530ff621a49 100644
--- a/dev-lang/cilk/metadata.xml
+++ b/dev-lang/cilk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Cilk is a language for multithreaded parallel programming based on
   ANSI C. Cilk is especially effective for exploiting dynamic, highly
diff --git a/dev-lang/confluence/metadata.xml b/dev-lang/confluence/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-lang/confluence/metadata.xml
+++ b/dev-lang/confluence/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 7d958c4399b1..88a2d3e4cf4a 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>longlene@gmail.com</email>
 		<name>Lixiao Chen</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Crystal is a programming language that resembles Ruby but compiles to
 		native code and tries to be much more efficient, at the cost of
diff --git a/dev-lang/dmd-bin/metadata.xml b/dev-lang/dmd-bin/metadata.xml
index 8160b30f53e5..36b3feec7e53 100644
--- a/dev-lang/dmd-bin/metadata.xml
+++ b/dev-lang/dmd-bin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lang-misc</herd>
 <longdescription>
   This package provides a binary version of 
   the D language compiler from Digital Mars
diff --git a/dev-lang/ekopath/metadata.xml b/dev-lang/ekopath/metadata.xml
index b78884b8579c..283b19185a15 100644
--- a/dev-lang/ekopath/metadata.xml
+++ b/dev-lang/ekopath/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
 <maintainer>
   <email>mgorny@gentoo.org</email>
   <name>Michał Górny</name>
   <description>Co-maintainer</description>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   The PathScale EKOPath Compiler Suite offers programmers a rich set of tools and 
   one of the world's most sophisticated optimization infrastructures to maximize 
diff --git a/dev-lang/epic/metadata.xml b/dev-lang/epic/metadata.xml
index b242285af822..f41fe6da3404 100644
--- a/dev-lang/epic/metadata.xml
+++ b/dev-lang/epic/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index b78c5d38c90e..a5361fe96676 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lang-misc</herd>
 <maintainer>
 <email>djc@gentoo.org</email>
 <name>Dirkjan Ochtman</name>
diff --git a/dev-lang/f2c/metadata.xml b/dev-lang/f2c/metadata.xml
index adca89fcd3f8..ed162edeaf24 100644
--- a/dev-lang/f2c/metadata.xml
+++ b/dev-lang/f2c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   F2C compiles FORTRAN 77 sources by converting to C/C++ sources and
   compiling the later with gcc. The resulting binaries depend on the
diff --git a/dev-lang/falcon/metadata.xml b/dev-lang/falcon/metadata.xml
index 6318a491915d..097975e3adc2 100644
--- a/dev-lang/falcon/metadata.xml
+++ b/dev-lang/falcon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 </pkgmetadata>
diff --git a/dev-lang/fpc/metadata.xml b/dev-lang/fpc/metadata.xml
index b2e0e1884e31..bb02cb8add6c 100644
--- a/dev-lang/fpc/metadata.xml
+++ b/dev-lang/fpc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 	<use>
 		<flag name="ide">Build and install the Free Pascal Compiler IDE</flag>
 	</use>
diff --git a/dev-lang/fsharp/metadata.xml b/dev-lang/fsharp/metadata.xml
index 1740437050d0..447251b71a66 100644
--- a/dev-lang/fsharp/metadata.xml
+++ b/dev-lang/fsharp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription>
 		Mono/.NET open-source, strongly typed, multi-paradigm programming language encompassing functional, imperative and object-oriented programming techniques. Most often used as a cross-platform CLI language.
 	</longdescription>
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index 8b80e5e849de..133f5545a3a1 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   A free IDL (Interactive Data Language) compatible incremental compiler
   (ie. runs IDL programs). IDL is a registered trademark of ITT Visual 
diff --git a/dev-lang/gforth/metadata.xml b/dev-lang/gforth/metadata.xml
index e0c579bfd1d7..a058c45bbfeb 100644
--- a/dev-lang/gforth/metadata.xml
+++ b/dev-lang/gforth/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-  <maintainer>
+<maintainer>
     <email>carsten@strotmann.de</email>
     <name>Carsten Strotmann</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/ghc/metadata.xml b/dev-lang/ghc/metadata.xml
index 05bff5b45c46..9bb1fefcd974 100644
--- a/dev-lang/ghc/metadata.xml
+++ b/dev-lang/ghc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Install the binary version directly, rather than using it to build the source version.</flag>
 		<flag name="ghcbootstrap">Bootstrap from an existing GHC installation.</flag>
diff --git a/dev-lang/gnat-gcc/metadata.xml b/dev-lang/gnat-gcc/metadata.xml
index 0e96d8b594ec..047720a2afba 100644
--- a/dev-lang/gnat-gcc/metadata.xml
+++ b/dev-lang/gnat-gcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+    <email>ada@gentoo.org</email>
+    <name>Gentoo Resources for Ada</name>
+  </maintainer>
   <use>
     <flag name="lto">Add support for link-time optimizations (unsupported, use
       at your own risk).</flag>
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 75cf5c42edb4..7a02374f0c58 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 <longdescription>
 GNAT, the (GN)U (A)da (T)oolchain, is a high performance Ada 95
 development environment based on the mature GCC compiler technology. It
diff --git a/dev-lang/gprolog/metadata.xml b/dev-lang/gprolog/metadata.xml
index 1990bb86aace..09f5c6107ad6 100644
--- a/dev-lang/gprolog/metadata.xml
+++ b/dev-lang/gprolog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prolog</herd>
+<maintainer>
+	<email>prolog@gentoo.org</email>
+	<name>Prolog</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/helium/metadata.xml b/dev-lang/helium/metadata.xml
index ddb2b453cd1f..320f819da1e3 100644
--- a/dev-lang/helium/metadata.xml
+++ b/dev-lang/helium/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml
index 399b3f6d9edd..ec2180988635 100644
--- a/dev-lang/icc/metadata.xml
+++ b/dev-lang/icc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Intel® C++ Compiler is a full featured C/C++ compiler for Intel
   based architectures. The compiler supports multi-threading, automatic
diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml
index 69edcf2f577f..e659cbb78d8c 100644
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lang-misc</herd>
 <use><flag name="iplsrc">install the icon programming library source</flag></use>
 </pkgmetadata>
diff --git a/dev-lang/idb/metadata.xml b/dev-lang/idb/metadata.xml
index 18a2b8e270dd..29a46beac52c 100644
--- a/dev-lang/idb/metadata.xml
+++ b/dev-lang/idb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Intel® Debugger is a command line debugger for Intel based
   architectures. It is well suited with the Intel C++ or Intel FORTRAN
diff --git a/dev-lang/ifc/metadata.xml b/dev-lang/ifc/metadata.xml
index 8fd3709b9708..5d587d8f91ab 100644
--- a/dev-lang/ifc/metadata.xml
+++ b/dev-lang/ifc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Intel® Fortran Compiler is a full featured FORTRAN 77/95 and
   substantial FORTRAN 2003 compiler for Intel based architectures. The
diff --git a/dev-lang/inform/metadata.xml b/dev-lang/inform/metadata.xml
index d3e2854ee365..2321964faf47 100644
--- a/dev-lang/inform/metadata.xml
+++ b/dev-lang/inform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+ </maintainer>
  <longdescription>
 A Design System for Interactive Fiction
 
diff --git a/dev-lang/interprolog/metadata.xml b/dev-lang/interprolog/metadata.xml
index 1990bb86aace..09f5c6107ad6 100644
--- a/dev-lang/interprolog/metadata.xml
+++ b/dev-lang/interprolog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prolog</herd>
+<maintainer>
+	<email>prolog@gentoo.org</email>
+	<name>Prolog</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index f0384bcaa091..1378f5d356e7 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -5,7 +5,10 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Julia is a high-level, high-performance dynamic programming language for
   technical computing, with syntax that is familiar to users of other
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index f370d2ad4395..7640cd437eb1 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 	<longdescription lang="en">
 		A Borland Delphi lookalike for linux.
 		Uses the free pascal compiler.
diff --git a/dev-lang/logtalk/metadata.xml b/dev-lang/logtalk/metadata.xml
index ba56af5289ae..d21753a65a4c 100644
--- a/dev-lang/logtalk/metadata.xml
+++ b/dev-lang/logtalk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prolog</herd>
+<maintainer>
+	<email>prolog@gentoo.org</email>
+	<name>Prolog</name>
+</maintainer>
 <use>
 	<flag name="gnupl">Support GNU Prolog back-end compiler</flag>
 	<flag name="qupl">Support Qu-Prolog back-end compiler</flag>
diff --git a/dev-lang/maude/metadata.xml b/dev-lang/maude/metadata.xml
index 5884f5601dd3..55df0afcf71d 100644
--- a/dev-lang/maude/metadata.xml
+++ b/dev-lang/maude/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   Maude is a high-performance reflective language and system supporting
   both equational and rewriting logic specification and programming for a
diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml
index 60c86a1e2b36..d00d75929bba 100644
--- a/dev-lang/mlton/metadata.xml
+++ b/dev-lang/mlton/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<use>
 		<flag name="binary">install a binary version (need to do this once to bootstrap, until smlnj is supported)</flag>
 	</use>
diff --git a/dev-lang/moarvm/metadata.xml b/dev-lang/moarvm/metadata.xml
index 001b40148f5e..0595a720f44a 100644
--- a/dev-lang/moarvm/metadata.xml
+++ b/dev-lang/moarvm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">MoarVM/MoarVM</remote-id>
   </upstream>
diff --git a/dev-lang/mono-basic/metadata.xml b/dev-lang/mono-basic/metadata.xml
index b678a425f91a..b7892f191733 100644
--- a/dev-lang/mono-basic/metadata.xml
+++ b/dev-lang/mono-basic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Visual Basic .NET compiler and runtime
 	</longdescription>
diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index 91e40e84f16e..a6509a42c69f 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 <use>
 	<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name="xen">Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml
index bc25fd7bfc0b..fb6fdba7339c 100644
--- a/dev-lang/nqp/metadata.xml
+++ b/dev-lang/nqp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="parrot">Build the parrot backend (default)</flag>
     <flag name="moar">Build the MoarVM backend (experimental/broken)</flag>
diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-lang/ocaml/metadata.xml
+++ b/dev-lang/ocaml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/orc/metadata.xml b/dev-lang/orc/metadata.xml
index e8002d55e057..8002470600c4 100644
--- a/dev-lang/orc/metadata.xml
+++ b/dev-lang/orc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+  <email>gstreamer@gentoo.org</email>
+  <name>GStreamer package maintainers</name>
+</maintainer>
 <use>
   <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
 </use>
diff --git a/dev-lang/parrot/metadata.xml b/dev-lang/parrot/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-lang/parrot/metadata.xml
+++ b/dev-lang/parrot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/perl/metadata.xml b/dev-lang/perl/metadata.xml
index 50e60f019f51..bb0b74d4164a 100644
--- a/dev-lang/perl/metadata.xml
+++ b/dev-lang/perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<use>
 		<flag name="ithreads">Enable Perl threads, has some compatibility problems</flag>
 	</use>
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 395f6b538cf7..83ecdfabc923 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Enable CLI SAPI</flag>
 		<flag name="embed">Enable embed SAPI</flag>
diff --git a/dev-lang/polyml/metadata.xml b/dev-lang/polyml/metadata.xml
index c81bfbd6eeee..370caed95ebf 100644
--- a/dev-lang/polyml/metadata.xml
+++ b/dev-lang/polyml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Poly/ML is a full implementation of Standard ML available as open-source.
 </longdescription>
diff --git a/dev-lang/python-exec/metadata.xml b/dev-lang/python-exec/metadata.xml
index c8cac33a5df4..13ec19e0aaa0 100644
--- a/dev-lang/python-exec/metadata.xml
+++ b/dev-lang/python-exec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>mgorny@gentoo.org</email>
diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
index 51a9e80800ad..0cf856d2fcfb 100644
--- a/dev-lang/python/metadata.xml
+++ b/dev-lang/python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <use>
 	<flag name="threads">Enable threading support. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
 	<flag name="wide-unicode">Enable wide Unicode implementation which uses 4-byte Unicode characters. Switching of this USE flag changes ABI of Python and requires reinstallation of many Python modules. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
diff --git a/dev-lang/qu-prolog/metadata.xml b/dev-lang/qu-prolog/metadata.xml
index 9708914df07f..37f80b077a51 100644
--- a/dev-lang/qu-prolog/metadata.xml
+++ b/dev-lang/qu-prolog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prolog</herd>
+  <maintainer>
+    <email>prolog@gentoo.org</email>
+    <name>Prolog</name>
+  </maintainer>
   <use>
     <flag name="pedro">Pedro subscription/notification communications system</flag>
   </use>
diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml
index 0e57a6b15f11..fa2d5218168f 100644
--- a/dev-lang/rakudo/metadata.xml
+++ b/dev-lang/rakudo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+        <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+        </maintainer>
         <use>
         <flag name="parrot">Build the parrot backend (default)</flag> 
 	<flag name="moar">Build the MoarVM backend (experimental)</flag>
diff --git a/dev-lang/rubinius/metadata.xml b/dev-lang/rubinius/metadata.xml
index dc6c83f06b82..cfdb67418d14 100644
--- a/dev-lang/rubinius/metadata.xml
+++ b/dev-lang/rubinius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="llvm">
       Build with llvm. Currently the package only builds against old versions of llvm.
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 312287f02d28..c755a8754877 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="rubytests">
       Install ruby tests that can only be run after ruby is installed
diff --git a/dev-lang/scala-bin/metadata.xml b/dev-lang/scala-bin/metadata.xml
index 68b30527c024..01ad1fbd1574 100644
--- a/dev-lang/scala-bin/metadata.xml
+++ b/dev-lang/scala-bin/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+<maintainer>
+	  <email>java@gentoo.org</email>
+	  <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
index 50b86cb0266c..c82eb66d5f09 100644
--- a/dev-lang/scala/metadata.xml
+++ b/dev-lang/scala/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag>
 	</use>
diff --git a/dev-lang/smlnj/metadata.xml b/dev-lang/smlnj/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-lang/smlnj/metadata.xml
+++ b/dev-lang/smlnj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml
index 80d2507cd7d2..b5e799f0815d 100644
--- a/dev-lang/spidermonkey/metadata.xml
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mozilla</herd>
+	<maintainer>
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
 	<longdescription lang="en">
 		Stand-alone JavaScript C library
 	</longdescription>
diff --git a/dev-lang/swi-prolog/metadata.xml b/dev-lang/swi-prolog/metadata.xml
index 88333bfa6e85..69c37d4d4e69 100644
--- a/dev-lang/swi-prolog/metadata.xml
+++ b/dev-lang/swi-prolog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prolog</herd>
+<maintainer>
+	<email>prolog@gentoo.org</email>
+	<name>Prolog</name>
+</maintainer>
 <use>
 	<flag name="archive">Use libarchive for extension packs</flag>
 	<flag name="uuid">Use ossp-uuid for UUID pack</flag>
diff --git a/dev-lang/swig/metadata.xml b/dev-lang/swig/metadata.xml
index 4104001f76e7..38fba1d61d3c 100644
--- a/dev-lang/swig/metadata.xml
+++ b/dev-lang/swig/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>pchrist@gentoo.org</email>
 		<name>Panagiotis Christopoulos</name>
@@ -13,6 +12,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages. SWIG is used with different	types of languages including common scripting languages such as Perl, Python, Tcl/Tk and Ruby. The list of supported languages also includes non-scripting languages such as C#, Common Lisp (Allegro CL), Java, Modula-3 and OCAML. Also several interpreted and compiled Scheme implementations (Chicken, Guile, MzScheme) are supported.
 	</longdescription>
diff --git a/dev-lang/tcc/metadata.xml b/dev-lang/tcc/metadata.xml
index f376edc581d2..097975e3adc2 100644
--- a/dev-lang/tcc/metadata.xml
+++ b/dev-lang/tcc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lang-misc</herd>
 </pkgmetadata>
diff --git a/dev-lang/tcl/metadata.xml b/dev-lang/tcl/metadata.xml
index 99ace7c4062a..7d0cc0375323 100644
--- a/dev-lang/tcl/metadata.xml
+++ b/dev-lang/tcl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
 	<maintainer>
 		<email>tcltk@gentoo.org</email>
 		<description>TCL/TK Herd.</description>
diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml
index 6aece7ec2ee6..76bcf5841f17 100644
--- a/dev-lang/tk/metadata.xml
+++ b/dev-lang/tk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcl</remote-id>
 	</upstream>
diff --git a/dev-lang/tuprolog/metadata.xml b/dev-lang/tuprolog/metadata.xml
index 7e53cf044c83..3d9105cbe69a 100644
--- a/dev-lang/tuprolog/metadata.xml
+++ b/dev-lang/tuprolog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prolog</herd>
+	<maintainer>
+		<email>prolog@gentoo.org</email>
+		<name>Prolog</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tuprolog</remote-id>
 	</upstream>
diff --git a/dev-lang/vala/metadata.xml b/dev-lang/vala/metadata.xml
index 04928dda5ee4..aa131d0b02fc 100644
--- a/dev-lang/vala/metadata.xml
+++ b/dev-lang/vala/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
 	<flag name="vapigen">Enable vala's library binding generator</flag>
   </use>
diff --git a/dev-lang/whitespace/metadata.xml b/dev-lang/whitespace/metadata.xml
index 57991c68fe70..e9eff7ddd51e 100644
--- a/dev-lang/whitespace/metadata.xml
+++ b/dev-lang/whitespace/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>yac@gentoo.org</email>
 		<name>Jan Matejka</name>
 	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-lang/xsb/metadata.xml b/dev-lang/xsb/metadata.xml
index 1a3e7c07d1ff..e2141ef1f6b0 100644
--- a/dev-lang/xsb/metadata.xml
+++ b/dev-lang/xsb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prolog</herd>
+	<maintainer>
+		<email>prolog@gentoo.org</email>
+		<name>Prolog</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xsb</remote-id>
 	</upstream>
diff --git a/dev-lang/yap/metadata.xml b/dev-lang/yap/metadata.xml
index f68e980f3d50..f1b874308027 100644
--- a/dev-lang/yap/metadata.xml
+++ b/dev-lang/yap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prolog</herd>
+<maintainer>
+	<email>prolog@gentoo.org</email>
+	<name>Prolog</name>
+</maintainer>
 <use>
 	<flag name="R">Enable support for connecting R to Prolog</flag>
 </use>
diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml
index eb72a8082544..592813af4ad9 100644
--- a/dev-lang/yasm/metadata.xml
+++ b/dev-lang/yasm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/DFB++/metadata.xml b/dev-libs/DFB++/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/dev-libs/DFB++/metadata.xml
+++ b/dev-libs/DFB++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
index 4145b8688eca..668681eec0d2 100644
--- a/dev-libs/DirectFB/metadata.xml
+++ b/dev-libs/DirectFB/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 		DirectFB is a thin library that provides hardware graphics
 		acceleration, input device handling and abstraction, integrated
diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index 8a5655080a27..1d520cb3e1f4 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
 	<maintainer>
 		<email>cpp@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/MicroJSON/metadata.xml b/dev-libs/MicroJSON/metadata.xml
index 65cbd1fbe688..b0a8fc78bf7a 100644
--- a/dev-libs/MicroJSON/metadata.xml
+++ b/dev-libs/MicroJSON/metadata.xml
@@ -6,7 +6,10 @@
     <name>Gorelov Grigory</name>
     <description>Maintainer and upstream developer.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Small and simple to use JSON generation and parsing library.
   </longdescription>
diff --git a/dev-libs/STLport/metadata.xml b/dev-libs/STLport/metadata.xml
index aa3ea990d7c0..4c17a73ca841 100644
--- a/dev-libs/STLport/metadata.xml
+++ b/dev-libs/STLport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="boost">Enable the usage of <pkg>dev-libs/boost</pkg></flag>
 	</use>
diff --git a/dev-libs/UTF8Strings/metadata.xml b/dev-libs/UTF8Strings/metadata.xml
index eec867603cf2..092cd38416c5 100644
--- a/dev-libs/UTF8Strings/metadata.xml
+++ b/dev-libs/UTF8Strings/metadata.xml
@@ -6,7 +6,10 @@
     <name>Gorelov Grigory</name>
     <description>Maintainer and upstream developer.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     C++ library that provides ability to work natively with UTF8 strings in a very simple way.
   </longdescription>
diff --git a/dev-libs/ace/metadata.xml b/dev-libs/ace/metadata.xml
index 7c11e3649258..357b0e311567 100644
--- a/dev-libs/ace/metadata.xml
+++ b/dev-libs/ace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+  <email>cpp@gentoo.org</email>
+  <name>Gentoo C++ Project</name>
+</maintainer>
 <use>
   <flag name="ciao">Include Component Intergraced Ace ORB into the build of
     ace</flag>
diff --git a/dev-libs/appstream-glib/metadata.xml b/dev-libs/appstream-glib/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/appstream-glib/metadata.xml
+++ b/dev-libs/appstream-glib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/asyncresolv/metadata.xml b/dev-libs/asyncresolv/metadata.xml
index 89b71d925d27..fb315e3fca6e 100644
--- a/dev-libs/asyncresolv/metadata.xml
+++ b/dev-libs/asyncresolv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">asyncresolv</remote-id>
 	</upstream>
diff --git a/dev-libs/atk/metadata.xml b/dev-libs/atk/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/dev-libs/atk/metadata.xml
+++ b/dev-libs/atk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml
index f6d8c23e83d0..77784e85a962 100644
--- a/dev-libs/bitset/metadata.xml
+++ b/dev-libs/bitset/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
 		<flag name="tcmalloc">Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations</flag>
diff --git a/dev-libs/blitz/metadata.xml b/dev-libs/blitz/metadata.xml
index bbedddcd0e73..29db40304e4e 100644
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
 	<maintainer>
 		<email>bicatali@gentoo.org</email>
 		<description>feel free to fix/update</description>
 	</maintainer>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Blitz++ is a meta-template library for array
   manipulation in C++ with a speed comparable to Fortran
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 6a63ade407e7..12bd9da54c9d 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="context">
       Build and install the Boost.Context library and all other 
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index b639324ed94e..7204790723b0 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>lloyd@randombit.net</email>
     <name>Jack Lloyd </name>
     <description>Ebuild contributor and botan author</description>
 </maintainer>
+<maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+</maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
 </use>
diff --git a/dev-libs/btparse/metadata.xml b/dev-libs/btparse/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-libs/btparse/metadata.xml
+++ b/dev-libs/btparse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/btparser/metadata.xml b/dev-libs/btparser/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/btparser/metadata.xml
+++ b/dev-libs/btparser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/c-blosc/metadata.xml b/dev-libs/c-blosc/metadata.xml
index 873eced15208..6c1b83415686 100644
--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Blosc is a compression library designed to transmit data to the
   processor cache faster than the traditional non-compressed memory fetch. 
diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
index d5c4c3cd160e..927b724884b2 100644
--- a/dev-libs/cgicc/metadata.xml
+++ b/dev-libs/cgicc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription lang="en">
 GNU cgicc is an ANSI C++ compliant class library that greatly
 simplifies the creation of CGI applications for the World Wide
diff --git a/dev-libs/cgilib/metadata.xml b/dev-libs/cgilib/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/dev-libs/cgilib/metadata.xml
+++ b/dev-libs/cgilib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/clearsilver/metadata.xml b/dev-libs/clearsilver/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/dev-libs/clearsilver/metadata.xml
+++ b/dev-libs/clearsilver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/cloog/metadata.xml b/dev-libs/cloog/metadata.xml
index 24428f7f4d1a..bf24a593ff3a 100644
--- a/dev-libs/cloog/metadata.xml
+++ b/dev-libs/cloog/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
 	<maintainer>
 		<email>toolchain@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/console_bridge/metadata.xml b/dev-libs/console_bridge/metadata.xml
index 1afb1e1800de..b1d7cac01896 100644
--- a/dev-libs/console_bridge/metadata.xml
+++ b/dev-libs/console_bridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ros</herd>
+  <maintainer>
+    <email>ros@gentoo.org</email>
+    <name>Gentoo ROS Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ros/console_bridge</remote-id>
   </upstream>
diff --git a/dev-libs/crossguid/metadata.xml b/dev-libs/crossguid/metadata.xml
index 462401dd2172..7a69a40eb4cf 100644
--- a/dev-libs/crossguid/metadata.xml
+++ b/dev-libs/crossguid/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xbox</herd>
+<maintainer>
+	<email>vapier@gentoo.org</email>
+</maintainer>
 <upstream>
 	<remote-id type="github">graeme-hill/crossguid</remote-id>
 </upstream>
diff --git a/dev-libs/cryptlib/metadata.xml b/dev-libs/cryptlib/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/cryptlib/metadata.xml
+++ b/dev-libs/cryptlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml
index a7483fddbd80..88623c95c128 100644
--- a/dev-libs/crypto++/metadata.xml
+++ b/dev-libs/crypto++/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cryptopp</remote-id>
 	</upstream>
diff --git a/dev-libs/cvector/metadata.xml b/dev-libs/cvector/metadata.xml
index b85f98e6bb05..2b0fbb2642dd 100644
--- a/dev-libs/cvector/metadata.xml
+++ b/dev-libs/cvector/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>sci@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/cxxtools/metadata.xml b/dev-libs/cxxtools/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/dev-libs/cxxtools/metadata.xml
+++ b/dev-libs/cxxtools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/dev-libs/cygwin/metadata.xml b/dev-libs/cygwin/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-libs/cygwin/metadata.xml
+++ b/dev-libs/cygwin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-imap-dev/metadata.xml b/dev-libs/cyrus-imap-dev/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/dev-libs/cyrus-imap-dev/metadata.xml
+++ b/dev-libs/cyrus-imap-dev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index a3cf1dee6af6..d249f479e6b5 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <use>
   <flag name="authdaemond">Add Courier-IMAP authdaemond unix socket
     support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
diff --git a/dev-libs/d0_blind_id/metadata.xml b/dev-libs/d0_blind_id/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-libs/d0_blind_id/metadata.xml
+++ b/dev-libs/d0_blind_id/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/darts/metadata.xml b/dev-libs/darts/metadata.xml
index 2b9413a4279f..1529d2aba036 100644
--- a/dev-libs/darts/metadata.xml
+++ b/dev-libs/darts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>cpp</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/dbus-glib/metadata.xml b/dev-libs/dbus-glib/metadata.xml
index 1e26d76c79f5..9a8c724e0b87 100644
--- a/dev-libs/dbus-glib/metadata.xml
+++ b/dev-libs/dbus-glib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/dev-libs/dee/metadata.xml b/dev-libs/dee/metadata.xml
index 41e304f441d9..f727093552a4 100644
--- a/dev-libs/dee/metadata.xml
+++ b/dev-libs/dee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">dee</remote-id>
 	</upstream>
diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml
index eff24b2d008e..7f6ebadc057b 100644
--- a/dev-libs/ding-libs/metadata.xml
+++ b/dev-libs/ding-libs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -12,4 +11,8 @@
 	<name>Maxim Koltsov</name>
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/dotconf/metadata.xml b/dev-libs/dotconf/metadata.xml
index f7b66d2f7a9d..604a87838abf 100644
--- a/dev-libs/dotconf/metadata.xml
+++ b/dev-libs/dotconf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
 <maintainer>
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index 6b4f010d7c4a..70729c48e378 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This library consists of efficient conversion routines that have
   been extracted from the V8 JavaScript engine. The code has been
diff --git a/dev-libs/e_dbus/metadata.xml b/dev-libs/e_dbus/metadata.xml
index d136264acd4e..709648204476 100644
--- a/dev-libs/e_dbus/metadata.xml
+++ b/dev-libs/e_dbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="bluetooth">Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API</flag>
 	<flag name="ofono">Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API</flag>
diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index a6bc2952724d..af4e421f71e1 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="ares">Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
 	<flag name="gles">Add gles support to the ecore-evas-wayland module</flag>
diff --git a/dev-libs/eet/metadata.xml b/dev-libs/eet/metadata.xml
index 74563a36db2a..59ccd709b6d3 100644
--- a/dev-libs/eet/metadata.xml
+++ b/dev-libs/eet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <longdescription>
 EET is a tiny library designed to write an arbitary set of chunks of data to a file 
 and optionally compress each chunk (very much like a zip file) and allow fast 
diff --git a/dev-libs/eeze/metadata.xml b/dev-libs/eeze/metadata.xml
index ae1804c22300..28dd8c02c904 100644
--- a/dev-libs/eeze/metadata.xml
+++ b/dev-libs/eeze/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="utilities">Install some test utilities for mount/umount support in eeze</flag>
 </use>
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 097865ae9c00..aab1f92a2974 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="bmp">Enable WBMP image loader</flag>
 	<flag name="drm">Enable DRM engine</flag>
diff --git a/dev-libs/efreet/metadata.xml b/dev-libs/efreet/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-libs/efreet/metadata.xml
+++ b/dev-libs/efreet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/eina/metadata.xml b/dev-libs/eina/metadata.xml
index 3e92977173ed..d2820add752e 100644
--- a/dev-libs/eina/metadata.xml
+++ b/dev-libs/eina/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="mempool-buddy">Compile 'buddy' memory pool allocation</flag>
 	<flag name="mempool-chained-pool">Compile 'chained-pool' memory pool allocation</flag>
diff --git a/dev-libs/eio/metadata.xml b/dev-libs/eio/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-libs/eio/metadata.xml
+++ b/dev-libs/eio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 6d5bc382fd7a..97eb49d358a6 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<use>
 		<flag name="lzma">Support automatic decompression of LZMA-compressed files and kernel images</flag>
 		<flag name="threads">Build the libraries with thread safe support</flag>
diff --git a/dev-libs/embryo/metadata.xml b/dev-libs/embryo/metadata.xml
index d75dabcf86ba..2b46677ccb82 100644
--- a/dev-libs/embryo/metadata.xml
+++ b/dev-libs/embryo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <longdescription>
 Embryo is primarily a shared library that gives you an API to load and control
 interpredted programs compiled into the abstract machine bytecode that it
diff --git a/dev-libs/engine_pkcs11/metadata.xml b/dev-libs/engine_pkcs11/metadata.xml
index 9682e47bb258..4ea7fb342876 100644
--- a/dev-libs/engine_pkcs11/metadata.xml
+++ b/dev-libs/engine_pkcs11/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>
 		engine_pkcs11 is an implementation of an engine for OpenSSL.
 	</longdescription>
diff --git a/dev-libs/expat/metadata.xml b/dev-libs/expat/metadata.xml
index 38f9001688cf..ca2a52825a40 100644
--- a/dev-libs/expat/metadata.xml
+++ b/dev-libs/expat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+		<name>Gentoo Freedesktop Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libexpat:expat</remote-id>
 		<remote-id type="sourceforge">expat</remote-id>
diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 748ee49402a9..8baa35426e58 100644
--- a/dev-libs/fampp2/metadata.xml
+++ b/dev-libs/fampp2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
 	</use>
diff --git a/dev-libs/ferrisloki/metadata.xml b/dev-libs/ferrisloki/metadata.xml
index d19658856e1e..8a7e0369cc6c 100644
--- a/dev-libs/ferrisloki/metadata.xml
+++ b/dev-libs/ferrisloki/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+  <email>cpp@gentoo.org</email>
+  <name>Gentoo C++ Project</name>
+</maintainer>
 <use>
   <flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
 </use>
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index 682c32415814..2b09015a8ed9 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
diff --git a/dev-libs/freexl/metadata.xml b/dev-libs/freexl/metadata.xml
index 3190fbf9c377..203359d7bee8 100644
--- a/dev-libs/freexl/metadata.xml
+++ b/dev-libs/freexl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/g-wrap/metadata.xml b/dev-libs/g-wrap/metadata.xml
index c8d5dd1b2a4e..a9e72bc1fe76 100644
--- a/dev-libs/g-wrap/metadata.xml
+++ b/dev-libs/g-wrap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 G-Wrap is a tool (and Guile library) for generating function wrappers for inter-language calls. It currently only supports generating Guile wrappers for C functions.
 	</longdescription>
diff --git a/dev-libs/gdl/metadata.xml b/dev-libs/gdl/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gdl/metadata.xml
+++ b/dev-libs/gdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
index 3b26dceb6f19..fe65a007727d 100644
--- a/dev-libs/geoip/metadata.xml
+++ b/dev-libs/geoip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">maxmind/geoip-api-c</remote-id>
   </upstream>
diff --git a/dev-libs/gf-complete/metadata.xml b/dev-libs/gf-complete/metadata.xml
index 4d820980847a..ca21ac028d72 100644
--- a/dev-libs/gf-complete/metadata.xml
+++ b/dev-libs/gf-complete/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+<maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/gf2x/metadata.xml b/dev-libs/gf2x/metadata.xml
index 65b8fbc6e876..593d2604a24a 100644
--- a/dev-libs/gf2x/metadata.xml
+++ b/dev-libs/gf2x/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   gf2x is a C/C++ software package containing routines for fast
   arithmetic in GF(2)[x] (multiplication, squaring, GCD) and searching
diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/gjs/metadata.xml
+++ b/dev-libs/gjs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 9dda65d6b97c..0a04ffb82764 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
 	<flag name="dbus">Enable dependencies required by glib libraries
 		using dbus service to manage settings saving</flag>
diff --git a/dev-libs/gmime/metadata.xml b/dev-libs/gmime/metadata.xml
index 009ffdab28f8..79928fb0332f 100644
--- a/dev-libs/gmime/metadata.xml
+++ b/dev-libs/gmime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">spruce</remote-id>
 	</upstream>
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index c59de3bde89c..e99d09a18dce 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
 	<flag name="pgo">After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
diff --git a/dev-libs/gnulib/metadata.xml b/dev-libs/gnulib/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/dev-libs/gnulib/metadata.xml
+++ b/dev-libs/gnulib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/gobject-introspection-common/metadata.xml b/dev-libs/gobject-introspection-common/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gobject-introspection-common/metadata.xml
+++ b/dev-libs/gobject-introspection-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/gobject-introspection/metadata.xml b/dev-libs/gobject-introspection/metadata.xml
index d1585c3f58c6..8470084cffc6 100644
--- a/dev-libs/gobject-introspection/metadata.xml
+++ b/dev-libs/gobject-introspection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="doctool">Install g-ir-doc-tool for generating documentation
 		from introspected data</flag>
diff --git a/dev-libs/gom/metadata.xml b/dev-libs/gom/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gom/metadata.xml
+++ b/dev-libs/gom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/grantlee/metadata.xml b/dev-libs/grantlee/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/grantlee/metadata.xml
+++ b/dev-libs/grantlee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/gtx/metadata.xml b/dev-libs/gtx/metadata.xml
index b0d00b8ec527..9411a2c8afcf 100644
--- a/dev-libs/gtx/metadata.xml
+++ b/dev-libs/gtx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription>
 GTX is a small collection of convenience functions intended to enhance the GLib
 testing framework. With specific emphasis on easing the pain of writing test
diff --git a/dev-libs/hidapi/metadata.xml b/dev-libs/hidapi/metadata.xml
index af7f94530f13..3e897ac50573 100644
--- a/dev-libs/hidapi/metadata.xml
+++ b/dev-libs/hidapi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="fox">Build a x11-libs/fox GUI</flag>
   </use>
diff --git a/dev-libs/hyphen/metadata.xml b/dev-libs/hyphen/metadata.xml
index 7cc81f65d94e..436358886ba2 100644
--- a/dev-libs/hyphen/metadata.xml
+++ b/dev-libs/hyphen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hunspell</remote-id>
 	</upstream>
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/icu/metadata.xml
+++ b/dev-libs/icu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/iksemel/metadata.xml b/dev-libs/iksemel/metadata.xml
index e561cde924fa..b31f6fc610f1 100644
--- a/dev-libs/iksemel/metadata.xml
+++ b/dev-libs/iksemel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="google-code">iksemel</remote-id>
 		<remote-id type="github">meduketto/iksemel</remote-id>
diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml
index 8b009d0c00c7..6e7dcc5972b8 100644
--- a/dev-libs/iniparser/metadata.xml
+++ b/dev-libs/iniparser/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
 	<maintainer>
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index 269cea16e45a..3e849d66ef8f 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This package contains the core files to be installed for the Intel
   compilers and libraries. Probably useless if installed standalone.
diff --git a/dev-libs/isl/metadata.xml b/dev-libs/isl/metadata.xml
index e4768647612b..38beb3bdf43f 100644
--- a/dev-libs/isl/metadata.xml
+++ b/dev-libs/isl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
   <maintainer>
     <email>toolchain@gentoo.org</email>
   </maintainer>
diff --git a/dev-libs/jansson/metadata.xml b/dev-libs/jansson/metadata.xml
index 1cec61ffc6d3..19197b237aaa 100644
--- a/dev-libs/jansson/metadata.xml
+++ b/dev-libs/jansson/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>bugs@bergstroem.nu</email>
 	<name>Johan Bergström</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 4a500926ebea..163d51719328 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mozilla</herd>
+	<maintainer>
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
 	<longdescription lang="en">
 		Jemalloc is a general-purpose scalable concurrent allocator
 	</longdescription>
diff --git a/dev-libs/jerasure/metadata.xml b/dev-libs/jerasure/metadata.xml
index 4d820980847a..ca21ac028d72 100644
--- a/dev-libs/jerasure/metadata.xml
+++ b/dev-libs/jerasure/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+<maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
index 3c2c0b88b097..21ca675bbad5 100644
--- a/dev-libs/json-glib/metadata.xml
+++ b/dev-libs/json-glib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription>JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format described by RFC 4627. Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.
 
 JSON-GLib uses GLib native data types and the generic value container GValue for ease of development. It also provides integration with the GObject classes for direct serialization into, and deserialization from, JSON data streams.</longdescription>
diff --git a/dev-libs/judy/metadata.xml b/dev-libs/judy/metadata.xml
index f25238699d1f..479981857bf3 100644
--- a/dev-libs/judy/metadata.xml
+++ b/dev-libs/judy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>qnikst@gentoo.org</email>
 		<name>Alexander Vershilov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">judy</remote-id>
 	</upstream>
diff --git a/dev-libs/klibc/metadata.xml b/dev-libs/klibc/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/dev-libs/klibc/metadata.xml
+++ b/dev-libs/klibc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/dev-libs/kpathsea/metadata.xml b/dev-libs/kpathsea/metadata.xml
index 4c5b18fe19e5..0c43c99fb889 100644
--- a/dev-libs/kpathsea/metadata.xml
+++ b/dev-libs/kpathsea/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/kqoauth/metadata.xml b/dev-libs/kqoauth/metadata.xml
index d5189377d9b8..d4e53894cf41 100644
--- a/dev-libs/kqoauth/metadata.xml
+++ b/dev-libs/kqoauth/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>leechcraft</herd>
   <maintainer>
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>leechcraft@gentoo.org</email>
+    <name>LeechCraft</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kypeli/kQOAuth</remote-id>
   </upstream>
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 16d6745c22cf..585ea499f3cb 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>bugs@bergstroem.nu</email>
     <name>Johan Bergstroem</name>
@@ -10,6 +9,10 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="snappy">support the snappy compression library</flag>
   </use>
diff --git a/dev-libs/libIDL/metadata.xml b/dev-libs/libIDL/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libIDL/metadata.xml
+++ b/dev-libs/libIDL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index c679f8767539..53f473d51c1c 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gokturk@binghamton.edu</email>
     <name>Gokturk Yuksek</name>
     <description>Primary Maintainer, Assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
  support for Linux (needs kernel patches as of 2.6.12)</longdescription>
   <upstream>
diff --git a/dev-libs/libappindicator/metadata.xml b/dev-libs/libappindicator/metadata.xml
index 0bf274070abc..c5b824f39f57 100644
--- a/dev-libs/libappindicator/metadata.xml
+++ b/dev-libs/libappindicator/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ayatana</herd>
 	<maintainer>
 		<email>ayatana-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/libassuan/metadata.xml b/dev-libs/libassuan/metadata.xml
index 5105fdad42ee..5a7f1ffb09bd 100644
--- a/dev-libs/libassuan/metadata.xml
+++ b/dev-libs/libassuan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription>
 In an ideal world, Assuan is irrelevant.  Assuan's primary use is to
 allow a client to interact with a non-persistent server.  Using Assuan,
diff --git a/dev-libs/libatasmart/metadata.xml b/dev-libs/libatasmart/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/dev-libs/libatasmart/metadata.xml
+++ b/dev-libs/libatasmart/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/dev-libs/libatomic_ops/metadata.xml b/dev-libs/libatomic_ops/metadata.xml
index 45883ebb6e92..bced81ff4003 100644
--- a/dev-libs/libatomic_ops/metadata.xml
+++ b/dev-libs/libatomic_ops/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ivmai/libatomic_ops</remote-id>
   </upstream>
diff --git a/dev-libs/libattica/metadata.xml b/dev-libs/libattica/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/dev-libs/libattica/metadata.xml
+++ b/dev-libs/libattica/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libbegemot/metadata.xml b/dev-libs/libbegemot/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/dev-libs/libbegemot/metadata.xml
+++ b/dev-libs/libbegemot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libbrahe/metadata.xml b/dev-libs/libbrahe/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libbrahe/metadata.xml
+++ b/dev-libs/libbrahe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/dev-libs/libbsd/metadata.xml
+++ b/dev-libs/libbsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libbson/metadata.xml b/dev-libs/libbson/metadata.xml
index de62fb54a58c..38608d314ae3 100644
--- a/dev-libs/libbson/metadata.xml
+++ b/dev-libs/libbson/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>ultrabug@gentoo.org</email>
     <name>Ultrabug</name>
@@ -11,6 +10,10 @@
     <name>Johan Bergström</name>
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">A BSON utility library.</longdescription>
   <upstream>
     <remote-id type="github">mongodb/libbson</remote-id>
diff --git a/dev-libs/libbulletml/metadata.xml b/dev-libs/libbulletml/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-libs/libbulletml/metadata.xml
+++ b/dev-libs/libbulletml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libburn/metadata.xml b/dev-libs/libburn/metadata.xml
index 3bdc33646cf4..ee77ae197ae2 100644
--- a/dev-libs/libburn/metadata.xml
+++ b/dev-libs/libburn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <maintainer>
 <email>billie@gentoo.org</email>
 <name>Daniel Pielmeier</name>
diff --git a/dev-libs/libcdio-paranoia/metadata.xml b/dev-libs/libcdio-paranoia/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/libcdio-paranoia/metadata.xml
+++ b/dev-libs/libcdio-paranoia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libcdio/metadata.xml b/dev-libs/libcdio/metadata.xml
index 4c3108f98b0d..e8a90f062cae 100644
--- a/dev-libs/libcdio/metadata.xml
+++ b/dev-libs/libcdio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="minimal">
     Only build the libcdio library and little more, just to be used to
diff --git a/dev-libs/libchewing/metadata.xml b/dev-libs/libchewing/metadata.xml
index fa2e6e5c074d..a1bcd53a2964 100644
--- a/dev-libs/libchewing/metadata.xml
+++ b/dev-libs/libchewing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chewing/libchewing</remote-id>
   </upstream>
diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libclc/metadata.xml
+++ b/dev-libs/libclc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index 4c4e44ce9334..728844a485d2 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
@@ -10,4 +9,8 @@
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libcoyotl/metadata.xml b/dev-libs/libcoyotl/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libcoyotl/metadata.xml
+++ b/dev-libs/libcoyotl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libcroco/metadata.xml b/dev-libs/libcroco/metadata.xml
index 3960e8e41fa6..1deb76fd6e50 100644
--- a/dev-libs/libcroco/metadata.xml
+++ b/dev-libs/libcroco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
 The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit that can be used by GNOME applications in need of CSS support.
 
diff --git a/dev-libs/libdbusmenu-qt/metadata.xml b/dev-libs/libdbusmenu-qt/metadata.xml
index 8edeb15eb987..ab2bd0b0e31e 100644
--- a/dev-libs/libdbusmenu-qt/metadata.xml
+++ b/dev-libs/libdbusmenu-qt/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">ubuntu</remote-id>
   </upstream>
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index 85f766a03bc0..fd535c1ae0d2 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>ayatana</herd>
 	<maintainer>
 		<email>ayatana-bugs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gtk" restrict="&gt;=dev-libs/libdbusmenu-12.10.2-r2">Enable support for GTK+2</flag>
 		<flag name="gtk3">Enable support for GTK+3</flag>
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index b740f6f22383..a92de7040e12 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>me@bearsh.org</email>
 		<name>Martin Gysel</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Library for communication with dive computers from various manufacturers.
 	</longdescription>
diff --git a/dev-libs/libdnet/metadata.xml b/dev-libs/libdnet/metadata.xml
index 08918c9b021a..c2c1b38c4ef5 100644
--- a/dev-libs/libdnet/metadata.xml
+++ b/dev-libs/libdnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libdnet</remote-id>
 		<remote-id type="github">dugsong/libdnet</remote-id>
diff --git a/dev-libs/libdnsres/metadata.xml b/dev-libs/libdnsres/metadata.xml
index ea027e94d2a5..f8d70bbe5b62 100644
--- a/dev-libs/libdnsres/metadata.xml
+++ b/dev-libs/libdnsres/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 	Libdnsres provides a non-blocking thread-safe API for resolving DNS names.
 	It requires that your main application is built on top of libevent.
diff --git a/dev-libs/libdshconfig/metadata.xml b/dev-libs/libdshconfig/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/dev-libs/libdshconfig/metadata.xml
+++ b/dev-libs/libdshconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index f8c937125842..8f115fe9680e 100644
--- a/dev-libs/libdynd/metadata.xml
+++ b/dev-libs/libdynd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   LibDyND, a component of the Blaze project, is a C++ library for
   dynamic, multidimensional arrays. It is inspired by NumPy, the
diff --git a/dev-libs/libebml/metadata.xml b/dev-libs/libebml/metadata.xml
index 246a1cfe1e3c..a4dad5850e19 100644
--- a/dev-libs/libebml/metadata.xml
+++ b/dev-libs/libebml/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/dev-libs/libedit/metadata.xml b/dev-libs/libedit/metadata.xml
index b8f8c3c0c90e..22d9b7fb807f 100644
--- a/dev-libs/libedit/metadata.xml
+++ b/dev-libs/libedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 <longdescription>
 GNU Readline is cool, but BSD Readline is cooler :)
 Thus here is libedit by the NetBSD folks!
diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml
index eec0cf1d8c2c..d109659c9630 100644
--- a/dev-libs/libee/metadata.xml
+++ b/dev-libs/libee/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
 	<email>maksbotan@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liberasurecode/metadata.xml b/dev-libs/liberasurecode/metadata.xml
index 7d7429b3c685..75801e15b43f 100644
--- a/dev-libs/liberasurecode/metadata.xml
+++ b/dev-libs/liberasurecode/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">tsg-/liberasurecode</remote-id>
   </upstream>
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 60c7f53239ef..c5570c3e872e 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libevdev/metadata.xml b/dev-libs/libevdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libevdev/metadata.xml
+++ b/dev-libs/libevdev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libevocosm/metadata.xml b/dev-libs/libevocosm/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libevocosm/metadata.xml
+++ b/dev-libs/libevocosm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libexecinfo/metadata.xml b/dev-libs/libexecinfo/metadata.xml
index 1792d802de96..54d5cd37d8ef 100644
--- a/dev-libs/libexecinfo/metadata.xml
+++ b/dev-libs/libexecinfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 <longdescription lang="en">
 	This is a quick-n-dirty BSD licensed clone of backtrace facility found
 	in the GNU libc, mainly intended for porting linuxish code to BSD
diff --git a/dev-libs/libexplain/metadata.xml b/dev-libs/libexplain/metadata.xml
index f88eefb1a68e..dbaaa9f77a7a 100644
--- a/dev-libs/libexplain/metadata.xml
+++ b/dev-libs/libexplain/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libexplain</remote-id>
   </upstream>
diff --git a/dev-libs/libf2c/metadata.xml b/dev-libs/libf2c/metadata.xml
index 30770fe1c088..7c3fcff89b99 100644
--- a/dev-libs/libf2c/metadata.xml
+++ b/dev-libs/libf2c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   A library to conver FORTRAN 77 to C/C++ source code.
 </longdescription>
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 5f8cc7e5a3df..1c9e7fc0bda4 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Compilers for high level languages generate code that follow certain
 		conventions. These conventions are necessary, in part, for separate
diff --git a/dev-libs/libgamin/metadata.xml b/dev-libs/libgamin/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/dev-libs/libgamin/metadata.xml
+++ b/dev-libs/libgamin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/dev-libs/libgaminggear/metadata.xml b/dev-libs/libgaminggear/metadata.xml
index 42ec8f86d101..ccf095796e34 100644
--- a/dev-libs/libgaminggear/metadata.xml
+++ b/dev-libs/libgaminggear/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dpisklov@gmail.com</email>
 		<name>Dmitry Pisklov</name>
 		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libgaminggear</remote-id>
 	</upstream>
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 23cc02d7aad4..78bb0b6e9124 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd restrict="dev-libs/libgcrypt:0">crypto</herd>
 	<maintainer restrict="dev-libs/libgcrypt:11">
 		<email>multilib@gentoo.org</email>
 		<name>gx86-multilib project</name>
 		<description>Maintaining the binary compatibility slot.</description>
 	</maintainer>
+<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 6bd7a63fff64..f5d3d73035c2 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> support</flag>
 </use>
diff --git a/dev-libs/libgee/metadata.xml b/dev-libs/libgee/metadata.xml
index 7293646ec0ce..3219b27d3206 100644
--- a/dev-libs/libgee/metadata.xml
+++ b/dev-libs/libgee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures. 
 </longdescription>
diff --git a/dev-libs/libgit2-glib/metadata.xml b/dev-libs/libgit2-glib/metadata.xml
index a0afca69a125..cb82ff614286 100644
--- a/dev-libs/libgit2-glib/metadata.xml
+++ b/dev-libs/libgit2-glib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+  	<email>gnome@gentoo.org</email>
+  	<name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
   	<flag name="ssh">Enable SSH transport support</flag>
   </use>
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index 780611be23d4..1f249d901339 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
 	</use>
diff --git a/dev-libs/libgringotts/metadata.xml b/dev-libs/libgringotts/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libgringotts/metadata.xml
+++ b/dev-libs/libgringotts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libgudev/metadata.xml b/dev-libs/libgudev/metadata.xml
index 0caa4209786b..e09f625e5cbe 100644
--- a/dev-libs/libgudev/metadata.xml
+++ b/dev-libs/libgudev/metadata.xml
@@ -5,5 +5,8 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<herd>gnome</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-libs/libgusb/metadata.xml b/dev-libs/libgusb/metadata.xml
index 5787e7504aaf..b04dce799f71 100644
--- a/dev-libs/libgusb/metadata.xml
+++ b/dev-libs/libgusb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hughsie/libgusb</remote-id>
   </upstream>
diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml
index e64ea6610adb..cdd508e2dfe1 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag>
 	</use>
diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index 7dc69ce46b28..ba440cf17c79 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 <longdescription lang="en">
 libiconv is a standalone package which implements the iconv() related
 functions as glibc already embed. Libraries and applications needs it
diff --git a/dev-libs/libindicate-qt/metadata.xml b/dev-libs/libindicate-qt/metadata.xml
index 887d1ab3b568..374796515464 100644
--- a/dev-libs/libindicate-qt/metadata.xml
+++ b/dev-libs/libindicate-qt/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>ayatana</herd>
 	<maintainer>
 		<email>ayatana-bugs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">libindicate-qt</remote-id>
 	</upstream>
diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
index 14cb6a728c3b..e4b40e293024 100644
--- a/dev-libs/libindicate/metadata.xml
+++ b/dev-libs/libindicate/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>ayatana</herd>
 	<maintainer>
 		<email>ayatana-bugs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 	</use>
diff --git a/dev-libs/libindicator/metadata.xml b/dev-libs/libindicator/metadata.xml
index 97d25986e74d..13bb290c634a 100644
--- a/dev-libs/libindicator/metadata.xml
+++ b/dev-libs/libindicator/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ayatana</herd>
 	<maintainer>
 		<email>ayatana-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index 42473bf06aa3..3ac4070c0fcf 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libintl/metadata.xml b/dev-libs/libintl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libintl/metadata.xml
+++ b/dev-libs/libintl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libisoburn/metadata.xml b/dev-libs/libisoburn/metadata.xml
index 2a7ab78ef73b..4a6b50940a65 100644
--- a/dev-libs/libisoburn/metadata.xml
+++ b/dev-libs/libisoburn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <maintainer>
 <email>billie@gentoo.org</email>
 <name>Daniel Pielmeier</name>
diff --git a/dev-libs/libisofs/metadata.xml b/dev-libs/libisofs/metadata.xml
index 3923327f830f..581670698a81 100644
--- a/dev-libs/libisofs/metadata.xml
+++ b/dev-libs/libisofs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
 <maintainer>
 <email>billie@gentoo.org</email>
 <name>Daniel Pielmeier</name>
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/libixion/metadata.xml
+++ b/dev-libs/libixion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libjit/metadata.xml b/dev-libs/libjit/metadata.xml
index 9d507edf580b..01bc9f1e34fd 100644
--- a/dev-libs/libjit/metadata.xml
+++ b/dev-libs/libjit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+  <email>dotnet@gentoo.org</email>
+  <name>Gentoo Dotnet Project</name>
+</maintainer>
 <use>
   <flag name="interpreter">Enable the libjit interpreter</flag>
   <flag name="long-double">Enable the use of long double for jit_nfloat</flag>
diff --git a/dev-libs/libksba/metadata.xml b/dev-libs/libksba/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/libksba/metadata.xml
+++ b/dev-libs/libksba/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liblist/metadata.xml b/dev-libs/liblist/metadata.xml
index 34c84d91eed5..cbda8f0829fb 100644
--- a/dev-libs/liblist/metadata.xml
+++ b/dev-libs/liblist/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 2db636027c31..d0fc03621788 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Ultrabug</name>
@@ -11,6 +10,10 @@
 		<name>Thomas D. (Whissi)</name>
 		<description>Proxy-Maintainer, CC. bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="rfc3195">
 			Enables RFC 3195 protocol (aka syslog-reliable) support.
diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml
index eec0cf1d8c2c..d109659c9630 100644
--- a/dev-libs/liblognorm/metadata.xml
+++ b/dev-libs/liblognorm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
 	<email>maksbotan@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liblouis/metadata.xml b/dev-libs/liblouis/metadata.xml
index 2d30215f74d8..97bda8ff160b 100644
--- a/dev-libs/liblouis/metadata.xml
+++ b/dev-libs/liblouis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer>
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">liblouis/liblouis</remote-id>
 	</upstream>
diff --git a/dev-libs/libltdl/metadata.xml b/dev-libs/libltdl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libltdl/metadata.xml
+++ b/dev-libs/libltdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libmal/metadata.xml b/dev-libs/libmal/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/dev-libs/libmal/metadata.xml
+++ b/dev-libs/libmal/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
 </pkgmetadata>
diff --git a/dev-libs/libmateweather/metadata.xml b/dev-libs/libmateweather/metadata.xml
index d2f9020ebfb1..573919207d29 100644
--- a/dev-libs/libmateweather/metadata.xml
+++ b/dev-libs/libmateweather/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mate</herd>
+	<maintainer>
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mate-desktop/libmateweather</remote-id>
 	</upstream>
diff --git a/dev-libs/libmaxminddb/metadata.xml b/dev-libs/libmaxminddb/metadata.xml
index 0c050f93d9a9..c5166c8c1f70 100644
--- a/dev-libs/libmaxminddb/metadata.xml
+++ b/dev-libs/libmaxminddb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">maxmind/libmaxminddb</remote-id>
 	</upstream>
diff --git a/dev-libs/libmcrypt/metadata.xml b/dev-libs/libmcrypt/metadata.xml
index 0549001de3c4..59168343c4b5 100644
--- a/dev-libs/libmcrypt/metadata.xml
+++ b/dev-libs/libmcrypt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mcrypt</remote-id>
 	</upstream>
diff --git a/dev-libs/libmimedir/metadata.xml b/dev-libs/libmimedir/metadata.xml
index 762857812a3c..8e3fb75ee30b 100644
--- a/dev-libs/libmimedir/metadata.xml
+++ b/dev-libs/libmimedir/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<upstream>
 		<remote-id type="sourceforge">libmimedir</remote-id>
 	</upstream>
diff --git a/dev-libs/libmoe/metadata.xml b/dev-libs/libmoe/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/libmoe/metadata.xml
+++ b/dev-libs/libmoe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libnatspec/metadata.xml b/dev-libs/libnatspec/metadata.xml
index 773243d1cf6f..2154a4efd511 100644
--- a/dev-libs/libnatspec/metadata.xml
+++ b/dev-libs/libnatspec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">natspec</remote-id>
 	</upstream>
diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 3b7135cd9f7c..9001c663b30b 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Install development documentation</flag>
 		<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
diff --git a/dev-libs/liboil/metadata.xml b/dev-libs/liboil/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/dev-libs/liboil/metadata.xml
+++ b/dev-libs/liboil/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
index 50bec160f4c9..2ef1ad0feb53 100644
--- a/dev-libs/liboobs/metadata.xml
+++ b/dev-libs/liboobs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lxqt</herd>
+	<maintainer>
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 	<longdescription lang="en">
 		Liboobs is a wrapping library to the System Tools Backends, it will
 		provide easy to access GObjects to system configuration details, like
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libotf/metadata.xml b/dev-libs/libotf/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/dev-libs/libotf/metadata.xml
+++ b/dev-libs/libotf/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index 4330eeef4bae..67cf00ddf938 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>
     Library implementing a small layer on top of PKCS#11 API to make
     using PKCS#11 implementations easier.
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 7c5ad801b1b8..7c75e8f9976c 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="bzip2">
 		Add support for pcregrep command to search within
diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index 1ee0353a4bc6..7f4ca34d3c4f 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="glade">Install the glade catalog</flag>
 		<flag name="python">Build support for loading <pkg>dev-lang/python</pkg>
diff --git a/dev-libs/libpipeline/metadata.xml b/dev-libs/libpipeline/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libpipeline/metadata.xml
+++ b/dev-libs/libpipeline/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libpqxx/metadata.xml b/dev-libs/libpqxx/metadata.xml
index dc20b00f6741..3613c567cd49 100644
--- a/dev-libs/libpqxx/metadata.xml
+++ b/dev-libs/libpqxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
+  <maintainer>
+    <email>pgsql-bugs@gentoo.org</email>
+    <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
   <longdescription>
 	libpqxx is the official C++ client API for PostgreSQL. If you are
 	writing software in C++ that needs to access databases managed by
diff --git a/dev-libs/libpthread-stubs/metadata.xml b/dev-libs/libpthread-stubs/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libpthread-stubs/metadata.xml
+++ b/dev-libs/libpthread-stubs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libpwquality/metadata.xml b/dev-libs/libpwquality/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libpwquality/metadata.xml
+++ b/dev-libs/libpwquality/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml
index 2b2f83827853..6ceee28570c0 100644
--- a/dev-libs/libqtxdg/metadata.xml
+++ b/dev-libs/libqtxdg/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
-  <herd>qt</herd>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
+<maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libqzeitgeist/metadata.xml b/dev-libs/libqzeitgeist/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/libqzeitgeist/metadata.xml
+++ b/dev-libs/libqzeitgeist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libreport/metadata.xml b/dev-libs/libreport/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libreport/metadata.xml
+++ b/dev-libs/libreport/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/librevenge/metadata.xml b/dev-libs/librevenge/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/librevenge/metadata.xml
+++ b/dev-libs/librevenge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libroadnav/metadata.xml b/dev-libs/libroadnav/metadata.xml
index 9ebfaf66a151..7bcd1bd2a2fc 100644
--- a/dev-libs/libroadnav/metadata.xml
+++ b/dev-libs/libroadnav/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andrew.cremins@gmail.com</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">roadnav</remote-id>
 	</upstream>
diff --git a/dev-libs/librra/metadata.xml b/dev-libs/librra/metadata.xml
index 4c4dfee99541..bc61acb31344 100644
--- a/dev-libs/librra/metadata.xml
+++ b/dev-libs/librra/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<use>
 		<flag name="recurrence">Enable recurrence support (EXPERIMENTAL)</flag>
 	</use>
diff --git a/dev-libs/librtfcomp/metadata.xml b/dev-libs/librtfcomp/metadata.xml
index ba58102c22c2..5cc3b241b374 100644
--- a/dev-libs/librtfcomp/metadata.xml
+++ b/dev-libs/librtfcomp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<upstream>
 		<remote-id type="sourceforge">synce</remote-id>
 	</upstream>
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 60835a2cb1e4..714e4710132a 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="asm">Enable x86_64 assembly optimisation</flag>
     <flag name="endomorphism">Enable endomorphism</flag>
diff --git a/dev-libs/libserialport/metadata.xml b/dev-libs/libserialport/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-libs/libserialport/metadata.xml
+++ b/dev-libs/libserialport/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libsigc++/metadata.xml b/dev-libs/libsigc++/metadata.xml
index e6cf74a913d0..1200fd41eb8c 100644
--- a/dev-libs/libsigc++/metadata.xml
+++ b/dev-libs/libsigc++/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-mm</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libsigc</remote-id>
 	</upstream>
diff --git a/dev-libs/libsigsegv/metadata.xml b/dev-libs/libsigsegv/metadata.xml
index 9800397a8c40..8392bffc7b79 100644
--- a/dev-libs/libsigsegv/metadata.xml
+++ b/dev-libs/libsigsegv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>common-lisp</herd>
+  <maintainer>
+    <email>common-lisp@gentoo.org</email>
+    <name>Gentoo Common Lisp Project</name>
+  </maintainer>
   <longdescription>
 This is a library for handling page faults in user mode. A page fault occurs
 when a program tries to access to a region of memory that is currently not
diff --git a/dev-libs/libspnav/metadata.xml b/dev-libs/libspnav/metadata.xml
index 14da66cc7fac..609e67bba838 100644
--- a/dev-libs/libspnav/metadata.xml
+++ b/dev-libs/libspnav/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>anthoine.bourgeois@gmail.com</email>
 		<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The libspnav library is provided as a replacement of the magellan
 		library. It provides a cleaner, and more orthogonal interface. libspnav
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/libspt/metadata.xml
+++ b/dev-libs/libspt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libtar/metadata.xml b/dev-libs/libtar/metadata.xml
index 2644f03ae0e6..4a53f22f7167 100644
--- a/dev-libs/libtar/metadata.xml
+++ b/dev-libs/libtar/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>proxy-maintainers</herd>
         <maintainer>
                 <email>sdnick484@gmail.com</email>
                 <name>Nick Andrade</name>
                 <description>Active Maintainer, Assign bugs</description>
         </maintainer>
+<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libtecla/metadata.xml b/dev-libs/libtecla/metadata.xml
index 63bef1b93f80..a359909c8b5b 100644
--- a/dev-libs/libtecla/metadata.xml
+++ b/dev-libs/libtecla/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The tecla library provides UNIX and LINUX programs with interactive
   command line editing facilities, similar to those of the UNIX tcsh
diff --git a/dev-libs/libtermkey/metadata.xml b/dev-libs/libtermkey/metadata.xml
index e76fa845400b..e6836a913303 100644
--- a/dev-libs/libtermkey/metadata.xml
+++ b/dev-libs/libtermkey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="demos">Install demos, which pulls in <pkg>dev-libs/glib</pkg></flag>
   </use>
diff --git a/dev-libs/libunique/metadata.xml b/dev-libs/libunique/metadata.xml
index 18d1a81735d6..a3834afd39ca 100644
--- a/dev-libs/libunique/metadata.xml
+++ b/dev-libs/libunique/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 Unique is a library for writing single instance application. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance.
 </longdescription>
diff --git a/dev-libs/libunistring/metadata.xml b/dev-libs/libunistring/metadata.xml
index 260b66c76dc4..7b0c1367fc12 100644
--- a/dev-libs/libunistring/metadata.xml
+++ b/dev-libs/libunistring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription lang="en">
 	Text files are nowadays usually encoded in Unicode, and may consist of very
 	different scripts – from Latin letters to Chinese Hanzi –, with many kinds
diff --git a/dev-libs/libusb-compat/metadata.xml b/dev-libs/libusb-compat/metadata.xml
index 705c20c4a276..bd474ff9e592 100644
--- a/dev-libs/libusb-compat/metadata.xml
+++ b/dev-libs/libusb-compat/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>peter@stuge.se</email>
 		<name>Peter Stuge</name>
 	</maintainer>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libusb</remote-id>
 	</upstream>
diff --git a/dev-libs/libusb/metadata.xml b/dev-libs/libusb/metadata.xml
index 705c20c4a276..bd474ff9e592 100644
--- a/dev-libs/libusb/metadata.xml
+++ b/dev-libs/libusb/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>peter@stuge.se</email>
 		<name>Peter Stuge</name>
 	</maintainer>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libusb</remote-id>
 	</upstream>
diff --git a/dev-libs/libusbhp/metadata.xml b/dev-libs/libusbhp/metadata.xml
index b61166215c7d..d5324b90b8b1 100644
--- a/dev-libs/libusbhp/metadata.xml
+++ b/dev-libs/libusbhp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+ </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libvolume_id/metadata.xml b/dev-libs/libvolume_id/metadata.xml
index 33d86159cefd..1af443ee5a66 100644
--- a/dev-libs/libvolume_id/metadata.xml
+++ b/dev-libs/libvolume_id/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>bsd</herd>
+	<maintainer>
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Provided file system type information for systems that don't have udev.
 	</longdescription>
diff --git a/dev-libs/libvterm-neovim/metadata.xml b/dev-libs/libvterm-neovim/metadata.xml
index 71d319114053..3f95966e263f 100644
--- a/dev-libs/libvterm-neovim/metadata.xml
+++ b/dev-libs/libvterm-neovim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
index 71d319114053..3f95966e263f 100644
--- a/dev-libs/libvterm/metadata.xml
+++ b/dev-libs/libvterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libwacom/metadata.xml b/dev-libs/libwacom/metadata.xml
index ad51e5e10a70..7f93620102a6 100644
--- a/dev-libs/libwacom/metadata.xml
+++ b/dev-libs/libwacom/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/libxml2/metadata.xml b/dev-libs/libxml2/metadata.xml
index 4d835067a021..9d35137ea87b 100644
--- a/dev-libs/libxml2/metadata.xml
+++ b/dev-libs/libxml2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
   </upstream>
diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libzeitgeist/metadata.xml b/dev-libs/libzeitgeist/metadata.xml
index e32a5e8e4cd5..1736117011d5 100644
--- a/dev-libs/libzeitgeist/metadata.xml
+++ b/dev-libs/libzeitgeist/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>eva@gentoo.org</email>
 		<name>Gilles Dartiguelongue</name>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">libzeitgeist</remote-id>
 	</upstream>
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index bfccf8675474..278ae839134f 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
 <maintainer>
 	<email>creffett@gentoo.org</email>
 	<name>Chris Reffett</name>
 </maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/link-grammar/metadata.xml b/dev-libs/link-grammar/metadata.xml
index 799d5bac3ffa..757f3e15d57b 100644
--- a/dev-libs/link-grammar/metadata.xml
+++ b/dev-libs/link-grammar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Link Grammar Parser is a syntactic parser of English, based on link
 		grammar, an original theory of English syntax. The system is written in
diff --git a/dev-libs/log4cpp/metadata.xml b/dev-libs/log4cpp/metadata.xml
index bafe48212a72..0b9f07c65625 100644
--- a/dev-libs/log4cpp/metadata.xml
+++ b/dev-libs/log4cpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">log4cpp</remote-id>
 	</upstream>
diff --git a/dev-libs/log4cxx/metadata.xml b/dev-libs/log4cxx/metadata.xml
index 637de3e45e09..1ec5de3cc946 100644
--- a/dev-libs/log4cxx/metadata.xml
+++ b/dev-libs/log4cxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+  <email>cpp@gentoo.org</email>
+  <name>Gentoo C++ Project</name>
+</maintainer>
 <use>
   <flag name="smtp" restrict="&lt;dev-libs/log4cxx-0.10">Offer SMTP support via
     <pkg>net-libs/libsmtp</pkg></flag>
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 47417744e979..f067f7713645 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="X">
       Builds the Graphical User Interface API and utilities for the
diff --git a/dev-libs/maloc/metadata.xml b/dev-libs/maloc/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/dev-libs/maloc/metadata.xml
+++ b/dev-libs/maloc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/matrixssl/metadata.xml b/dev-libs/matrixssl/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/dev-libs/matrixssl/metadata.xml
+++ b/dev-libs/matrixssl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index 5eb541d497f3..3e24b325ab80 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ruepel@gmx.li</email>
 		<name>Rüpel</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/mongo-c-driver/metadata.xml b/dev-libs/mongo-c-driver/metadata.xml
index a1f0f88321d3..b0e4301c5a2d 100644
--- a/dev-libs/mongo-c-driver/metadata.xml
+++ b/dev-libs/mongo-c-driver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -10,6 +9,10 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-libs/mongo-cxx-driver/metadata.xml b/dev-libs/mongo-cxx-driver/metadata.xml
index 2a9f2397361b..0a7b29dbd342 100644
--- a/dev-libs/mongo-cxx-driver/metadata.xml
+++ b/dev-libs/mongo-cxx-driver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -10,6 +9,10 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-libs/mpc/metadata.xml b/dev-libs/mpc/metadata.xml
index 5961aa214265..e50f1a1c98ad 100644
--- a/dev-libs/mpc/metadata.xml
+++ b/dev-libs/mpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/mpfr/metadata.xml b/dev-libs/mpfr/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-libs/mpfr/metadata.xml
+++ b/dev-libs/mpfr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index e70ecc2e1e74..0e0fc8aee596 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index 74d9257900cf..937c6dbf9feb 100644
--- a/dev-libs/nspr/metadata.xml
+++ b/dev-libs/nspr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index ef6105728a67..9f7a41fcb814 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+  <email>mozilla@gentoo.org</email>
+  <name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
   <flag name="cacert">
     Include root/class3 certs from CAcert (http://http://www.cacert.org/) and
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index 480588cfc0a6..31365b5b5f41 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<herd>cpp</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 <longdescription lang="en">
   NTL is a high-performance, portable C++ library providing data
   structures and algorithms for manipulating signed, arbitrary length
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index cbabf9d6775f..403d121b84d7 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <longdescription>
 Oniguruma is a regular expression library.  The characteristics of
 this library is that different character encoding for every regular
diff --git a/dev-libs/opencryptoki/metadata.xml b/dev-libs/opencryptoki/metadata.xml
index 83bdc03df715..3097c0c6f141 100644
--- a/dev-libs/opencryptoki/metadata.xml
+++ b/dev-libs/opencryptoki/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="tpm">
       Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg>
diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml
index a67417b00a07..3d96760acafe 100644
--- a/dev-libs/openct/metadata.xml
+++ b/dev-libs/openct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="pcsc-lite">
       Build a driver library for <pkg>sys-apps/pcsc-lite</pkg>,
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 355eb11bd0c4..6ffd741dbcd7 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>
     OpenSC is a library for accessing SmartCard devices. It is also
     the core library of the OpenSC project.
diff --git a/dev-libs/openspecfun/metadata.xml b/dev-libs/openspecfun/metadata.xml
index 3237bd77151c..dcedd29b4acf 100644
--- a/dev-libs/openspecfun/metadata.xml
+++ b/dev-libs/openspecfun/metadata.xml
@@ -5,7 +5,10 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">JuliaLang/openspecfun</remote-id>
   </upstream>
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index b7cc1cd0ffd4..a08ea958e0e3 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
 <use>
  <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
  <flag name="bindist">Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
diff --git a/dev-libs/pakchois/metadata.xml b/dev-libs/pakchois/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/dev-libs/pakchois/metadata.xml
+++ b/dev-libs/pakchois/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/pcl/metadata.xml b/dev-libs/pcl/metadata.xml
index 00c0b469b624..4b8f0d895ed0 100644
--- a/dev-libs/pcl/metadata.xml
+++ b/dev-libs/pcl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>longlene@gmail.com</email>
 		<name>Lixiao Chen</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Portable Coroutine Library (PCL) implements the low level
 		functionality for coroutines
diff --git a/dev-libs/pcre++/metadata.xml b/dev-libs/pcre++/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/pcre++/metadata.xml
+++ b/dev-libs/pcre++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 0f458687a8b8..12893a226ef0 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="nss">Enable NSS crypto engine</flag>
 	</use>
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index ef852f1d155f..b197be21d9e1 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription>
 POCO, the C++ Portable Components, is a collection of open source
 C++ class libraries that simplify and accelerate the development of
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
index bee9f9ae6f02..aff39ca735f4 100644
--- a/dev-libs/popt/metadata.xml
+++ b/dev-libs/popt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/ppl/metadata.xml b/dev-libs/ppl/metadata.xml
index 3584f23ed054..f3431342473e 100644
--- a/dev-libs/ppl/metadata.xml
+++ b/dev-libs/ppl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+  <email>toolchain@gentoo.org</email>
+  <name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
   <flag name="lpsol">Build the ppl_lpsol linear programming problem solver</flag>
 </use>
diff --git a/dev-libs/pslib/metadata.xml b/dev-libs/pslib/metadata.xml
index f8f5d4685cef..2728fd3f3a73 100644
--- a/dev-libs/pslib/metadata.xml
+++ b/dev-libs/pslib/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pslib</remote-id>
 	</upstream>
diff --git a/dev-libs/ptexenc/metadata.xml b/dev-libs/ptexenc/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-libs/ptexenc/metadata.xml
+++ b/dev-libs/ptexenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/pth/metadata.xml b/dev-libs/pth/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/pth/metadata.xml
+++ b/dev-libs/pth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/ptypes/metadata.xml b/dev-libs/ptypes/metadata.xml
index 8f74a5e3c99e..d303641e6256 100644
--- a/dev-libs/ptypes/metadata.xml
+++ b/dev-libs/ptypes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ptypes</remote-id>
 	</upstream>
diff --git a/dev-libs/pugixml/metadata.xml b/dev-libs/pugixml/metadata.xml
index ec127a995bb0..03565c976706 100644
--- a/dev-libs/pugixml/metadata.xml
+++ b/dev-libs/pugixml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">zeux/pugixml</remote-id>
   </upstream>
diff --git a/dev-libs/purpose/metadata.xml b/dev-libs/purpose/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/purpose/metadata.xml
+++ b/dev-libs/purpose/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/qcustomplot/metadata.xml b/dev-libs/qcustomplot/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/dev-libs/qcustomplot/metadata.xml
+++ b/dev-libs/qcustomplot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml
index 8f60b5cd0e21..c0053edfafa0 100644
--- a/dev-libs/qjson/metadata.xml
+++ b/dev-libs/qjson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">flavio/qjson</remote-id>
 		<bugs-to>https://github.com/flavio/qjson/issues</bugs-to>
diff --git a/dev-libs/qoauth/metadata.xml b/dev-libs/qoauth/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-libs/qoauth/metadata.xml
+++ b/dev-libs/qoauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/qof/metadata.xml b/dev-libs/qof/metadata.xml
index 669f23da60ac..fe3dc94b2bcd 100644
--- a/dev-libs/qof/metadata.xml
+++ b/dev-libs/qof/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/qqwing/metadata.xml b/dev-libs/qqwing/metadata.xml
index 36fc81a79830..06c7b41d4ad9 100644
--- a/dev-libs/qqwing/metadata.xml
+++ b/dev-libs/qqwing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">stephenostermiller/qqwing</remote-id>
 	</upstream>
diff --git a/dev-libs/qrosscore/metadata.xml b/dev-libs/qrosscore/metadata.xml
index ae36ab9f924e..91d2c3e29fbc 100644
--- a/dev-libs/qrosscore/metadata.xml
+++ b/dev-libs/qrosscore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<longdescription lang="en">
 		Qross is a KDE-free version of Kross.
 	</longdescription>
diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qrosspython/metadata.xml
index 731cdfc65303..83d17c265f95 100644
--- a/dev-libs/qrosspython/metadata.xml
+++ b/dev-libs/qrosspython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<longdescription lang="en">
 		Python interpreter for Qross.
 	</longdescription>
diff --git a/dev-libs/quantlib/metadata.xml b/dev-libs/quantlib/metadata.xml
index 061f38a0f8d6..f35bca0232c6 100644
--- a/dev-libs/quantlib/metadata.xml
+++ b/dev-libs/quantlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription>
 QuantLib (http://quantlib.org/) is a C++ library for financial
 quantitative analysts and developers.
diff --git a/dev-libs/quazip/metadata.xml b/dev-libs/quazip/metadata.xml
index 3a49663f2818..8e23af761756 100644
--- a/dev-libs/quazip/metadata.xml
+++ b/dev-libs/quazip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>sci@gentoo.org</email>
 	</maintainer>
diff --git a/dev-libs/rapidxml/metadata.xml b/dev-libs/rapidxml/metadata.xml
index 87b1d22e567d..d4001df068f7 100644
--- a/dev-libs/rapidxml/metadata.xml
+++ b/dev-libs/rapidxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rapidxml</remote-id>
 	</upstream>
diff --git a/dev-libs/rasqal/metadata.xml b/dev-libs/rasqal/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/rasqal/metadata.xml
+++ b/dev-libs/rasqal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index fffcfc8b794e..7442547d826a 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/redland-bindings/metadata.xml b/dev-libs/redland-bindings/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/redland-bindings/metadata.xml
+++ b/dev-libs/redland-bindings/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/redland/metadata.xml b/dev-libs/redland/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/redland/metadata.xml
+++ b/dev-libs/redland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/rlog/metadata.xml b/dev-libs/rlog/metadata.xml
index cc9a8c3e469b..650e24b29ebe 100644
--- a/dev-libs/rlog/metadata.xml
+++ b/dev-libs/rlog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">rlog</remote-id>
 	</upstream>
diff --git a/dev-libs/sblim-sfcc/metadata.xml b/dev-libs/sblim-sfcc/metadata.xml
index f6583660b6d1..b4fc25bb64b9 100644
--- a/dev-libs/sblim-sfcc/metadata.xml
+++ b/dev-libs/sblim-sfcc/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sblim</remote-id>
 	</upstream>
diff --git a/dev-libs/serd/metadata.xml b/dev-libs/serd/metadata.xml
index 1026eab86322..ac64c9c43fec 100644
--- a/dev-libs/serd/metadata.xml
+++ b/dev-libs/serd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples.
 
diff --git a/dev-libs/sni-qt/metadata.xml b/dev-libs/sni-qt/metadata.xml
index 010c945c7fa2..9217047479fb 100644
--- a/dev-libs/sni-qt/metadata.xml
+++ b/dev-libs/sni-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">sni-qt</remote-id>
 	</upstream>
diff --git a/dev-libs/socketstream/metadata.xml b/dev-libs/socketstream/metadata.xml
index 437cf706948d..10f0b78284c6 100644
--- a/dev-libs/socketstream/metadata.xml
+++ b/dev-libs/socketstream/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">socketstream</remote-id>
 	</upstream>
diff --git a/dev-libs/sord/metadata.xml b/dev-libs/sord/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/dev-libs/sord/metadata.xml
+++ b/dev-libs/sord/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/stlsoft/metadata.xml b/dev-libs/stlsoft/metadata.xml
index 4241f4f95923..29c5f0644134 100644
--- a/dev-libs/stlsoft/metadata.xml
+++ b/dev-libs/stlsoft/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dav.daemon@gmail.com</email>
 		<name>Dmitriy Vilkov</name>
 		<description>Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/dev-libs/tinyxml2/metadata.xml b/dev-libs/tinyxml2/metadata.xml
index 4af0dabc8e1e..c5bb5639187c 100644
--- a/dev-libs/tinyxml2/metadata.xml
+++ b/dev-libs/tinyxml2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">leethomason/tinyxml2</remote-id>
   </upstream>
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 5a94337ca559..f7984aed6a63 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -5,7 +5,6 @@
 		<email>hd_brummy@gentoo.org</email>                                                                        
 		<name>Joerg Bornkessel</name>                                                                      
 	</maintainer>
-	<herd>media-tv</herd>
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
 	</use>
diff --git a/dev-libs/totem-pl-parser/metadata.xml b/dev-libs/totem-pl-parser/metadata.xml
index 90786c3676d9..6df543fba0c5 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="archive">Enables support for accessing media files in archives
 		transparently via <pkg>app-arch/libarchive</pkg></flag>
diff --git a/dev-libs/tre/metadata.xml b/dev-libs/tre/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/dev-libs/tre/metadata.xml
+++ b/dev-libs/tre/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/tvmet/metadata.xml b/dev-libs/tvmet/metadata.xml
index f33bab03deb3..7a9a5540d956 100644
--- a/dev-libs/tvmet/metadata.xml
+++ b/dev-libs/tvmet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tvmet</remote-id>
 	</upstream>
diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml
index bfe4d0155d48..e314a6ffdf29 100644
--- a/dev-libs/uchardet/metadata.xml
+++ b/dev-libs/uchardet/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>rion4ik@gmail.com</email>
 		<name>Rion</name>
@@ -10,6 +9,10 @@
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">BYVoid/uchardet</remote-id>
 	</upstream>
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index 076cf488c9c0..b2eeac637687 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andrei Vinogradov</name>
@@ -10,6 +9,10 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="socks">Build with socks proxy support</flag>
 </use>
diff --git a/dev-libs/unibilium/metadata.xml b/dev-libs/unibilium/metadata.xml
index dd59dfe14476..3c9d669e4970 100644
--- a/dev-libs/unibilium/metadata.xml
+++ b/dev-libs/unibilium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mauke/unibilium</remote-id>
   </upstream>
diff --git a/dev-libs/urdfdom_headers/metadata.xml b/dev-libs/urdfdom_headers/metadata.xml
index 2984f253c23b..ebe84a919917 100644
--- a/dev-libs/urdfdom_headers/metadata.xml
+++ b/dev-libs/urdfdom_headers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ros</herd>
+  <maintainer>
+    <email>ros@gentoo.org</email>
+    <name>Gentoo ROS Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ros/urdfdom_headers</remote-id>
   </upstream>
diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index a6cb317dc98b..86c267fa7393 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+<email>base-system@gentoo.org</email>
+<name>Gentoo Base System</name>
+</maintainer>
 <use>
 <flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
 </use>
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 3e931e3686e7..4363fb062dba 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>Yamakuzure@gmx.net</email>
 	<name>Sven Eden</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index 85dd9367f83e..874d5c56cae5 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>bugs@bergstroem.nu</email>
     <name>Johan Bergström</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   </longdescription>
   <upstream>
diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/vdk/metadata.xml b/dev-libs/vdk/metadata.xml
index e111126efa21..e097d1417481 100644
--- a/dev-libs/vdk/metadata.xml
+++ b/dev-libs/vdk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 	<upstream>
 		<remote-id type="sourceforge">vdklib</remote-id>
 	</upstream>
diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/wayland/metadata.xml
+++ b/dev-libs/wayland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index dd18351dc2cc..44827497918a 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="colord">Allow setting color managment</flag>
 	<flag name="drm">Enable drm compositor support</flag>
diff --git a/dev-libs/wnn7sdk/metadata.xml b/dev-libs/wnn7sdk/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/wnn7sdk/metadata.xml
+++ b/dev-libs/wnn7sdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/xalan-c/metadata.xml b/dev-libs/xalan-c/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/xalan-c/metadata.xml
+++ b/dev-libs/xalan-c/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/xapian-bindings/metadata.xml b/dev-libs/xapian-bindings/metadata.xml
index 0441f1355104..530e27530e1a 100644
--- a/dev-libs/xapian-bindings/metadata.xml
+++ b/dev-libs/xapian-bindings/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index ca3e85bc56d8..0edead8a478f 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Xapian is an Open Source Probabilistic Information Retrieval library,
 		released under the GPL. It's written in C++, with bindings to allow use
diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index b6a7983cc612..12afeaffa1f3 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+  <email>cpp@gentoo.org</email>
+  <name>Gentoo C++ Project</name>
+</maintainer>
 <longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
 <use>
   <flag name="iconv">Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index c4c05198b310..5a4003b0adb2 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="xalan">Enable support for XSLT and XPath parsing 
 			by <pkg>dev-libs/xalan-c</pkg></flag>
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index b4229edcd38f..e2c9f21b69f3 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Install xmlsec-gcrypt library</flag>
 		<flag name="gnutls">Install xmlsec-gnutls library</flag>
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
index aad795610fd3..c294ff8fb62c 100644
--- a/dev-libs/xmlwrapp/metadata.xml
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/vslavik/xmlwrapp/issues</bugs-to>
 		<remote-id type="github">vslavik/xmlwrapp</remote-id>
diff --git a/dev-libs/xplc/metadata.xml b/dev-libs/xplc/metadata.xml
index d151eb9a26d0..000947dacee4 100644
--- a/dev-libs/xplc/metadata.xml
+++ b/dev-libs/xplc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription>cross platform lightweight components library for C++</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xplc</remote-id>
diff --git a/dev-libs/xqilla/metadata.xml b/dev-libs/xqilla/metadata.xml
index af34b3930505..4a58f495d9e6 100644
--- a/dev-libs/xqilla/metadata.xml
+++ b/dev-libs/xqilla/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<use>
 		<flag name="faxpp">Use <pkg>dev-libs/faxpp</pkg> instead of Xerces-C for
 			certain tasks</flag>
diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml
index 429319866423..65823fd7250a 100644
--- a/dev-libs/yajl/metadata.xml
+++ b/dev-libs/yajl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lloyd/yajl</remote-id>
   </upstream>
diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml
index a0ea0d126771..171968161858 100644
--- a/dev-libs/zthread/metadata.xml
+++ b/dev-libs/zthread/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zthread</remote-id>
 	</upstream>
diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml
index 53e4fff270af..e5e1af1c31ee 100644
--- a/dev-lisp/abcl/metadata.xml
+++ b/dev-lisp/abcl/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
-	<herd>java</herd>
+	<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Armed Bear Common Lisp (ABCL) is an implementation of ANSI Common
 		Lisp that runs in a Java virtual machine.
diff --git a/dev-lisp/asdf-binary-locations/metadata.xml b/dev-lisp/asdf-binary-locations/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/asdf-binary-locations/metadata.xml
+++ b/dev-lisp/asdf-binary-locations/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/asdf/metadata.xml b/dev-lisp/asdf/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/asdf/metadata.xml
+++ b/dev-lisp/asdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/cl-ppcre-unicode/metadata.xml b/dev-lisp/cl-ppcre-unicode/metadata.xml
index 38443f050ab4..e772b1669fcf 100644
--- a/dev-lisp/cl-ppcre-unicode/metadata.xml
+++ b/dev-lisp/cl-ppcre-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 		CL-PPCRE is a portable regular expression library for Common Lisp
 		which has the following features: 
diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml
index f74418ebe7fe..a4fe0edbf099 100644
--- a/dev-lisp/cl-ppcre/metadata.xml
+++ b/dev-lisp/cl-ppcre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 CL-PPCRE is a portable regular expression library for Common Lisp
 which has the following features: 
diff --git a/dev-lisp/cl-unicode/metadata.xml b/dev-lisp/cl-unicode/metadata.xml
index a1f0819d420e..64ffbd9707d8 100644
--- a/dev-lisp/cl-unicode/metadata.xml
+++ b/dev-lisp/cl-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 		CL-UNICODE is a library which provides Common Lisp implementations
 		with knowledge about Unicode characters including their name, their
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index 271466f882bb..0cb54e14cb48 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 CLISP is a Common Lisp implementation. It mostly supports the Lisp
 described in the ANSI Common Lisp standard.  It includes an
diff --git a/dev-lisp/clozurecl/metadata.xml b/dev-lisp/clozurecl/metadata.xml
index 7fb197497d83..923f51322605 100644
--- a/dev-lisp/clozurecl/metadata.xml
+++ b/dev-lisp/clozurecl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 Clozure Common Lisp (formerly OpenMCL) is a Common Lisp implementation.
 </longdescription>
diff --git a/dev-lisp/cmucl/metadata.xml b/dev-lisp/cmucl/metadata.xml
index f2ace0854ee8..43801ace3fd8 100644
--- a/dev-lisp/cmucl/metadata.xml
+++ b/dev-lisp/cmucl/metadata.xml
@@ -5,7 +5,10 @@
 <email>grozin@gentoo.org</email>
 <name>Andrey Grozin</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+<email>common-lisp@gentoo.org</email>
+<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 CMUCL is a free implementation of the Common Lisp programming language
 which runs on most major Unix platforms. It mainly conforms to the
diff --git a/dev-lisp/common-lisp-controller/metadata.xml b/dev-lisp/common-lisp-controller/metadata.xml
index c3581b8c864c..028ea1a0d26a 100644
--- a/dev-lisp/common-lisp-controller/metadata.xml
+++ b/dev-lisp/common-lisp-controller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 The Common Lisp Controller was originally used in the Debian project.  The Common
 Lisp Contoller lets you install and manage common lisp sources and compilers.
diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml
index 8fafd6521aef..7737555fdee0 100644
--- a/dev-lisp/ecls/metadata.xml
+++ b/dev-lisp/ecls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 ECL (Embeddable Common Lisp) is an implementation of the Common Lisp language as
 described in the X3J13 Ansi specification, featuring CLOS (Common Lisp Object
diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml
index 0a0911dbf724..a7073156ef59 100644
--- a/dev-lisp/flexi-streams/metadata.xml
+++ b/dev-lisp/flexi-streams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		FLEXI-STREAMS implements "virtual" bivalent streams that can be
 		layered atop real binary or bivalent streams and that can be used
diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml
index 83dd1ec0e9a9..b020db36b793 100644
--- a/dev-lisp/gcl/metadata.xml
+++ b/dev-lisp/gcl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>common-lisp</herd>
+  <maintainer>
+    <email>common-lisp@gentoo.org</email>
+    <name>Gentoo Common Lisp Project</name>
+  </maintainer>
   <longdescription>
     GCL is the official Common Lisp for the GNU project. Its design
     makes use of the system's C compiler to compile to native object
diff --git a/dev-lisp/gentoo-init/metadata.xml b/dev-lisp/gentoo-init/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/gentoo-init/metadata.xml
+++ b/dev-lisp/gentoo-init/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/hyperspec/metadata.xml b/dev-lisp/hyperspec/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/hyperspec/metadata.xml
+++ b/dev-lisp/hyperspec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 7bbc76d72acd..e863e1a58c4d 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -11,8 +11,14 @@
 		<name>Stelian Ionescu (fe[nl]ix)</name>
 		<description>second-maintainer</description>
 	</maintainer>
-	<herd>common-lisp</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Steel Bank Common Lisp is an open source Common
   Lisp implementation. It provides an integrated native compiler,
   interpreter, and debugger. SBCL is a fork off of the main branch
diff --git a/dev-lisp/trivial-gray-streams/metadata.xml b/dev-lisp/trivial-gray-streams/metadata.xml
index 6dbd467b762f..012307f69641 100644
--- a/dev-lisp/trivial-gray-streams/metadata.xml
+++ b/dev-lisp/trivial-gray-streams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This system provides an extremely thin compatibility layer for
 		Gray streams
diff --git a/dev-lisp/uiop/metadata.xml b/dev-lisp/uiop/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/uiop/metadata.xml
+++ b/dev-lisp/uiop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index ea456936e173..93600225b0af 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jakub@jirutka.cz</email>
 		<name>Jakub Jirutka</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
 			<pkg>dev-lang/lua</pkg></flag>
diff --git a/dev-ml/ANSITerminal/metadata.xml b/dev-ml/ANSITerminal/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ANSITerminal/metadata.xml
+++ b/dev-ml/ANSITerminal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async/metadata.xml
+++ b/dev-ml/async/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_extra/metadata.xml
+++ b/dev-ml/async_extra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/async_rpc_kernel/metadata.xml
+++ b/dev-ml/async_rpc_kernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
index ce6fb259c213..d0b74cdfcef0 100644
--- a/dev-ml/batteries/metadata.xml
+++ b/dev-ml/batteries/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
 	</upstream>
diff --git a/dev-ml/bignum/metadata.xml b/dev-ml/bignum/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/bignum/metadata.xml
+++ b/dev-ml/bignum/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin-prot/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/bin-prot/metadata.xml
+++ b/dev-ml/bin-prot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/bolt/metadata.xml b/dev-ml/bolt/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/bolt/metadata.xml
+++ b/dev-ml/bolt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
index 2212fedc13f4..f745896a2769 100644
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ b/dev-ml/cairo-ocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
    This package contains all the development stuff you need to use Cairo in
    your OCaml programs. The folowing backends are supported: PostScript,
diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/calendar/metadata.xml
+++ b/dev-ml/calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camldbm/metadata.xml
+++ b/dev-ml/camldbm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/camlidl/metadata.xml
+++ b/dev-ml/camlidl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index e4f3fadc36e8..1e7ada87647d 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">camlspotter/camlimages</remote-id>
 	</upstream>
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 61a20d310a0e..e051b6170427 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocaml/camlp4</remote-id>
   </upstream>
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlzip/metadata.xml
+++ b/dev-ml/camlzip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
index c2fd0b301e0c..a30a59a7020d 100644
--- a/dev-ml/camomile/metadata.xml
+++ b/dev-ml/camomile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yoriyuki/Camomile</remote-id>
   </upstream>
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/comparelib/metadata.xml b/dev-ml/comparelib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/comparelib/metadata.xml
+++ b/dev-ml/comparelib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
index 3a9dfe0e889c..743230d081ed 100644
--- a/dev-ml/core/metadata.xml
+++ b/dev-ml/core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <longdescription lang="en">
   Core is Jane Street Capital's Ocaml standard library overlay.  It
   provides tail recursive versions of non tail recursive functions in
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_bench/metadata.xml
+++ b/dev-ml/core_bench/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_extended/metadata.xml
+++ b/dev-ml/core_extended/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index f9f1f8a63391..26237397c482 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <longdescription lang="en">
 	  Core_kernel is the system-independent part of Core.  It is aimed for
 	  cases when the full Core is not available, such as in Javascript.  It
diff --git a/dev-ml/core_profiler/metadata.xml b/dev-ml/core_profiler/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_profiler/metadata.xml
+++ b/dev-ml/core_profiler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index a9b7bec08858..cc12c7ffd08d 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mjambon/cppo</remote-id>
 	</upstream>
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cryptokit/metadata.xml
+++ b/dev-ml/cryptokit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
index 758d5a49ade3..f362b1a9d1ff 100644
--- a/dev-ml/csv/metadata.xml
+++ b/dev-ml/csv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Chris00/ocaml-csv</remote-id>
 	</upstream>
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/custom_printf/metadata.xml b/dev-ml/custom_printf/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/custom_printf/metadata.xml
+++ b/dev-ml/custom_printf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/deriving-ocsigen/metadata.xml b/dev-ml/deriving-ocsigen/metadata.xml
index d03028baab6f..592a4ddbc8c0 100644
--- a/dev-ml/deriving-ocsigen/metadata.xml
+++ b/dev-ml/deriving-ocsigen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+	</maintainer>
 <use>
 	<flag name="type-conv">Enable type-conv for the syntax extention.</flag>
 </use>
diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml
index 09825ef62a07..39b408f3da5a 100644
--- a/dev-ml/deriving/metadata.xml
+++ b/dev-ml/deriving/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocsigen/deriving</remote-id>
   </upstream>
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index f3dd19f62c3d..14fe3440a105 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <use>
     <flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
 	<flag name="zip">Adds support for handling zip files.</flag>
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/easy-format/metadata.xml
+++ b/dev-ml/easy-format/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
index 938b956109af..6fef2522e594 100644
--- a/dev-ml/eliom/metadata.xml
+++ b/dev-ml/eliom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocsigen/eliom</remote-id>
   </upstream>
diff --git a/dev-ml/enumerate/metadata.xml b/dev-ml/enumerate/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/enumerate/metadata.xml
+++ b/dev-ml/enumerate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index 0b1f8d274066..b14bb8772372 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ocaml-extlib</remote-id>
 		<remote-id type="github">ygrek/ocaml-extlib</remote-id>
diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml
index b8f481c02b36..ae0dca33164b 100644
--- a/dev-ml/facile/metadata.xml
+++ b/dev-ml/facile/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>ml</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/faillib/metadata.xml b/dev-ml/faillib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/faillib/metadata.xml
+++ b/dev-ml/faillib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index d7fe6e623768..98258ddfd3a2 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <longdescription lang="en">
 	   This library defines a syntax extension for OCaml using Camlp4 that
 	   can be used to define first class values representing record fields,
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/gd4o/metadata.xml b/dev-ml/gd4o/metadata.xml
index ae5d75598795..f85a15c82e03 100644
--- a/dev-ml/gd4o/metadata.xml
+++ b/dev-ml/gd4o/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gd4o</remote-id>
 	</upstream>
diff --git a/dev-ml/herelib/metadata.xml b/dev-ml/herelib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/herelib/metadata.xml
+++ b/dev-ml/herelib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml
index d49e7e430be4..c37f8e1d29c5 100644
--- a/dev-ml/iTeML/metadata.xml
+++ b/dev-ml/iTeML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vincent-hugot/iTeML</remote-id>
   </upstream>
diff --git a/dev-ml/incremental/metadata.xml b/dev-ml/incremental/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/incremental/metadata.xml
+++ b/dev-ml/incremental/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml
index 7de4823b6f0b..1ea7e1e10625 100644
--- a/dev-ml/io-page/metadata.xml
+++ b/dev-ml/io-page/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mirage/io-page</remote-id>
     </upstream>
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index eecf32520269..279f72e9dcc6 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <use>
     <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
   </use>
diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/jsonm/metadata.xml
+++ b/dev-ml/jsonm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/kaputt/metadata.xml b/dev-ml/kaputt/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/kaputt/metadata.xml
+++ b/dev-ml/kaputt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/lablgl/metadata.xml
+++ b/dev-ml/lablgl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 4d94d0767d14..ef47bd794414 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+	</maintainer>
 <use>
 	<flag name="glade">Enable libglade bindings compilation.</flag>
 	<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/labltk/metadata.xml
+++ b/dev-ml/labltk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/lambda-term/metadata.xml b/dev-ml/lambda-term/metadata.xml
index f2d915542cad..95f170e27295 100644
--- a/dev-ml/lambda-term/metadata.xml
+++ b/dev-ml/lambda-term/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">diml/lambda-term</remote-id>
   </upstream>
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 907abc8009ab..e25dbdecd356 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
@@ -11,6 +9,14 @@
     <email>pclairam@gmail.com</email>
     <name>Pierre Clairambault</name>
   </maintainer>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="react">Enables support for <pkg>dev-ml/react</pkg>: Functional reactive programming (signals, events, etc.).</flag>
     <flag name="toplevel">Enables enhanced toplevel.</flag>
diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml
index e85e037a03c3..c04c6d04e80c 100644
--- a/dev-ml/macaque/metadata.xml
+++ b/dev-ml/macaque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocsigen/macaque</remote-id>
   </upstream>
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/menhir/metadata.xml
+++ b/dev-ml/menhir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
index b5b7df083105..951348167032 100644
--- a/dev-ml/mirage-profile/metadata.xml
+++ b/dev-ml/mirage-profile/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mirage/mirage-profile</remote-id>
     </upstream>
diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/oasis/metadata.xml
+++ b/dev-ml/oasis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-autoconf/metadata.xml
+++ b/dev-ml/ocaml-autoconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml
index ca9f4ce9dfc0..c1b1505df3d4 100644
--- a/dev-ml/ocaml-base64/metadata.xml
+++ b/dev-ml/ocaml-base64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mirage/ocaml-base64</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
index 0daee3d1c37a..e074d60f9742 100644
--- a/dev-ml/ocaml-cstruct/metadata.xml
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="async">Support for asynchronous execution</flag>
         <flag name="camlp4">Enable support for camlp4</flag>
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index df149a6e7595..4816f8cf4404 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-data-notation/metadata.xml b/dev-ml/ocaml-data-notation/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-data-notation/metadata.xml
+++ b/dev-ml/ocaml-data-notation/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>v.ivanov@ymail.com</email>
   <name>Vladimir Ivanov</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-dns/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
index 6a5da2b59c44..505591c8e7a9 100644
--- a/dev-ml/ocaml-dns/metadata.xml
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="async">support for asynchronous execution</flag>
         <flag name="lwt">enable threads via lwt</flag>
diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/ocaml-doc/metadata.xml
+++ b/dev-ml/ocaml-doc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-expect/metadata.xml
+++ b/dev-ml/ocaml-expect/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>v.ivanov@ymail.com</email>
   <name>Vladimir Ivanov</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>v.ivanov@ymail.com</email>
   <name>Vladimir Ivanov</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/ocaml-ipaddr/metadata.xml
index 1b11944eeb16..1f2b5fbcf0e4 100644
--- a/dev-ml/ocaml-ipaddr/metadata.xml
+++ b/dev-ml/ocaml-ipaddr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-make/metadata.xml b/dev-ml/ocaml-make/metadata.xml
index 1abbdf08804c..8d53db6ae683 100644
--- a/dev-ml/ocaml-make/metadata.xml
+++ b/dev-ml/ocaml-make/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">mmottl/ocaml-makefile</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-mysql/metadata.xml b/dev-ml/ocaml-mysql/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocaml-mysql/metadata.xml
+++ b/dev-ml/ocaml-mysql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml
index 7e5c77c52db0..b6f9747e11b5 100644
--- a/dev-ml/ocaml-pcap/metadata.xml
+++ b/dev-ml/ocaml-pcap/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mirage/ocaml-pcap</remote-id>
     </upstream>
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
index 7bcb58676bed..a1f423d9e7ac 100644
--- a/dev-ml/ocaml-re/metadata.xml
+++ b/dev-ml/ocaml-re/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocaml/ocaml-re</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-safepass/metadata.xml b/dev-ml/ocaml-safepass/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-safepass/metadata.xml
+++ b/dev-ml/ocaml-safepass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-sha/metadata.xml b/dev-ml/ocaml-sha/metadata.xml
index 3776475e41b1..3afafb9725ee 100644
--- a/dev-ml/ocaml-sha/metadata.xml
+++ b/dev-ml/ocaml-sha/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vincenthz/ocaml-sha</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index a3c258185ade..87539254884c 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/sqlite3-ocaml</remote-id>
     <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
index 84ea95252eff..9189be440f1f 100644
--- a/dev-ml/ocaml-ssl/metadata.xml
+++ b/dev-ml/ocaml-ssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">savonet</remote-id>
 	</upstream>
diff --git a/dev-ml/ocaml-text/metadata.xml b/dev-ml/ocaml-text/metadata.xml
index 782e02637d6c..2e8e581a16a4 100644
--- a/dev-ml/ocaml-text/metadata.xml
+++ b/dev-ml/ocaml-text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vbmithr/ocaml-text</remote-id>
   </upstream>
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
index 5b1bec170536..a65a8b262484 100644
--- a/dev-ml/ocaml-uri/metadata.xml
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="allservices">Compile support for all service types</flag>
     </use>
diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index 47053589760e..c6fe9e97b02b 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Ocamldap is an implementation of the Light Weight Directory Access Protocol,
 and a set of useful tools built around it. It includes high level libraries
diff --git a/dev-ml/ocamldsort/metadata.xml b/dev-ml/ocamldsort/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/ocamldsort/metadata.xml
+++ b/dev-ml/ocamldsort/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgsl/metadata.xml b/dev-ml/ocamlgsl/metadata.xml
index 2546a401a276..492e3bdc5a9a 100644
--- a/dev-ml/ocamlgsl/metadata.xml
+++ b/dev-ml/ocamlgsl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   This is an interface to GSL (GNU scientific library), for the
   Objective Caml langage.
diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlify/metadata.xml
+++ b/dev-ml/ocamlify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlmod/metadata.xml
+++ b/dev-ml/ocamlmod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 156ab399609d..cd0c8b6a519a 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+	</maintainer>
 <use>
 	<flag name="cryptokit">Enables encryption support via <pkg>dev-ml/cryptokit</pkg></flag>
 	<flag name="httpd">Enables net-httpd web server component</flag>
diff --git a/dev-ml/ocamlpam/metadata.xml b/dev-ml/ocamlpam/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlpam/metadata.xml
+++ b/dev-ml/ocamlpam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
index 1f4835fdab32..ceda2912e47a 100644
--- a/dev-ml/ocamlsdl/metadata.xml
+++ b/dev-ml/ocamlsdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ocamlsdl</remote-id>
 	</upstream>
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 0451b56afc51..9e278a9159ed 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
     </upstream>
diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocurl/metadata.xml
+++ b/dev-ml/ocurl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/odns/metadata.xml b/dev-ml/odns/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/odns/metadata.xml
+++ b/dev-ml/odns/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index ae1ce054e115..270c9a6c87a1 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocaml/opam</remote-id>
   </upstream>
diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/optcomp/metadata.xml
index d5c2ef5378ef..ceb0096e3c79 100644
--- a/dev-ml/optcomp/metadata.xml
+++ b/dev-ml/optcomp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">diml/optcomp</remote-id>
   </upstream>
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ounit/metadata.xml
+++ b/dev-ml/ounit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/pa_bench/metadata.xml b/dev-ml/pa_bench/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pa_bench/metadata.xml
+++ b/dev-ml/pa_bench/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/pa_ounit/metadata.xml b/dev-ml/pa_ounit/metadata.xml
index 97836330981f..804d7e4412f6 100644
--- a/dev-ml/pa_ounit/metadata.xml
+++ b/dev-ml/pa_ounit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <longdescription lang="en">
 Pa_ounit is a syntax extension that helps writing in-line test in ocaml
 code. It allows user to register tests with a new `TEST` top-level expressions
diff --git a/dev-ml/pa_structural_sexp/metadata.xml b/dev-ml/pa_structural_sexp/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/pa_structural_sexp/metadata.xml
+++ b/dev-ml/pa_structural_sexp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/pa_test/metadata.xml b/dev-ml/pa_test/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pa_test/metadata.xml
+++ b/dev-ml/pa_test/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
index 11d4f4b68712..33ac819979a2 100644
--- a/dev-ml/parmap/metadata.xml
+++ b/dev-ml/parmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rdicosmo/parmap</remote-id>
   </upstream>
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index c3e587532329..105bfa1550ef 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/pcre-ocaml</remote-id>
     <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index cace4b2b6b62..e6984f8bcaf3 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+			<email>ml@gentoo.org</email>
+			<name>Gentoo ML Project</name>
+		</maintainer>
 		<use>
 			<flag name="batteries">Enable Batteries support instead of extlib</flag>
 		</use>
diff --git a/dev-ml/pipebang/metadata.xml b/dev-ml/pipebang/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/pipebang/metadata.xml
+++ b/dev-ml/pipebang/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml
index f21c41a2d80a..d1db7be297d5 100644
--- a/dev-ml/pomap/metadata.xml
+++ b/dev-ml/pomap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/pomap</remote-id>
     <remote-id type="bitbucket">mmottl/pomap</remote-id>
diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml
index 452a21cd57e1..dc44a3839ee3 100644
--- a/dev-ml/postgresql-ocaml/metadata.xml
+++ b/dev-ml/postgresql-ocaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/postgresql-ocaml</remote-id>
     <remote-id type="bitbucket">mmottl/postgresql-ocaml</remote-id>
diff --git a/dev-ml/pxp/metadata.xml b/dev-ml/pxp/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pxp/metadata.xml
+++ b/dev-ml/pxp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
index 3dfaf20734bd..652ff9698081 100644
--- a/dev-ml/qcheck/metadata.xml
+++ b/dev-ml/qcheck/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tomboy64@sina.cn</email>
 	</maintainer>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ounit">Enable integration with ounit</flag>
 	</use>
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/re2/metadata.xml
+++ b/dev-ml/re2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index 80acde625b07..5399f1dd2ace 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <longdescription lang="en">
 	React is an OCaml module for functional reactive programming (FRP). It
     provides support to program with time varying values : applicative
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
index 46f20a3fc5e9..87bf9c4c33da 100644
--- a/dev-ml/reactiveData/metadata.xml
+++ b/dev-ml/reactiveData/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hhugo/reactiveData</remote-id>
   </upstream>
diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml
index 9ec3dcd9e3d2..f814ac25051b 100644
--- a/dev-ml/res/metadata.xml
+++ b/dev-ml/res/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mmottl/res</remote-id>
     <remote-id type="bitbucket">mmottl/res</remote-id>
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
index 75f5ca2e2b0f..08deef9e562c 100644
--- a/dev-ml/stringext/metadata.xml
+++ b/dev-ml/stringext/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ml</herd>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>tomboy64@sina.cn</email>
     </maintainer>
+    <maintainer>
+        <email>ml@gentoo.org</email>
+        <name>Gentoo ML Project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">rgrinberg/stringext</remote-id>
     </upstream>
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/textutils/metadata.xml
+++ b/dev-ml/textutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/type-conv/metadata.xml
+++ b/dev-ml/type-conv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/typehashlib/metadata.xml b/dev-ml/typehashlib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typehashlib/metadata.xml
+++ b/dev-ml/typehashlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/typerep_extended/metadata.xml b/dev-ml/typerep_extended/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typerep_extended/metadata.xml
+++ b/dev-ml/typerep_extended/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index e9cdcbb95f3d..9b36613653cb 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ocsigen/tyxml</remote-id>
   </upstream>
diff --git a/dev-ml/ulex/metadata.xml b/dev-ml/ulex/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ulex/metadata.xml
+++ b/dev-ml/ulex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/utop/metadata.xml b/dev-ml/utop/metadata.xml
index cc0dbaa762f2..76c813712886 100644
--- a/dev-ml/utop/metadata.xml
+++ b/dev-ml/utop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <use>
     <flag name="camlp4">Enables camlp4 support.</flag>
   </use>
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 959de7257d5d..0f62e48e4995 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+<email>ml@gentoo.org</email>
+<name>Gentoo ML Project</name>
+</maintainer>
 <use>
 <flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
 </use>
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
   </upstream>
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml
index 3c86df53987d..7312b9f09304 100644
--- a/dev-ml/xml-light/metadata.xml
+++ b/dev-ml/xml-light/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
@@ -9,4 +8,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/xmlm/metadata.xml
+++ b/dev-ml/xmlm/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>v.ivanov@ymail.com</email>
   <name>Vladimir Ivanov</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/xstr/metadata.xml b/dev-ml/xstr/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/xstr/metadata.xml
+++ b/dev-ml/xstr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index 833e2a3f7de9..6f06e518185f 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mjambon/yojson</remote-id>
   </upstream>
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 444c6eb961dd..f18a01531398 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+	  <email>ml@gentoo.org</email>
+	  <name>Gentoo ML Project</name>
+  </maintainer>
   <use>
 	  <flag name="mpir">Use MPIR library instead of GMP.</flag>
   </use>
diff --git a/dev-ml/zed/metadata.xml b/dev-ml/zed/metadata.xml
index 4025bbe5fd5c..e326579a485b 100644
--- a/dev-ml/zed/metadata.xml
+++ b/dev-ml/zed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">diml/zed</remote-id>
   </upstream>
diff --git a/dev-perl/Ace/metadata.xml b/dev-perl/Ace/metadata.xml
index 8bb353cffcac..e3c030bbea4e 100644
--- a/dev-perl/Ace/metadata.xml
+++ b/dev-perl/Ace/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">AcePerl</remote-id>
     <remote-id type="cpan-module">Ace</remote-id>
diff --git a/dev-perl/Acme-Damn/metadata.xml b/dev-perl/Acme-Damn/metadata.xml
index 4df81c71fcd4..40fb52dceee7 100644
--- a/dev-perl/Acme-Damn/metadata.xml
+++ b/dev-perl/Acme-Damn/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Acme-Damn</remote-id>
 		<remote-id type="cpan-module">Acme::Damn</remote-id>
diff --git a/dev-perl/Algorithm-Annotate/metadata.xml b/dev-perl/Algorithm-Annotate/metadata.xml
index f6ffd6c9f868..99c29f19eb60 100644
--- a/dev-perl/Algorithm-Annotate/metadata.xml
+++ b/dev-perl/Algorithm-Annotate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-Annotate</remote-id>
     <remote-id type="cpan-module">Algorithm::Annotate</remote-id>
diff --git a/dev-perl/Algorithm-C3/metadata.xml b/dev-perl/Algorithm-C3/metadata.xml
index 7dc4bf78d0ed..7eb19df94460 100644
--- a/dev-perl/Algorithm-C3/metadata.xml
+++ b/dev-perl/Algorithm-C3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-C3</remote-id>
     <remote-id type="cpan-module">Algorithm::C3</remote-id>
diff --git a/dev-perl/Algorithm-ClusterPoints/metadata.xml b/dev-perl/Algorithm-ClusterPoints/metadata.xml
index 71323e06bedf..275a45711b75 100644
--- a/dev-perl/Algorithm-ClusterPoints/metadata.xml
+++ b/dev-perl/Algorithm-ClusterPoints/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Algorithm-ClusterPoints</remote-id>
 		<remote-id type="cpan-module">Algorithm::ClusterPoints</remote-id>
diff --git a/dev-perl/Algorithm-Dependency/metadata.xml b/dev-perl/Algorithm-Dependency/metadata.xml
index cfd125bba57b..34ddb56d3c87 100644
--- a/dev-perl/Algorithm-Dependency/metadata.xml
+++ b/dev-perl/Algorithm-Dependency/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-Dependency</remote-id>
     <remote-id type="cpan-module">Algorithm::Dependency</remote-id>
diff --git a/dev-perl/Algorithm-Diff/metadata.xml b/dev-perl/Algorithm-Diff/metadata.xml
index 992be0c6e8c5..1624c6013bcb 100644
--- a/dev-perl/Algorithm-Diff/metadata.xml
+++ b/dev-perl/Algorithm-Diff/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-Diff</remote-id>
     <remote-id type="cpan-module">Algorithm::Diff</remote-id>
diff --git a/dev-perl/Algorithm-Munkres/metadata.xml b/dev-perl/Algorithm-Munkres/metadata.xml
index 0132d0f32c2f..cc501c1151b2 100644
--- a/dev-perl/Algorithm-Munkres/metadata.xml
+++ b/dev-perl/Algorithm-Munkres/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-Munkres</remote-id>
     <remote-id type="cpan-module">Algorithm::Munkres</remote-id>
diff --git a/dev-perl/Alien-SDL/metadata.xml b/dev-perl/Alien-SDL/metadata.xml
index 243b6609687d..c3393ee3d57c 100644
--- a/dev-perl/Alien-SDL/metadata.xml
+++ b/dev-perl/Alien-SDL/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>games</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Alien-SDL</remote-id>
     <remote-id type="cpan-module">Alien::SDL</remote-id>
diff --git a/dev-perl/Alien-wxWidgets/metadata.xml b/dev-perl/Alien-wxWidgets/metadata.xml
index 4705c23fae57..36ff905c8566 100644
--- a/dev-perl/Alien-wxWidgets/metadata.xml
+++ b/dev-perl/Alien-wxWidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Alien-wxWidgets</remote-id>
     <remote-id type="cpan-module">Alien::wxWidgets</remote-id>
diff --git a/dev-perl/Any-Moose/metadata.xml b/dev-perl/Any-Moose/metadata.xml
index 6ebe7c947e58..7968b8b899e6 100644
--- a/dev-perl/Any-Moose/metadata.xml
+++ b/dev-perl/Any-Moose/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Any-Moose</remote-id>
     <remote-id type="cpan-module">Any::Moose</remote-id>
diff --git a/dev-perl/AnyEvent-CacheDNS/metadata.xml b/dev-perl/AnyEvent-CacheDNS/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/AnyEvent-CacheDNS/metadata.xml
+++ b/dev-perl/AnyEvent-CacheDNS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent-HTTP/metadata.xml b/dev-perl/AnyEvent-HTTP/metadata.xml
index 93ad2cce6a92..595633efd952 100644
--- a/dev-perl/AnyEvent-HTTP/metadata.xml
+++ b/dev-perl/AnyEvent-HTTP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpan">AnyEvent-HTTP</remote-id>
   <remote-id type="cpan-module">AnyEvent::HTTP</remote-id>
diff --git a/dev-perl/AnyEvent-I3/metadata.xml b/dev-perl/AnyEvent-I3/metadata.xml
index f46c5a710462..3c8d9b3b3d2f 100644
--- a/dev-perl/AnyEvent-I3/metadata.xml
+++ b/dev-perl/AnyEvent-I3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">AnyEvent-I3</remote-id>
 		<remote-id type="cpan-module">AnyEvent::I3</remote-id>
diff --git a/dev-perl/AnyEvent/metadata.xml b/dev-perl/AnyEvent/metadata.xml
index 31679d90c199..04d1bfcedb61 100644
--- a/dev-perl/AnyEvent/metadata.xml
+++ b/dev-perl/AnyEvent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">AnyEvent</remote-id>
     <remote-id type="cpan-module">AE</remote-id>
diff --git a/dev-perl/Apache-AuthCookie/metadata.xml b/dev-perl/Apache-AuthCookie/metadata.xml
index 60418ccf707a..db4025266a8a 100644
--- a/dev-perl/Apache-AuthCookie/metadata.xml
+++ b/dev-perl/Apache-AuthCookie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Apache::AuthCookie allows you to intercept a user's first unauthenticated
 		access to a protected document. The user will be presented with a custom
diff --git a/dev-perl/Apache-CGI-Builder/metadata.xml b/dev-perl/Apache-CGI-Builder/metadata.xml
index a91150333e34..c3d8cb49fd25 100644
--- a/dev-perl/Apache-CGI-Builder/metadata.xml
+++ b/dev-perl/Apache-CGI-Builder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Apache-CGI-Builder</remote-id>
     <remote-id type="cpan-module">Apache2::CGI::Builder</remote-id>
diff --git a/dev-perl/Apache-DBI/metadata.xml b/dev-perl/Apache-DBI/metadata.xml
index 54b93c0e626b..7cb32dbeaf86 100644
--- a/dev-perl/Apache-DBI/metadata.xml
+++ b/dev-perl/Apache-DBI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Apache-DBI</remote-id>
     <remote-id type="cpan-module">Apache::AuthDBI</remote-id>
diff --git a/dev-perl/Apache-LogFormat-Compiler/metadata.xml b/dev-perl/Apache-LogFormat-Compiler/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Apache-LogFormat-Compiler/metadata.xml
+++ b/dev-perl/Apache-LogFormat-Compiler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Apache-Reload/metadata.xml b/dev-perl/Apache-Reload/metadata.xml
index 97e33e8fa886..ea881c0ea5fe 100644
--- a/dev-perl/Apache-Reload/metadata.xml
+++ b/dev-perl/Apache-Reload/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Apache-Reload</remote-id>
     <remote-id type="cpan-module">Apache2::Reload</remote-id>
diff --git a/dev-perl/Apache-Session/metadata.xml b/dev-perl/Apache-Session/metadata.xml
index a09926dabfc8..332ba7099d90 100644
--- a/dev-perl/Apache-Session/metadata.xml
+++ b/dev-perl/Apache-Session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Apache-Session</remote-id>
     <remote-id type="cpan-module">Apache::Session</remote-id>
diff --git a/dev-perl/Apache-SessionX/metadata.xml b/dev-perl/Apache-SessionX/metadata.xml
index 6a23aa256637..ca1f47c07aa3 100644
--- a/dev-perl/Apache-SessionX/metadata.xml
+++ b/dev-perl/Apache-SessionX/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Apache-SessionX</remote-id>
     <remote-id type="cpan-module">Apache::SessionX</remote-id>
diff --git a/dev-perl/Apache-SizeLimit/metadata.xml b/dev-perl/Apache-SizeLimit/metadata.xml
index 81df8fdf5c36..7dfdca34a3f5 100644
--- a/dev-perl/Apache-SizeLimit/metadata.xml
+++ b/dev-perl/Apache-SizeLimit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Apache-SizeLimit</remote-id>
 		<remote-id type="cpan-module">Apache2::SizeLimit</remote-id>
diff --git a/dev-perl/Apache-Test/metadata.xml b/dev-perl/Apache-Test/metadata.xml
index 045d71022b15..9caa6fe5f8c0 100644
--- a/dev-perl/Apache-Test/metadata.xml
+++ b/dev-perl/Apache-Test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>The Apache::Test framework was designed for creating test
 		suites for products running on the Apache httpd webserver (not
 		necessarily mod_perl). Originally designed for the mod_perl Apache
diff --git a/dev-perl/Apache2-AuthenNTLM/metadata.xml b/dev-perl/Apache2-AuthenNTLM/metadata.xml
index c66054939068..2c0be026bad6 100644
--- a/dev-perl/Apache2-AuthenNTLM/metadata.xml
+++ b/dev-perl/Apache2-AuthenNTLM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 The purpose of this module is to perform a user authentication via Microsoft's
 NTLM protocol. This protocol is supported by all versions of the Internet
diff --git a/dev-perl/App-CLI/metadata.xml b/dev-perl/App-CLI/metadata.xml
index 6a32d6981837..99e418664f01 100644
--- a/dev-perl/App-CLI/metadata.xml
+++ b/dev-perl/App-CLI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">App-CLI</remote-id>
     <remote-id type="cpan-module">App::CLI</remote-id>
diff --git a/dev-perl/App-Nopaste/metadata.xml b/dev-perl/App-Nopaste/metadata.xml
index c3c2350859d6..b07b6d527698 100644
--- a/dev-perl/App-Nopaste/metadata.xml
+++ b/dev-perl/App-Nopaste/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="pastebin">pastebin.com support</flag>
     <flag name="clipboard">copying of URLs with -x/--copy</flag>
diff --git a/dev-perl/App-cpanminus/metadata.xml b/dev-perl/App-cpanminus/metadata.xml
index 8188f13f3be4..0a05ad945217 100644
--- a/dev-perl/App-cpanminus/metadata.xml
+++ b/dev-perl/App-cpanminus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">App-cpanminus</remote-id>
         <remote-id type="cpan-module">App::cpanminus</remote-id>
diff --git a/dev-perl/App-perlbrew/metadata.xml b/dev-perl/App-perlbrew/metadata.xml
index 518a573ba31e..60059e821be3 100644
--- a/dev-perl/App-perlbrew/metadata.xml
+++ b/dev-perl/App-perlbrew/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">App-perlbrew</remote-id>
         <remote-id type="cpan-module">App::perlbrew</remote-id>
diff --git a/dev-perl/AppConfig/metadata.xml b/dev-perl/AppConfig/metadata.xml
index a41506a11a14..ce7ec5c284f2 100644
--- a/dev-perl/AppConfig/metadata.xml
+++ b/dev-perl/AppConfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">AppConfig</remote-id>
     <remote-id type="cpan-module">AppConfig</remote-id>
diff --git a/dev-perl/Archive-Any/metadata.xml b/dev-perl/Archive-Any/metadata.xml
index 49accddc28df..55a7211a4732 100644
--- a/dev-perl/Archive-Any/metadata.xml
+++ b/dev-perl/Archive-Any/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Archive-Any</remote-id>
                 <remote-id type="cpan-module">Archive::Any</remote-id>
diff --git a/dev-perl/Archive-Extract/metadata.xml b/dev-perl/Archive-Extract/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Archive-Extract/metadata.xml
+++ b/dev-perl/Archive-Extract/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Archive-Rar/metadata.xml b/dev-perl/Archive-Rar/metadata.xml
index 5e6e6d1dacc9..2efc460f7221 100644
--- a/dev-perl/Archive-Rar/metadata.xml
+++ b/dev-perl/Archive-Rar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Pure impementation of rar. Tests for this module only work
 	on platforms that can support the rar executable, however, which at the
 	moment is the x86/amd64 family.</longdescription>
diff --git a/dev-perl/Archive-Zip/metadata.xml b/dev-perl/Archive-Zip/metadata.xml
index f014cbedd738..52ae8d0cc7b2 100644
--- a/dev-perl/Archive-Zip/metadata.xml
+++ b/dev-perl/Archive-Zip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Archive-Zip</remote-id>
     <remote-id type="cpan-module">Archive::Zip</remote-id>
diff --git a/dev-perl/Array-Compare/metadata.xml b/dev-perl/Array-Compare/metadata.xml
index 720a3b9f2156..56dacf17e0a3 100644
--- a/dev-perl/Array-Compare/metadata.xml
+++ b/dev-perl/Array-Compare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Array-Compare</remote-id>
     <remote-id type="cpan-module">Array::Compare</remote-id>
diff --git a/dev-perl/Array-RefElem/metadata.xml b/dev-perl/Array-RefElem/metadata.xml
index 0237e6537aa5..6b6ea5b4bb24 100644
--- a/dev-perl/Array-RefElem/metadata.xml
+++ b/dev-perl/Array-RefElem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Array-RefElem</remote-id>
     <remote-id type="cpan-module">Array::RefElem</remote-id>
diff --git a/dev-perl/Array-Window/metadata.xml b/dev-perl/Array-Window/metadata.xml
index 538ec810b55e..51af1ab465c6 100644
--- a/dev-perl/Array-Window/metadata.xml
+++ b/dev-perl/Array-Window/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Array-Window</remote-id>
     <remote-id type="cpan-module">Array::Window</remote-id>
diff --git a/dev-perl/Astro-FITS-Header/metadata.xml b/dev-perl/Astro-FITS-Header/metadata.xml
index d7df40ad1242..c18f4dc72b32 100644
--- a/dev-perl/Astro-FITS-Header/metadata.xml
+++ b/dev-perl/Astro-FITS-Header/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Astro-FITS-Header</remote-id>
     <remote-id type="cpan-module">Astro::FITS::Header</remote-id>
diff --git a/dev-perl/AtExit/metadata.xml b/dev-perl/AtExit/metadata.xml
index 0f255746ff0d..2f7ad55ef34c 100644
--- a/dev-perl/AtExit/metadata.xml
+++ b/dev-perl/AtExit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">AtExit</remote-id>
     <remote-id type="cpan-module">AtExit</remote-id>
diff --git a/dev-perl/Audio-CD-disc-cover/metadata.xml b/dev-perl/Audio-CD-disc-cover/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Audio-CD-disc-cover/metadata.xml
+++ b/dev-perl/Audio-CD-disc-cover/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Audio-DSP/metadata.xml b/dev-perl/Audio-DSP/metadata.xml
index 6a5259b601ef..cf498de3275e 100644
--- a/dev-perl/Audio-DSP/metadata.xml
+++ b/dev-perl/Audio-DSP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Audio-DSP</remote-id>
     <remote-id type="cpan-module">Audio::DSP</remote-id>
diff --git a/dev-perl/Audio-FLAC-Header/metadata.xml b/dev-perl/Audio-FLAC-Header/metadata.xml
index 17dba7dbb6d8..a1e13236d566 100644
--- a/dev-perl/Audio-FLAC-Header/metadata.xml
+++ b/dev-perl/Audio-FLAC-Header/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Audio-FLAC-Header</remote-id>
     <remote-id type="cpan-module">Audio::FLAC::Header</remote-id>
diff --git a/dev-perl/Audio-Mixer/metadata.xml b/dev-perl/Audio-Mixer/metadata.xml
index ec0790f3d525..feff08c3ff75 100644
--- a/dev-perl/Audio-Mixer/metadata.xml
+++ b/dev-perl/Audio-Mixer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Audio-Mixer</remote-id>
     <remote-id type="cpan-module">Audio::Mixer</remote-id>
diff --git a/dev-perl/Audio-Musepack/metadata.xml b/dev-perl/Audio-Musepack/metadata.xml
index 06f7c463c785..247dc4f85308 100644
--- a/dev-perl/Audio-Musepack/metadata.xml
+++ b/dev-perl/Audio-Musepack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Audio-Musepack</remote-id>
                 <remote-id type="cpan-module">Audio::APE</remote-id>
diff --git a/dev-perl/Audio-Scan/metadata.xml b/dev-perl/Audio-Scan/metadata.xml
index 07e6d5255e1e..278acdafdd54 100644
--- a/dev-perl/Audio-Scan/metadata.xml
+++ b/dev-perl/Audio-Scan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Audio-Scan</remote-id>
     <remote-id type="cpan-module">Audio::Scan</remote-id>
diff --git a/dev-perl/Audio-WMA/metadata.xml b/dev-perl/Audio-WMA/metadata.xml
index 662b889f1a5f..3c80dec5279b 100644
--- a/dev-perl/Audio-WMA/metadata.xml
+++ b/dev-perl/Audio-WMA/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Audio-WMA</remote-id>
                 <remote-id type="cpan-module">Audio::WMA</remote-id>
diff --git a/dev-perl/Audio-Wav/metadata.xml b/dev-perl/Audio-Wav/metadata.xml
index b3c51d9055f3..deb2276a82f1 100644
--- a/dev-perl/Audio-Wav/metadata.xml
+++ b/dev-perl/Audio-Wav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Audio-Wav</remote-id>
     <remote-id type="cpan-module">Audio::Wav</remote-id>
diff --git a/dev-perl/Authen-DigestMD5/metadata.xml b/dev-perl/Authen-DigestMD5/metadata.xml
index 8dd3a735f29f..574384763a52 100644
--- a/dev-perl/Authen-DigestMD5/metadata.xml
+++ b/dev-perl/Authen-DigestMD5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-DigestMD5</remote-id>
     <remote-id type="cpan-module">Authen::DigestMD5</remote-id>
diff --git a/dev-perl/Authen-Htpasswd/metadata.xml b/dev-perl/Authen-Htpasswd/metadata.xml
index f94b915c567f..a10479548d45 100644
--- a/dev-perl/Authen-Htpasswd/metadata.xml
+++ b/dev-perl/Authen-Htpasswd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-Htpasswd</remote-id>
     <remote-id type="cpan-module">Authen::Htpasswd</remote-id>
diff --git a/dev-perl/Authen-Libwrap/metadata.xml b/dev-perl/Authen-Libwrap/metadata.xml
index 578639653d80..b17801767e47 100644
--- a/dev-perl/Authen-Libwrap/metadata.xml
+++ b/dev-perl/Authen-Libwrap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-Libwrap</remote-id>
     <remote-id type="cpan-module">Authen::Libwrap</remote-id>
diff --git a/dev-perl/Authen-NTLM/metadata.xml b/dev-perl/Authen-NTLM/metadata.xml
index 340908440c3c..0532dfb74771 100644
--- a/dev-perl/Authen-NTLM/metadata.xml
+++ b/dev-perl/Authen-NTLM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">NTLM</remote-id>
     <remote-id type="cpan-module">Authen::NTLM</remote-id>
diff --git a/dev-perl/Authen-PAM/metadata.xml b/dev-perl/Authen-PAM/metadata.xml
index dabdbc96a106..e493ff9b9a27 100644
--- a/dev-perl/Authen-PAM/metadata.xml
+++ b/dev-perl/Authen-PAM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-PAM</remote-id>
     <remote-id type="cpan-module">Authen::PAM</remote-id>
diff --git a/dev-perl/Authen-SASL-SASLprep/metadata.xml b/dev-perl/Authen-SASL-SASLprep/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Authen-SASL-SASLprep/metadata.xml
+++ b/dev-perl/Authen-SASL-SASLprep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Authen-SASL/metadata.xml b/dev-perl/Authen-SASL/metadata.xml
index b7e86e33c918..ab784f11326a 100644
--- a/dev-perl/Authen-SASL/metadata.xml
+++ b/dev-perl/Authen-SASL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-SASL</remote-id>
     <remote-id type="cpan-module">Authen::SASL</remote-id>
diff --git a/dev-perl/Authen-SCRAM/metadata.xml b/dev-perl/Authen-SCRAM/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Authen-SCRAM/metadata.xml
+++ b/dev-perl/Authen-SCRAM/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/AutoXS-Header/metadata.xml b/dev-perl/AutoXS-Header/metadata.xml
index 7ac8fa082727..c289706faca2 100644
--- a/dev-perl/AutoXS-Header/metadata.xml
+++ b/dev-perl/AutoXS-Header/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">AutoXS-Header</remote-id>
     <remote-id type="cpan-module">AutoXS::Header</remote-id>
diff --git a/dev-perl/B-Hooks-EndOfScope/metadata.xml b/dev-perl/B-Hooks-EndOfScope/metadata.xml
index 941b72a43d1e..fe0bb9bd450e 100644
--- a/dev-perl/B-Hooks-EndOfScope/metadata.xml
+++ b/dev-perl/B-Hooks-EndOfScope/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-Hooks-EndOfScope</remote-id>
     <remote-id type="cpan-module">B::Hooks::EndOfScope</remote-id>
diff --git a/dev-perl/B-Hooks-OP-Check/metadata.xml b/dev-perl/B-Hooks-OP-Check/metadata.xml
index dd429bfc5781..5842b3e56520 100644
--- a/dev-perl/B-Hooks-OP-Check/metadata.xml
+++ b/dev-perl/B-Hooks-OP-Check/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-Hooks-OP-Check</remote-id>
     <remote-id type="cpan-module">B::Hooks::OP::Check</remote-id>
diff --git a/dev-perl/B-Hooks-Parser/metadata.xml b/dev-perl/B-Hooks-Parser/metadata.xml
index ae2fbc836359..0b05f6220ca0 100644
--- a/dev-perl/B-Hooks-Parser/metadata.xml
+++ b/dev-perl/B-Hooks-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-Hooks-Parser</remote-id>
     <remote-id type="cpan-module">B::Hooks::Parser</remote-id>
diff --git a/dev-perl/B-Keywords/metadata.xml b/dev-perl/B-Keywords/metadata.xml
index a102693cd43e..732a897e3870 100644
--- a/dev-perl/B-Keywords/metadata.xml
+++ b/dev-perl/B-Keywords/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-Keywords</remote-id>
     <remote-id type="cpan-module">B::Keywords</remote-id>
diff --git a/dev-perl/B-OPCheck/metadata.xml b/dev-perl/B-OPCheck/metadata.xml
index c8a48946c4a3..2c829d123c9b 100644
--- a/dev-perl/B-OPCheck/metadata.xml
+++ b/dev-perl/B-OPCheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-OPCheck</remote-id>
     <remote-id type="cpan-module">B::OPCheck</remote-id>
diff --git a/dev-perl/B-Utils/metadata.xml b/dev-perl/B-Utils/metadata.xml
index 062301e6192d..6e4292e5752e 100644
--- a/dev-perl/B-Utils/metadata.xml
+++ b/dev-perl/B-Utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">B-Utils</remote-id>
     <remote-id type="cpan-module">B::Utils</remote-id>
diff --git a/dev-perl/BSD-Resource/metadata.xml b/dev-perl/BSD-Resource/metadata.xml
index 024fb90bfa04..502ec82ce239 100644
--- a/dev-perl/BSD-Resource/metadata.xml
+++ b/dev-perl/BSD-Resource/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">BSD-Resource</remote-id>
     <remote-id type="cpan-module">BSD::Resource</remote-id>
diff --git a/dev-perl/BZ-Client/metadata.xml b/dev-perl/BZ-Client/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/BZ-Client/metadata.xml
+++ b/dev-perl/BZ-Client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Benchmark-Timer/metadata.xml b/dev-perl/Benchmark-Timer/metadata.xml
index ec3cbfb1a133..7407e8ed8a32 100644
--- a/dev-perl/Benchmark-Timer/metadata.xml
+++ b/dev-perl/Benchmark-Timer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Benchmark-Timer</remote-id>
     <remote-id type="cpan-module">Benchmark::Timer</remote-id>
diff --git a/dev-perl/BerkeleyDB/metadata.xml b/dev-perl/BerkeleyDB/metadata.xml
index 8ea9bf1a2007..9a6b1b9d8ce0 100644
--- a/dev-perl/BerkeleyDB/metadata.xml
+++ b/dev-perl/BerkeleyDB/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">BerkeleyDB</remote-id>
     <remote-id type="cpan-module">BerkeleyDB</remote-id>
diff --git a/dev-perl/Bio-ASN1-EntrezGene/metadata.xml b/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
index f7d077187177..0a81d7da82e7 100644
--- a/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
+++ b/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-ASN1-EntrezGene</remote-id>
     <remote-id type="cpan-module">Bio::ASN1::EntrezGene</remote-id>
diff --git a/dev-perl/Bio-Das/metadata.xml b/dev-perl/Bio-Das/metadata.xml
index b5a15bb35507..c4b06e9502b5 100644
--- a/dev-perl/Bio-Das/metadata.xml
+++ b/dev-perl/Bio-Das/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-Das</remote-id>
     <remote-id type="cpan-module">Bio::Das</remote-id>
diff --git a/dev-perl/Bio-Graphics/metadata.xml b/dev-perl/Bio-Graphics/metadata.xml
index 8567b6c7375a..0acdc8e2d3b0 100644
--- a/dev-perl/Bio-Graphics/metadata.xml
+++ b/dev-perl/Bio-Graphics/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-Graphics</remote-id>
     <remote-id type="cpan-module">Bio::Graphics</remote-id>
diff --git a/dev-perl/Bio-SamTools/metadata.xml b/dev-perl/Bio-SamTools/metadata.xml
index 12a28e844875..a21aa65d6b1e 100644
--- a/dev-perl/Bio-SamTools/metadata.xml
+++ b/dev-perl/Bio-SamTools/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-SamTools</remote-id>
     <remote-id type="cpan-module">Bio::DB::Bam</remote-id>
diff --git a/dev-perl/Bit-Vector-Minimal/metadata.xml b/dev-perl/Bit-Vector-Minimal/metadata.xml
index e178dbbbf4ce..b73163b01aaa 100644
--- a/dev-perl/Bit-Vector-Minimal/metadata.xml
+++ b/dev-perl/Bit-Vector-Minimal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bit-Vector-Minimal</remote-id>
     <remote-id type="cpan-module">Bit::Vector::Minimal</remote-id>
diff --git a/dev-perl/Bit-Vector/metadata.xml b/dev-perl/Bit-Vector/metadata.xml
index 05325eca43cc..8d5616816a49 100644
--- a/dev-perl/Bit-Vector/metadata.xml
+++ b/dev-perl/Bit-Vector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Bit-Vector</remote-id>
     <remote-id type="cpan-module">Bit::Vector</remote-id>
diff --git a/dev-perl/Boulder/metadata.xml b/dev-perl/Boulder/metadata.xml
index 171da44efcae..76ebf5ad50d0 100644
--- a/dev-perl/Boulder/metadata.xml
+++ b/dev-perl/Boulder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Parse and read BLASTs, Boulders, Stones</longdescription>
   <upstream>
     <remote-id type="cpan">Boulder</remote-id>
diff --git a/dev-perl/Business-FedEx-DirectConnect/metadata.xml b/dev-perl/Business-FedEx-DirectConnect/metadata.xml
index d4983eb5fa60..57f25aa7a2ad 100644
--- a/dev-perl/Business-FedEx-DirectConnect/metadata.xml
+++ b/dev-perl/Business-FedEx-DirectConnect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Business-FedEx-DirectConnect</remote-id>
     <remote-id type="cpan-module">Business::FedEx::Constants</remote-id>
diff --git a/dev-perl/Business-ISBN-Data/metadata.xml b/dev-perl/Business-ISBN-Data/metadata.xml
index 9b15065a0b6c..646127c17615 100644
--- a/dev-perl/Business-ISBN-Data/metadata.xml
+++ b/dev-perl/Business-ISBN-Data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Business-ISBN-Data</remote-id>
 		<remote-id type="cpan-module">Business::ISBN</remote-id>
diff --git a/dev-perl/Business-ISBN/metadata.xml b/dev-perl/Business-ISBN/metadata.xml
index ae88887b911c..cf8ed571e991 100644
--- a/dev-perl/Business-ISBN/metadata.xml
+++ b/dev-perl/Business-ISBN/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Business-ISBN</remote-id>
 		<remote-id type="cpan-module">Business::ISBN</remote-id>
diff --git a/dev-perl/Business-ISMN/metadata.xml b/dev-perl/Business-ISMN/metadata.xml
index 3d758b849626..57340b70ce19 100644
--- a/dev-perl/Business-ISMN/metadata.xml
+++ b/dev-perl/Business-ISMN/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Business-ISMN</remote-id>
 		<remote-id type="cpan-module">Business::ISBM::Data</remote-id>
diff --git a/dev-perl/Business-ISSN/metadata.xml b/dev-perl/Business-ISSN/metadata.xml
index 58e35cdcd8b5..cd1f18d28e2a 100644
--- a/dev-perl/Business-ISSN/metadata.xml
+++ b/dev-perl/Business-ISSN/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Business-ISSN</remote-id>
 		<remote-id type="cpan-module">Business::ISSN</remote-id>
diff --git a/dev-perl/Business-Tax-VAT-Validation/metadata.xml b/dev-perl/Business-Tax-VAT-Validation/metadata.xml
index d782d1797e88..3690da2a65e8 100644
--- a/dev-perl/Business-Tax-VAT-Validation/metadata.xml
+++ b/dev-perl/Business-Tax-VAT-Validation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Business-Tax-VAT-Validation</remote-id>
         <remote-id type="cpan-module">Business::Tax::VAT::Validation</remote-id>
diff --git a/dev-perl/Business-UPS/metadata.xml b/dev-perl/Business-UPS/metadata.xml
index dd5c133c570a..f53c6e5599ab 100644
--- a/dev-perl/Business-UPS/metadata.xml
+++ b/dev-perl/Business-UPS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Business-UPS</remote-id>
     <remote-id type="cpan-module">Business::UPS</remote-id>
diff --git a/dev-perl/CDB_File/metadata.xml b/dev-perl/CDB_File/metadata.xml
index ab63d776b923..ab0b9f332d5e 100644
--- a/dev-perl/CDB_File/metadata.xml
+++ b/dev-perl/CDB_File/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CDB_File</remote-id>
     <remote-id type="cpan-module">CDB_File</remote-id>
diff --git a/dev-perl/CDDB-File/metadata.xml b/dev-perl/CDDB-File/metadata.xml
index 017ee1d479a0..fbfc3f17758e 100644
--- a/dev-perl/CDDB-File/metadata.xml
+++ b/dev-perl/CDDB-File/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CDDB-File</remote-id>
     <remote-id type="cpan-module">CDDB::File</remote-id>
diff --git a/dev-perl/CDDB/metadata.xml b/dev-perl/CDDB/metadata.xml
index 4de4d75c9777..a45dc43ff700 100644
--- a/dev-perl/CDDB/metadata.xml
+++ b/dev-perl/CDDB/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CDDB</remote-id>
     <remote-id type="cpan-module">CDDB</remote-id>
diff --git a/dev-perl/CDDB_get/metadata.xml b/dev-perl/CDDB_get/metadata.xml
index 0664831231ae..b94909479bec 100644
--- a/dev-perl/CDDB_get/metadata.xml
+++ b/dev-perl/CDDB_get/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CDDB_get</remote-id>
     <remote-id type="cpan-module">CDDB_cache</remote-id>
diff --git a/dev-perl/CGI-Ajax/metadata.xml b/dev-perl/CGI-Ajax/metadata.xml
index 73be92b30329..a01cc3591d37 100644
--- a/dev-perl/CGI-Ajax/metadata.xml
+++ b/dev-perl/CGI-Ajax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">CGI-Ajax</remote-id>
                 <remote-id type="cpan-module">CGI::Ajax</remote-id>
diff --git a/dev-perl/CGI-Builder/metadata.xml b/dev-perl/CGI-Builder/metadata.xml
index 037610eab0ad..af73bb97e795 100644
--- a/dev-perl/CGI-Builder/metadata.xml
+++ b/dev-perl/CGI-Builder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-Builder</remote-id>
     <remote-id type="cpan-module">CGI::Builder</remote-id>
diff --git a/dev-perl/CGI-Emulate-PSGI/metadata.xml b/dev-perl/CGI-Emulate-PSGI/metadata.xml
index 2b4f34faf080..db5d3f6b8fc1 100644
--- a/dev-perl/CGI-Emulate-PSGI/metadata.xml
+++ b/dev-perl/CGI-Emulate-PSGI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-Emulate-PSGI</remote-id>
     <remote-id type="cpan-module">CGI::Emulate::PSGI</remote-id>
diff --git a/dev-perl/CGI-Fast/metadata.xml b/dev-perl/CGI-Fast/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/CGI-Fast/metadata.xml
+++ b/dev-perl/CGI-Fast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/CGI-FastTemplate/metadata.xml b/dev-perl/CGI-FastTemplate/metadata.xml
index 7bde304d8f9f..11a07c88ea67 100644
--- a/dev-perl/CGI-FastTemplate/metadata.xml
+++ b/dev-perl/CGI-FastTemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-FastTemplate</remote-id>
     <remote-id type="cpan-module">CGI::FastTemplate</remote-id>
diff --git a/dev-perl/CGI-FormBuilder/metadata.xml b/dev-perl/CGI-FormBuilder/metadata.xml
index 32a527bc7dc7..baf29e42e9e3 100644
--- a/dev-perl/CGI-FormBuilder/metadata.xml
+++ b/dev-perl/CGI-FormBuilder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-FormBuilder</remote-id>
     <remote-id type="cpan-module">CGI::FormBuilder</remote-id>
diff --git a/dev-perl/CGI-PSGI/metadata.xml b/dev-perl/CGI-PSGI/metadata.xml
index 69b7974bd312..1cc1ad456e3b 100644
--- a/dev-perl/CGI-PSGI/metadata.xml
+++ b/dev-perl/CGI-PSGI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-PSGI</remote-id>
     <remote-id type="cpan-module">CGI::PSGI</remote-id>
diff --git a/dev-perl/CGI-Session/metadata.xml b/dev-perl/CGI-Session/metadata.xml
index 0be8c5262a35..185e6736d175 100644
--- a/dev-perl/CGI-Session/metadata.xml
+++ b/dev-perl/CGI-Session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-Session</remote-id>
     <remote-id type="cpan-module">CGI::Session</remote-id>
diff --git a/dev-perl/CGI-Simple/metadata.xml b/dev-perl/CGI-Simple/metadata.xml
index babe24f21678..8c98ad8cb44c 100644
--- a/dev-perl/CGI-Simple/metadata.xml
+++ b/dev-perl/CGI-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI-Simple</remote-id>
     <remote-id type="cpan-module">CGI::Simple</remote-id>
diff --git a/dev-perl/CGI/metadata.xml b/dev-perl/CGI/metadata.xml
index 6c8ef312317c..109fc07e278c 100644
--- a/dev-perl/CGI/metadata.xml
+++ b/dev-perl/CGI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CGI</remote-id>
     <remote-id type="cpan-module">CGI</remote-id>
diff --git a/dev-perl/CHI/metadata.xml b/dev-perl/CHI/metadata.xml
index 7c7452da2484..54a0a2ab9180 100644
--- a/dev-perl/CHI/metadata.xml
+++ b/dev-perl/CHI/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CHI</remote-id>
     <remote-id type="cpan-module">CHI</remote-id>
diff --git a/dev-perl/CPAN-Changes/metadata.xml b/dev-perl/CPAN-Changes/metadata.xml
index 7cfb131c3520..e98e0cbdbf3d 100644
--- a/dev-perl/CPAN-Changes/metadata.xml
+++ b/dev-perl/CPAN-Changes/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">CPAN-Changes</remote-id>
 		<remote-id type="cpan-module">CPAN::Changes</remote-id>
diff --git a/dev-perl/CPAN-Checksums/metadata.xml b/dev-perl/CPAN-Checksums/metadata.xml
index a3b70dfa4610..6a4afcdbc23f 100644
--- a/dev-perl/CPAN-Checksums/metadata.xml
+++ b/dev-perl/CPAN-Checksums/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CPAN-Checksums</remote-id>
     <remote-id type="cpan-module">CPAN::Checksums</remote-id>
diff --git a/dev-perl/CPAN-Meta-Check/metadata.xml b/dev-perl/CPAN-Meta-Check/metadata.xml
index cba350d03583..254b9c7bab76 100644
--- a/dev-perl/CPAN-Meta-Check/metadata.xml
+++ b/dev-perl/CPAN-Meta-Check/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">CPAN-Meta-Check</remote-id>
 		<remote-id type="cpan-module">CPAN::Meta::Check</remote-id>
diff --git a/dev-perl/CPAN-Mini-Inject/metadata.xml b/dev-perl/CPAN-Mini-Inject/metadata.xml
index 5a30be3cf669..4f6e16302b73 100644
--- a/dev-perl/CPAN-Mini-Inject/metadata.xml
+++ b/dev-perl/CPAN-Mini-Inject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Provides the binary mcpani for adding a module to the repository for later inclusion in the CPAN Mini mirror.</longdescription>
   <upstream>
     <remote-id type="cpan">CPAN-Mini-Inject</remote-id>
diff --git a/dev-perl/CPAN-Mini/metadata.xml b/dev-perl/CPAN-Mini/metadata.xml
index b97738b4af46..b2a3b9070444 100644
--- a/dev-perl/CPAN-Mini/metadata.xml
+++ b/dev-perl/CPAN-Mini/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Provides minicpan, a means of creating a portable CPAN distribution to remote sites.</longdescription>
   <upstream>
     <remote-id type="cpan">CPAN-Mini</remote-id>
diff --git a/dev-perl/CPAN-Perl-Releases/metadata.xml b/dev-perl/CPAN-Perl-Releases/metadata.xml
index a6274822e3d5..0c0138d94741 100644
--- a/dev-perl/CPAN-Perl-Releases/metadata.xml
+++ b/dev-perl/CPAN-Perl-Releases/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">CPAN-Perl-Releases</remote-id>
         <remote-id type="cpan-module">CPAN::Perl::Releases</remote-id>
diff --git a/dev-perl/CQL-Parser/metadata.xml b/dev-perl/CQL-Parser/metadata.xml
index 0ac2267f2695..450b8c1b2a9e 100644
--- a/dev-perl/CQL-Parser/metadata.xml
+++ b/dev-perl/CQL-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CQL-Parser</remote-id>
     <remote-id type="cpan-module">CQL::AndNode</remote-id>
diff --git a/dev-perl/CSS-Minifier/metadata.xml b/dev-perl/CSS-Minifier/metadata.xml
index d83b098af8e3..897815f4e369 100644
--- a/dev-perl/CSS-Minifier/metadata.xml
+++ b/dev-perl/CSS-Minifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CSS-Minifier</remote-id>
     <remote-id type="cpan-module">CSS::Minifier</remote-id>
diff --git a/dev-perl/CSS-Packer/metadata.xml b/dev-perl/CSS-Packer/metadata.xml
index a6a5dc6b3a0c..c8bfa277d789 100644
--- a/dev-perl/CSS-Packer/metadata.xml
+++ b/dev-perl/CSS-Packer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">CSS-Packer</remote-id>
                 <remote-id type="cpan-module">CSS::Packer</remote-id>
diff --git a/dev-perl/CSS-Squish/metadata.xml b/dev-perl/CSS-Squish/metadata.xml
index 8674eedaeb04..7c043c9dc2b4 100644
--- a/dev-perl/CSS-Squish/metadata.xml
+++ b/dev-perl/CSS-Squish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CSS-Squish</remote-id>
     <remote-id type="cpan-module">CSS::Squish</remote-id>
diff --git a/dev-perl/Cache-Cache/metadata.xml b/dev-perl/Cache-Cache/metadata.xml
index e49d246def39..d1013ac8d59c 100644
--- a/dev-perl/Cache-Cache/metadata.xml
+++ b/dev-perl/Cache-Cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Cache</remote-id>
     <remote-id type="cpan-module">Cache::BaseCache</remote-id>
diff --git a/dev-perl/Cache-FastMmap/metadata.xml b/dev-perl/Cache-FastMmap/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Cache-FastMmap/metadata.xml
+++ b/dev-perl/Cache-FastMmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Cache-Memcached-Fast/metadata.xml b/dev-perl/Cache-Memcached-Fast/metadata.xml
index d8ec9b759d5b..f8b9d2156d88 100644
--- a/dev-perl/Cache-Memcached-Fast/metadata.xml
+++ b/dev-perl/Cache-Memcached-Fast/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Memcached-Fast</remote-id>
     <remote-id type="cpan-module">Cache::Memcached::Fast</remote-id>
diff --git a/dev-perl/Cache-Memcached/metadata.xml b/dev-perl/Cache-Memcached/metadata.xml
index 0cb60d3dae41..ce51a7a7641d 100644
--- a/dev-perl/Cache-Memcached/metadata.xml
+++ b/dev-perl/Cache-Memcached/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Memcached</remote-id>
     <remote-id type="cpan-module">Cache::Memcached</remote-id>
diff --git a/dev-perl/Cache-Simple-TimedExpiry/metadata.xml b/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
index 03a9637eac11..1db4557d7f11 100644
--- a/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
+++ b/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Simple-TimedExpiry</remote-id>
     <remote-id type="cpan-module">Cache::Simple::TimedExpiry</remote-id>
diff --git a/dev-perl/Cache/metadata.xml b/dev-perl/Cache/metadata.xml
index a18ce47ba041..fd97cfb0b43e 100644
--- a/dev-perl/Cache/metadata.xml
+++ b/dev-perl/Cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Cache</remote-id>
 		<remote-id type="cpan-module">Cache</remote-id>
diff --git a/dev-perl/Cairo/metadata.xml b/dev-perl/Cairo/metadata.xml
index e1a11e9e2fa5..77068a9e461c 100644
--- a/dev-perl/Cairo/metadata.xml
+++ b/dev-perl/Cairo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cairo</remote-id>
     <remote-id type="cpan-module">Cairo</remote-id>
diff --git a/dev-perl/Calendar-Simple/metadata.xml b/dev-perl/Calendar-Simple/metadata.xml
index 31e5dbde6076..64728fca00fd 100644
--- a/dev-perl/Calendar-Simple/metadata.xml
+++ b/dev-perl/Calendar-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Calendar-Simple</remote-id>
     <remote-id type="cpan-module">Calendar::Simple</remote-id>
diff --git a/dev-perl/Canary-Stability/metadata.xml b/dev-perl/Canary-Stability/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Canary-Stability/metadata.xml
+++ b/dev-perl/Canary-Stability/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Capture-Tiny/metadata.xml b/dev-perl/Capture-Tiny/metadata.xml
index f6442cfae76b..2e033e607902 100644
--- a/dev-perl/Capture-Tiny/metadata.xml
+++ b/dev-perl/Capture-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Capture-Tiny</remote-id>
     <remote-id type="cpan-module">Capture::Tiny</remote-id>
diff --git a/dev-perl/Carp-Assert-More/metadata.xml b/dev-perl/Carp-Assert-More/metadata.xml
index 522d9156f94e..7e7565247960 100644
--- a/dev-perl/Carp-Assert-More/metadata.xml
+++ b/dev-perl/Carp-Assert-More/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Carp-Assert-More</remote-id>
     <remote-id type="cpan-module">Carp::Assert::More</remote-id>
diff --git a/dev-perl/Carp-Assert/metadata.xml b/dev-perl/Carp-Assert/metadata.xml
index 95381f0ff4e4..c0c8376d755e 100644
--- a/dev-perl/Carp-Assert/metadata.xml
+++ b/dev-perl/Carp-Assert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Carp-Assert</remote-id>
     <remote-id type="cpan-module">Carp::Assert</remote-id>
diff --git a/dev-perl/Carp-Clan/metadata.xml b/dev-perl/Carp-Clan/metadata.xml
index 443775ee2f5d..f271f1df5683 100644
--- a/dev-perl/Carp-Clan/metadata.xml
+++ b/dev-perl/Carp-Clan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Carp-Clan</remote-id>
     <remote-id type="cpan-module">Carp::Clan</remote-id>
diff --git a/dev-perl/Chart-Math-Axis/metadata.xml b/dev-perl/Chart-Math-Axis/metadata.xml
index fc28b2e72d68..19a93c66c718 100644
--- a/dev-perl/Chart-Math-Axis/metadata.xml
+++ b/dev-perl/Chart-Math-Axis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Chart-Math-Axis</remote-id>
     <remote-id type="cpan-module">Chart::Math::Axis</remote-id>
diff --git a/dev-perl/Chart/metadata.xml b/dev-perl/Chart/metadata.xml
index 19163b58c8d3..241e86918c22 100644
--- a/dev-perl/Chart/metadata.xml
+++ b/dev-perl/Chart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Chart</remote-id>
     <remote-id type="cpan-module">Chart::Bars</remote-id>
diff --git a/dev-perl/Cisco-IPPhone/metadata.xml b/dev-perl/Cisco-IPPhone/metadata.xml
index 97787ef023ac..1208183fb9e8 100644
--- a/dev-perl/Cisco-IPPhone/metadata.xml
+++ b/dev-perl/Cisco-IPPhone/metadata.xml
@@ -5,7 +5,10 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cisco-IPPhone</remote-id>
     <remote-id type="cpan-module">Cisco::IPPhone</remote-id>
diff --git a/dev-perl/Cisco-Reconfig/metadata.xml b/dev-perl/Cisco-Reconfig/metadata.xml
index ff8aa834d16d..4c05f6375ceb 100644
--- a/dev-perl/Cisco-Reconfig/metadata.xml
+++ b/dev-perl/Cisco-Reconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cisco-Reconfig</remote-id>
     <remote-id type="cpan-module">Cisco::Reconfig</remote-id>
diff --git a/dev-perl/Class-Accessor-Chained/metadata.xml b/dev-perl/Class-Accessor-Chained/metadata.xml
index c86050b181d7..58a277cd60a0 100644
--- a/dev-perl/Class-Accessor-Chained/metadata.xml
+++ b/dev-perl/Class-Accessor-Chained/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Chained</remote-id>
     <remote-id type="cpan-module">Class::Accessor::Chained</remote-id>
diff --git a/dev-perl/Class-Accessor-Grouped/metadata.xml b/dev-perl/Class-Accessor-Grouped/metadata.xml
index d0b38406359c..4f6923659a3f 100644
--- a/dev-perl/Class-Accessor-Grouped/metadata.xml
+++ b/dev-perl/Class-Accessor-Grouped/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Grouped</remote-id>
     <remote-id type="cpan-module">Class::Accessor::Grouped</remote-id>
diff --git a/dev-perl/Class-Accessor-Lite/metadata.xml b/dev-perl/Class-Accessor-Lite/metadata.xml
index d8459b76bb23..390c6a0600b8 100644
--- a/dev-perl/Class-Accessor-Lite/metadata.xml
+++ b/dev-perl/Class-Accessor-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Lite</remote-id>
     <remote-id type="cpan-module">Class::Accessor::Lite</remote-id>
diff --git a/dev-perl/Class-Accessor/metadata.xml b/dev-perl/Class-Accessor/metadata.xml
index c1f160f0844d..6247ae633160 100644
--- a/dev-perl/Class-Accessor/metadata.xml
+++ b/dev-perl/Class-Accessor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Accessor</remote-id>
     <remote-id type="cpan-module">Class::Accessor</remote-id>
diff --git a/dev-perl/Class-Adapter/metadata.xml b/dev-perl/Class-Adapter/metadata.xml
index 2d4ef0ceaf39..f12df17eb017 100644
--- a/dev-perl/Class-Adapter/metadata.xml
+++ b/dev-perl/Class-Adapter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Adapter</remote-id>
     <remote-id type="cpan-module">Class::Adapter</remote-id>
diff --git a/dev-perl/Class-Autouse/metadata.xml b/dev-perl/Class-Autouse/metadata.xml
index b584642fd1c9..cd16515c89a2 100644
--- a/dev-perl/Class-Autouse/metadata.xml
+++ b/dev-perl/Class-Autouse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Autouse</remote-id>
     <remote-id type="cpan-module">Class::Autouse</remote-id>
diff --git a/dev-perl/Class-Base/metadata.xml b/dev-perl/Class-Base/metadata.xml
index 667e332c635f..a00257b246e9 100644
--- a/dev-perl/Class-Base/metadata.xml
+++ b/dev-perl/Class-Base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Base</remote-id>
     <remote-id type="cpan-module">Class::Base</remote-id>
diff --git a/dev-perl/Class-C3-Componentised/metadata.xml b/dev-perl/Class-C3-Componentised/metadata.xml
index 82a38b74c624..b67041ed824a 100644
--- a/dev-perl/Class-C3-Componentised/metadata.xml
+++ b/dev-perl/Class-C3-Componentised/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-C3-Componentised</remote-id>
     <remote-id type="cpan-module">Class::C3::Componentised</remote-id>
diff --git a/dev-perl/Class-C3-XS/metadata.xml b/dev-perl/Class-C3-XS/metadata.xml
index 1118bf0469bc..0b8f2fa2e810 100644
--- a/dev-perl/Class-C3-XS/metadata.xml
+++ b/dev-perl/Class-C3-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-C3-XS</remote-id>
     <remote-id type="cpan-module">Class::C3::XS</remote-id>
diff --git a/dev-perl/Class-C3/metadata.xml b/dev-perl/Class-C3/metadata.xml
index fcc1d688cec1..408c38222f3d 100644
--- a/dev-perl/Class-C3/metadata.xml
+++ b/dev-perl/Class-C3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-C3</remote-id>
     <remote-id type="cpan-module">Class::C3</remote-id>
diff --git a/dev-perl/Class-Container/metadata.xml b/dev-perl/Class-Container/metadata.xml
index 209fe9f30098..9c0457fd4cf3 100644
--- a/dev-perl/Class-Container/metadata.xml
+++ b/dev-perl/Class-Container/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Container</remote-id>
     <remote-id type="cpan-module">Class::Container</remote-id>
diff --git a/dev-perl/Class-DBI-AbstractSearch/metadata.xml b/dev-perl/Class-DBI-AbstractSearch/metadata.xml
index 86f105386ae1..21acf64819c8 100644
--- a/dev-perl/Class-DBI-AbstractSearch/metadata.xml
+++ b/dev-perl/Class-DBI-AbstractSearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI-AbstractSearch</remote-id>
     <remote-id type="cpan-module">Class::DBI::AbstractSearch</remote-id>
diff --git a/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml b/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
index 5a0df477c0d9..c3b53d2fb633 100644
--- a/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
+++ b/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI-Plugin-DeepAbstractSearch</remote-id>
     <remote-id type="cpan-module">Class::DBI::Plugin::DeepAbstractSearch</remote-id>
diff --git a/dev-perl/Class-DBI-Plugin/metadata.xml b/dev-perl/Class-DBI-Plugin/metadata.xml
index 8ee3434e07c5..2939447d3d6c 100644
--- a/dev-perl/Class-DBI-Plugin/metadata.xml
+++ b/dev-perl/Class-DBI-Plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI-Plugin</remote-id>
     <remote-id type="cpan-module">Class::DBI::Plugin</remote-id>
diff --git a/dev-perl/Class-DBI-mysql/metadata.xml b/dev-perl/Class-DBI-mysql/metadata.xml
index ca695e0845a3..349dea7e4c3a 100644
--- a/dev-perl/Class-DBI-mysql/metadata.xml
+++ b/dev-perl/Class-DBI-mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI-mysql</remote-id>
     <remote-id type="cpan-module">Class::DBI::mysql</remote-id>
diff --git a/dev-perl/Class-DBI/metadata.xml b/dev-perl/Class-DBI/metadata.xml
index 240d2456d575..1c0f1ae127cd 100644
--- a/dev-perl/Class-DBI/metadata.xml
+++ b/dev-perl/Class-DBI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI</remote-id>
     <remote-id type="cpan-module">Class::DBI</remote-id>
diff --git a/dev-perl/Class-Data-Accessor/metadata.xml b/dev-perl/Class-Data-Accessor/metadata.xml
index 610c0456c1c6..59aa6291eb07 100644
--- a/dev-perl/Class-Data-Accessor/metadata.xml
+++ b/dev-perl/Class-Data-Accessor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Data-Accessor</remote-id>
     <remote-id type="cpan-module">Class::Data::Accessor</remote-id>
diff --git a/dev-perl/Class-Data-Inheritable/metadata.xml b/dev-perl/Class-Data-Inheritable/metadata.xml
index 80e1f29df61c..c292df1520a4 100644
--- a/dev-perl/Class-Data-Inheritable/metadata.xml
+++ b/dev-perl/Class-Data-Inheritable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Data-Inheritable</remote-id>
     <remote-id type="cpan-module">Class::Data::Inheritable</remote-id>
diff --git a/dev-perl/Class-Default/metadata.xml b/dev-perl/Class-Default/metadata.xml
index 680e823b711e..0ea9c5f92d26 100644
--- a/dev-perl/Class-Default/metadata.xml
+++ b/dev-perl/Class-Default/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Default</remote-id>
     <remote-id type="cpan-module">Class::Default</remote-id>
diff --git a/dev-perl/Class-ErrorHandler/metadata.xml b/dev-perl/Class-ErrorHandler/metadata.xml
index 16ea67344395..fedf6efeb7f2 100644
--- a/dev-perl/Class-ErrorHandler/metadata.xml
+++ b/dev-perl/Class-ErrorHandler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-ErrorHandler</remote-id>
     <remote-id type="cpan-module">Class::ErrorHandler</remote-id>
diff --git a/dev-perl/Class-Factory-Util/metadata.xml b/dev-perl/Class-Factory-Util/metadata.xml
index e37e47deee93..75fc4bb910e9 100644
--- a/dev-perl/Class-Factory-Util/metadata.xml
+++ b/dev-perl/Class-Factory-Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Factory-Util</remote-id>
     <remote-id type="cpan-module">Class::Factory::Util</remote-id>
diff --git a/dev-perl/Class-ISA/metadata.xml b/dev-perl/Class-ISA/metadata.xml
index 0a714d78ca8b..461ec399f57f 100644
--- a/dev-perl/Class-ISA/metadata.xml
+++ b/dev-perl/Class-ISA/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-ISA</remote-id>
     <remote-id type="cpan-module">Class::ISA</remote-id>
diff --git a/dev-perl/Class-InsideOut/metadata.xml b/dev-perl/Class-InsideOut/metadata.xml
index df2c11afe021..218a36975121 100644
--- a/dev-perl/Class-InsideOut/metadata.xml
+++ b/dev-perl/Class-InsideOut/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Class-InsideOut</remote-id>
                 <remote-id type="cpan-module">Class::InsideOut</remote-id>
diff --git a/dev-perl/Class-Inspector/metadata.xml b/dev-perl/Class-Inspector/metadata.xml
index 93ea8acd4fdb..beb7adf0e7de 100644
--- a/dev-perl/Class-Inspector/metadata.xml
+++ b/dev-perl/Class-Inspector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Inspector</remote-id>
     <remote-id type="cpan-module">Class::Inspector</remote-id>
diff --git a/dev-perl/Class-Load-XS/metadata.xml b/dev-perl/Class-Load-XS/metadata.xml
index 40c31901dd12..5c53a5c890ff 100644
--- a/dev-perl/Class-Load-XS/metadata.xml
+++ b/dev-perl/Class-Load-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Load-XS</remote-id>
     <remote-id type="cpan-module">Class::Load::XS</remote-id>
diff --git a/dev-perl/Class-Load/metadata.xml b/dev-perl/Class-Load/metadata.xml
index 6dccc0a617b2..a65556251ca0 100644
--- a/dev-perl/Class-Load/metadata.xml
+++ b/dev-perl/Class-Load/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Load</remote-id>
     <remote-id type="cpan-module">Class::Load</remote-id>
diff --git a/dev-perl/Class-MakeMethods/metadata.xml b/dev-perl/Class-MakeMethods/metadata.xml
index ba2ca82fc7a6..fc78aa0f4254 100644
--- a/dev-perl/Class-MakeMethods/metadata.xml
+++ b/dev-perl/Class-MakeMethods/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-MakeMethods</remote-id>
     <remote-id type="cpan-module">Class::MakeMethods</remote-id>
diff --git a/dev-perl/Class-Member/metadata.xml b/dev-perl/Class-Member/metadata.xml
index ca62afbacec1..0229f31dfbef 100644
--- a/dev-perl/Class-Member/metadata.xml
+++ b/dev-perl/Class-Member/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Member</remote-id>
     <remote-id type="cpan-module">Class::Member</remote-id>
diff --git a/dev-perl/Class-Method-Modifiers/metadata.xml b/dev-perl/Class-Method-Modifiers/metadata.xml
index bfe073ee5091..c91e1a90fdce 100644
--- a/dev-perl/Class-Method-Modifiers/metadata.xml
+++ b/dev-perl/Class-Method-Modifiers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Class-Method-Modifiers</remote-id>
 		<remote-id type="cpan-module">Class::Method::Modifiers</remote-id>
diff --git a/dev-perl/Class-MethodMaker/metadata.xml b/dev-perl/Class-MethodMaker/metadata.xml
index 5af0dc133ec5..c5dbb1ab2cb5 100644
--- a/dev-perl/Class-MethodMaker/metadata.xml
+++ b/dev-perl/Class-MethodMaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-MethodMaker</remote-id>
     <remote-id type="cpan-module">Class::MethodMaker</remote-id>
diff --git a/dev-perl/Class-Mix/metadata.xml b/dev-perl/Class-Mix/metadata.xml
index 0e7762408839..3bb5c5d10100 100644
--- a/dev-perl/Class-Mix/metadata.xml
+++ b/dev-perl/Class-Mix/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Mix</remote-id>
     <remote-id type="cpan-module">Class::Mix</remote-id>
diff --git a/dev-perl/Class-ReturnValue/metadata.xml b/dev-perl/Class-ReturnValue/metadata.xml
index 49ac0f05dafc..89978b7c03f2 100644
--- a/dev-perl/Class-ReturnValue/metadata.xml
+++ b/dev-perl/Class-ReturnValue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-ReturnValue</remote-id>
     <remote-id type="cpan-module">Class::ReturnValue</remote-id>
diff --git a/dev-perl/Class-Singleton/metadata.xml b/dev-perl/Class-Singleton/metadata.xml
index 141705752d4d..3e17fec009fa 100644
--- a/dev-perl/Class-Singleton/metadata.xml
+++ b/dev-perl/Class-Singleton/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Singleton</remote-id>
     <remote-id type="cpan-module">Class::Singleton</remote-id>
diff --git a/dev-perl/Class-Spiffy/metadata.xml b/dev-perl/Class-Spiffy/metadata.xml
index 8e2a1d29ff10..8438c9db60ba 100644
--- a/dev-perl/Class-Spiffy/metadata.xml
+++ b/dev-perl/Class-Spiffy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Spiffy</remote-id>
     <remote-id type="cpan-module">Class::Spiffy</remote-id>
diff --git a/dev-perl/Class-Std-Fast/metadata.xml b/dev-perl/Class-Std-Fast/metadata.xml
index 44948940d30e..1277806e1bf3 100644
--- a/dev-perl/Class-Std-Fast/metadata.xml
+++ b/dev-perl/Class-Std-Fast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Std-Fast</remote-id>
     <remote-id type="cpan-module">Class::Std::Fast</remote-id>
diff --git a/dev-perl/Class-Std/metadata.xml b/dev-perl/Class-Std/metadata.xml
index cbe20b9a6c63..1ac455fa8f3d 100644
--- a/dev-perl/Class-Std/metadata.xml
+++ b/dev-perl/Class-Std/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Std</remote-id>
     <remote-id type="cpan-module">Class::Std</remote-id>
diff --git a/dev-perl/Class-Tiny/metadata.xml b/dev-perl/Class-Tiny/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Class-Tiny/metadata.xml
+++ b/dev-perl/Class-Tiny/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Class-Trigger/metadata.xml b/dev-perl/Class-Trigger/metadata.xml
index e89bc4ac687c..d8075d69f97f 100644
--- a/dev-perl/Class-Trigger/metadata.xml
+++ b/dev-perl/Class-Trigger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Trigger</remote-id>
     <remote-id type="cpan-module">Class::Trigger</remote-id>
diff --git a/dev-perl/Class-Unload/metadata.xml b/dev-perl/Class-Unload/metadata.xml
index 816a728c876b..835e41684b35 100644
--- a/dev-perl/Class-Unload/metadata.xml
+++ b/dev-perl/Class-Unload/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Unload</remote-id>
     <remote-id type="cpan-module">Class::Unload</remote-id>
diff --git a/dev-perl/Class-Virtual/metadata.xml b/dev-perl/Class-Virtual/metadata.xml
index c6f201c75d40..b89d92e471d0 100644
--- a/dev-perl/Class-Virtual/metadata.xml
+++ b/dev-perl/Class-Virtual/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Virtual</remote-id>
     <remote-id type="cpan-module">Class::Virtual</remote-id>
diff --git a/dev-perl/Class-WhiteHole/metadata.xml b/dev-perl/Class-WhiteHole/metadata.xml
index bebecdbd6a86..1c099019b1de 100644
--- a/dev-perl/Class-WhiteHole/metadata.xml
+++ b/dev-perl/Class-WhiteHole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-WhiteHole</remote-id>
     <remote-id type="cpan-module">Class::WhiteHole</remote-id>
diff --git a/dev-perl/Class-XPath/metadata.xml b/dev-perl/Class-XPath/metadata.xml
index c45490143445..83338241a22f 100644
--- a/dev-perl/Class-XPath/metadata.xml
+++ b/dev-perl/Class-XPath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-XPath</remote-id>
     <remote-id type="cpan-module">Class::XPath</remote-id>
diff --git a/dev-perl/Class-XSAccessor/metadata.xml b/dev-perl/Class-XSAccessor/metadata.xml
index 245a3f503a87..3ef3fd859964 100644
--- a/dev-perl/Class-XSAccessor/metadata.xml
+++ b/dev-perl/Class-XSAccessor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-XSAccessor</remote-id>
     <remote-id type="cpan-module">Class::XSAccessor</remote-id>
diff --git a/dev-perl/Clipboard/metadata.xml b/dev-perl/Clipboard/metadata.xml
index db1d8436e03c..7bf94f026d18 100644
--- a/dev-perl/Clipboard/metadata.xml
+++ b/dev-perl/Clipboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Clipboard</remote-id>
     <remote-id type="cpan-module">Clipboard</remote-id>
diff --git a/dev-perl/Clone/metadata.xml b/dev-perl/Clone/metadata.xml
index 291e6c5ea740..62942be60ab1 100644
--- a/dev-perl/Clone/metadata.xml
+++ b/dev-perl/Clone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Clone</remote-id>
     <remote-id type="cpan-module">Clone</remote-id>
diff --git a/dev-perl/Color-Calc/metadata.xml b/dev-perl/Color-Calc/metadata.xml
index bee94f133959..5852c4d4d4e9 100644
--- a/dev-perl/Color-Calc/metadata.xml
+++ b/dev-perl/Color-Calc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Color-Calc</remote-id>
 		<remote-id type="cpan-module">Color::Calc</remote-id>
diff --git a/dev-perl/Color-Library/metadata.xml b/dev-perl/Color-Library/metadata.xml
index a0ef045f173a..29ba6ddc468f 100644
--- a/dev-perl/Color-Library/metadata.xml
+++ b/dev-perl/Color-Library/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Color-Library</remote-id>
     <remote-id type="cpan-module">Color::Library</remote-id>
diff --git a/dev-perl/Compress-Bzip2/metadata.xml b/dev-perl/Compress-Bzip2/metadata.xml
index 9620e284c839..636a9f572662 100644
--- a/dev-perl/Compress-Bzip2/metadata.xml
+++ b/dev-perl/Compress-Bzip2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Compress-Bzip2</remote-id>
     <remote-id type="cpan-module">Compress::Bzip2</remote-id>
diff --git a/dev-perl/Config-Any/metadata.xml b/dev-perl/Config-Any/metadata.xml
index 92f739790d6e..eee49d51a4e1 100644
--- a/dev-perl/Config-Any/metadata.xml
+++ b/dev-perl/Config-Any/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Any</remote-id>
     <remote-id type="cpan-module">Config::Any</remote-id>
diff --git a/dev-perl/Config-ApacheFormat/metadata.xml b/dev-perl/Config-ApacheFormat/metadata.xml
index 76286198f88b..3dcc62bdaec9 100644
--- a/dev-perl/Config-ApacheFormat/metadata.xml
+++ b/dev-perl/Config-ApacheFormat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-ApacheFormat</remote-id>
     <remote-id type="cpan-module">Config::ApacheFormat</remote-id>
diff --git a/dev-perl/Config-Auto/metadata.xml b/dev-perl/Config-Auto/metadata.xml
index 99b9ec4dc903..84f703bf286d 100644
--- a/dev-perl/Config-Auto/metadata.xml
+++ b/dev-perl/Config-Auto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Config-Auto</remote-id>
 		<remote-id type="cpan-module">Config::Auto</remote-id>
diff --git a/dev-perl/Config-AutoConf/metadata.xml b/dev-perl/Config-AutoConf/metadata.xml
index 6f278db73bc0..6d0f48c36789 100644
--- a/dev-perl/Config-AutoConf/metadata.xml
+++ b/dev-perl/Config-AutoConf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-AutoConf</remote-id>
     <remote-id type="cpan-module">Config::AutoConf</remote-id>
diff --git a/dev-perl/Config-Crontab/metadata.xml b/dev-perl/Config-Crontab/metadata.xml
index 13a4c33e62db..b79d8311dc8c 100644
--- a/dev-perl/Config-Crontab/metadata.xml
+++ b/dev-perl/Config-Crontab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Crontab</remote-id>
     <remote-id type="cpan-module">Config::Crontab</remote-id>
diff --git a/dev-perl/Config-General/metadata.xml b/dev-perl/Config-General/metadata.xml
index 83e709d296de..9fc5cb773a4a 100644
--- a/dev-perl/Config-General/metadata.xml
+++ b/dev-perl/Config-General/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-General</remote-id>
     <remote-id type="cpan-module">Config::General</remote-id>
diff --git a/dev-perl/Config-Grammar/metadata.xml b/dev-perl/Config-Grammar/metadata.xml
index 071a1db04d9f..ac5e6a5fecf4 100644
--- a/dev-perl/Config-Grammar/metadata.xml
+++ b/dev-perl/Config-Grammar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Config-Grammar</remote-id>
 		<remote-id type="cpan-module">Config::Grammar</remote-id>
diff --git a/dev-perl/Config-IniFiles/metadata.xml b/dev-perl/Config-IniFiles/metadata.xml
index cdce4fd2d8ec..883a2122c387 100644
--- a/dev-perl/Config-IniFiles/metadata.xml
+++ b/dev-perl/Config-IniFiles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-IniFiles</remote-id>
     <remote-id type="cpan-module">Config::IniFiles</remote-id>
diff --git a/dev-perl/Config-JSON/metadata.xml b/dev-perl/Config-JSON/metadata.xml
index 147900e1cdb3..26719d079009 100644
--- a/dev-perl/Config-JSON/metadata.xml
+++ b/dev-perl/Config-JSON/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Config-JSON</remote-id>
                 <remote-id type="cpan-module">Config::JSON</remote-id>
diff --git a/dev-perl/Config-Properties/metadata.xml b/dev-perl/Config-Properties/metadata.xml
index a34dadf2454a..ef750e7d62aa 100644
--- a/dev-perl/Config-Properties/metadata.xml
+++ b/dev-perl/Config-Properties/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Properties</remote-id>
     <remote-id type="cpan-module">Config::Properties</remote-id>
diff --git a/dev-perl/Config-Simple/metadata.xml b/dev-perl/Config-Simple/metadata.xml
index 9622c27f4c08..74abe8e9fc28 100644
--- a/dev-perl/Config-Simple/metadata.xml
+++ b/dev-perl/Config-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Simple</remote-id>
     <remote-id type="cpan-module">Config::Simple</remote-id>
diff --git a/dev-perl/Config-Tiny/metadata.xml b/dev-perl/Config-Tiny/metadata.xml
index 004a791cf70f..17a8adb4af28 100644
--- a/dev-perl/Config-Tiny/metadata.xml
+++ b/dev-perl/Config-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Tiny</remote-id>
     <remote-id type="cpan-module">Config::Tiny</remote-id>
diff --git a/dev-perl/ConfigReader/metadata.xml b/dev-perl/ConfigReader/metadata.xml
index 923fddbf1673..4b0838a006d9 100644
--- a/dev-perl/ConfigReader/metadata.xml
+++ b/dev-perl/ConfigReader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ConfigReader</remote-id>
     <remote-id type="cpan-module">ConfigReader::DirectiveStyle</remote-id>
diff --git a/dev-perl/Const-Fast/metadata.xml b/dev-perl/Const-Fast/metadata.xml
index 975d7b851f76..1ca7e9093e0e 100644
--- a/dev-perl/Const-Fast/metadata.xml
+++ b/dev-perl/Const-Fast/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>perl</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
 <longdescription lang="en">
   This the only function of this module and it is exported by
   default. It takes a scalar, array or hash left-value as first
diff --git a/dev-perl/Context-Preserve/metadata.xml b/dev-perl/Context-Preserve/metadata.xml
index a834b9037ebd..3dfcd2bc44f3 100644
--- a/dev-perl/Context-Preserve/metadata.xml
+++ b/dev-perl/Context-Preserve/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Context-Preserve</remote-id>
     <remote-id type="cpan-module">Context::Preserve</remote-id>
diff --git a/dev-perl/Contextual-Return/metadata.xml b/dev-perl/Contextual-Return/metadata.xml
index 23a051b20e58..e42a32e2dbe8 100644
--- a/dev-perl/Contextual-Return/metadata.xml
+++ b/dev-perl/Contextual-Return/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Contextual-Return</remote-id>
     <remote-id type="cpan-module">Contextual::Return</remote-id>
diff --git a/dev-perl/Convert-ASN1/metadata.xml b/dev-perl/Convert-ASN1/metadata.xml
index 4265b05f10b6..fa30674f2292 100644
--- a/dev-perl/Convert-ASN1/metadata.xml
+++ b/dev-perl/Convert-ASN1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-ASN1</remote-id>
     <remote-id type="cpan-module">Convert::ASN1</remote-id>
diff --git a/dev-perl/Convert-BER/metadata.xml b/dev-perl/Convert-BER/metadata.xml
index 8304184adb63..3514c59ace5d 100644
--- a/dev-perl/Convert-BER/metadata.xml
+++ b/dev-perl/Convert-BER/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-BER</remote-id>
     <remote-id type="cpan-module">Convert::BER</remote-id>
diff --git a/dev-perl/Convert-BinHex/metadata.xml b/dev-perl/Convert-BinHex/metadata.xml
index a6f210e6db3a..eec64aa957fd 100644
--- a/dev-perl/Convert-BinHex/metadata.xml
+++ b/dev-perl/Convert-BinHex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-BinHex</remote-id>
     <remote-id type="cpan-module">Convert::BinHex</remote-id>
diff --git a/dev-perl/Convert-Binary-C/metadata.xml b/dev-perl/Convert-Binary-C/metadata.xml
index 4fd454c6a017..3e2d627abadb 100644
--- a/dev-perl/Convert-Binary-C/metadata.xml
+++ b/dev-perl/Convert-Binary-C/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-Binary-C</remote-id>
     <remote-id type="cpan-module">Convert::Binary::C</remote-id>
diff --git a/dev-perl/Convert-Color/metadata.xml b/dev-perl/Convert-Color/metadata.xml
index f164fd03274f..d32b55d866aa 100644
--- a/dev-perl/Convert-Color/metadata.xml
+++ b/dev-perl/Convert-Color/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-Color</remote-id>
     <remote-id type="cpan-module">Convert::Color</remote-id>
diff --git a/dev-perl/Convert-TNEF/metadata.xml b/dev-perl/Convert-TNEF/metadata.xml
index 72652968544c..56a1fcf06271 100644
--- a/dev-perl/Convert-TNEF/metadata.xml
+++ b/dev-perl/Convert-TNEF/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-TNEF</remote-id>
     <remote-id type="cpan-module">Convert::TNEF</remote-id>
diff --git a/dev-perl/Convert-UUlib/metadata.xml b/dev-perl/Convert-UUlib/metadata.xml
index 2794a6958501..c7c9acf785e9 100644
--- a/dev-perl/Convert-UUlib/metadata.xml
+++ b/dev-perl/Convert-UUlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-UUlib</remote-id>
     <remote-id type="cpan-module">Convert::UUlib</remote-id>
diff --git a/dev-perl/Cookie-Baker/metadata.xml b/dev-perl/Cookie-Baker/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Cookie-Baker/metadata.xml
+++ b/dev-perl/Cookie-Baker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Coro/metadata.xml b/dev-perl/Coro/metadata.xml
index 60718ce96e48..454302a27ceb 100644
--- a/dev-perl/Coro/metadata.xml
+++ b/dev-perl/Coro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Coro</remote-id>
     <remote-id type="cpan-module">Coro</remote-id>
diff --git a/dev-perl/Crypt-Blowfish/metadata.xml b/dev-perl/Crypt-Blowfish/metadata.xml
index b62af61fc6e1..4a0076aefdcd 100644
--- a/dev-perl/Crypt-Blowfish/metadata.xml
+++ b/dev-perl/Crypt-Blowfish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Blowfish</remote-id>
     <remote-id type="cpan-module">Crypt::Blowfish</remote-id>
diff --git a/dev-perl/Crypt-CAST5_PP/metadata.xml b/dev-perl/Crypt-CAST5_PP/metadata.xml
index eb391e64b2a5..3b2d772f255e 100644
--- a/dev-perl/Crypt-CAST5_PP/metadata.xml
+++ b/dev-perl/Crypt-CAST5_PP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-CAST5_PP</remote-id>
     <remote-id type="cpan-module">Crypt::CAST5_PP</remote-id>
diff --git a/dev-perl/Crypt-Cracklib/metadata.xml b/dev-perl/Crypt-Cracklib/metadata.xml
index 2975ccd6c5c3..294fba4194ba 100644
--- a/dev-perl/Crypt-Cracklib/metadata.xml
+++ b/dev-perl/Crypt-Cracklib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Cracklib</remote-id>
     <remote-id type="cpan-module">Crypt::Cracklib</remote-id>
diff --git a/dev-perl/Crypt-DES/metadata.xml b/dev-perl/Crypt-DES/metadata.xml
index ecaa7e25b12e..18c9e6f1e14f 100644
--- a/dev-perl/Crypt-DES/metadata.xml
+++ b/dev-perl/Crypt-DES/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-DES</remote-id>
     <remote-id type="cpan-module">Crypt::DES</remote-id>
diff --git a/dev-perl/Crypt-Eksblowfish/metadata.xml b/dev-perl/Crypt-Eksblowfish/metadata.xml
index 7238a1a7e1a9..526b973ac6f7 100644
--- a/dev-perl/Crypt-Eksblowfish/metadata.xml
+++ b/dev-perl/Crypt-Eksblowfish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Eksblowfish</remote-id>
     <remote-id type="cpan-module">Crypt::Eksblowfish</remote-id>
diff --git a/dev-perl/Crypt-OpenPGP/metadata.xml b/dev-perl/Crypt-OpenPGP/metadata.xml
index c020ea2e25a7..717a8398b97c 100644
--- a/dev-perl/Crypt-OpenPGP/metadata.xml
+++ b/dev-perl/Crypt-OpenPGP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-OpenPGP</remote-id>
     <remote-id type="cpan-module">Crypt::OpenPGP</remote-id>
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml b/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
index 5c099db0eada..26c721a7861e 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-Bignum</remote-id>
     <remote-id type="cpan-module">Crypt::OpenSSL::Bignum</remote-id>
diff --git a/dev-perl/Crypt-OpenSSL-DSA/metadata.xml b/dev-perl/Crypt-OpenSSL-DSA/metadata.xml
index b9fc7452aa5e..8a3252bc96c1 100644
--- a/dev-perl/Crypt-OpenSSL-DSA/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-DSA/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Crypt-OpenSSL-DSA</remote-id>
 		<remote-id type="cpan-module">Crypt::OpenSSL::DSA</remote-id>
diff --git a/dev-perl/Crypt-OpenSSL-RSA/metadata.xml b/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
index 02fe570eb8bc..c7f283b94c83 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-RSA</remote-id>
     <remote-id type="cpan-module">Crypt::OpenSSL::RSA</remote-id>
diff --git a/dev-perl/Crypt-OpenSSL-Random/metadata.xml b/dev-perl/Crypt-OpenSSL-Random/metadata.xml
index 51b6f934fd71..8669b0961d02 100644
--- a/dev-perl/Crypt-OpenSSL-Random/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-Random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-Random</remote-id>
     <remote-id type="cpan-module">Crypt::OpenSSL::Random</remote-id>
diff --git a/dev-perl/Crypt-PasswdMD5/metadata.xml b/dev-perl/Crypt-PasswdMD5/metadata.xml
index a87332763189..b3acf2f1ec29 100644
--- a/dev-perl/Crypt-PasswdMD5/metadata.xml
+++ b/dev-perl/Crypt-PasswdMD5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-PasswdMD5</remote-id>
     <remote-id type="cpan-module">Crypt::PasswdMD5</remote-id>
diff --git a/dev-perl/Crypt-RC4/metadata.xml b/dev-perl/Crypt-RC4/metadata.xml
index 42f20392b5da..3cabe0608ea9 100644
--- a/dev-perl/Crypt-RC4/metadata.xml
+++ b/dev-perl/Crypt-RC4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-RC4</remote-id>
     <remote-id type="cpan-module">Crypt::RC4</remote-id>
diff --git a/dev-perl/Crypt-RIPEMD160/metadata.xml b/dev-perl/Crypt-RIPEMD160/metadata.xml
index 503b67846bce..f1760b9c3c92 100644
--- a/dev-perl/Crypt-RIPEMD160/metadata.xml
+++ b/dev-perl/Crypt-RIPEMD160/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-RIPEMD160</remote-id>
     <remote-id type="cpan-module">Crypt::RIPEMD160</remote-id>
diff --git a/dev-perl/Crypt-Random-Source/metadata.xml b/dev-perl/Crypt-Random-Source/metadata.xml
index 476ad6932bbc..2b228a999591 100644
--- a/dev-perl/Crypt-Random-Source/metadata.xml
+++ b/dev-perl/Crypt-Random-Source/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Crypt-Random-Source</remote-id>
 		<remote-id type="cpan-module">Crypt::Random::Source</remote-id>
diff --git a/dev-perl/Crypt-Rijndael/metadata.xml b/dev-perl/Crypt-Rijndael/metadata.xml
index e66f8c41ac38..7c6040bfe88e 100644
--- a/dev-perl/Crypt-Rijndael/metadata.xml
+++ b/dev-perl/Crypt-Rijndael/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Rijndael</remote-id>
     <remote-id type="cpan-module">Crypt::Rijndael</remote-id>
diff --git a/dev-perl/Crypt-SMIME/metadata.xml b/dev-perl/Crypt-SMIME/metadata.xml
index e22bc4695680..9bf33e61e39a 100644
--- a/dev-perl/Crypt-SMIME/metadata.xml
+++ b/dev-perl/Crypt-SMIME/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Crypt-SMIME</remote-id>
 		<remote-id type="cpan-module">Crypt::SMIME</remote-id>
diff --git a/dev-perl/Crypt-SSLeay/metadata.xml b/dev-perl/Crypt-SSLeay/metadata.xml
index 5e3201a4b12a..79061ac2a05e 100644
--- a/dev-perl/Crypt-SSLeay/metadata.xml
+++ b/dev-perl/Crypt-SSLeay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-SSLeay</remote-id>
     <remote-id type="cpan-module">Crypt::SSLeay</remote-id>
diff --git a/dev-perl/Crypt-Simple/metadata.xml b/dev-perl/Crypt-Simple/metadata.xml
index 6b095a28034f..006fb9d60407 100644
--- a/dev-perl/Crypt-Simple/metadata.xml
+++ b/dev-perl/Crypt-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Simple</remote-id>
     <remote-id type="cpan-module">Crypt::Simple</remote-id>
diff --git a/dev-perl/Crypt-SmbHash/metadata.xml b/dev-perl/Crypt-SmbHash/metadata.xml
index 581746c82d5d..46b6a1450eac 100644
--- a/dev-perl/Crypt-SmbHash/metadata.xml
+++ b/dev-perl/Crypt-SmbHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-SmbHash</remote-id>
     <remote-id type="cpan-module">Crypt::SmbHash</remote-id>
diff --git a/dev-perl/Crypt-Twofish/metadata.xml b/dev-perl/Crypt-Twofish/metadata.xml
index de587d43ad1c..344e8d4115e8 100644
--- a/dev-perl/Crypt-Twofish/metadata.xml
+++ b/dev-perl/Crypt-Twofish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Twofish</remote-id>
     <remote-id type="cpan-module">Crypt::Twofish</remote-id>
diff --git a/dev-perl/Crypt-URandom/metadata.xml b/dev-perl/Crypt-URandom/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Crypt-URandom/metadata.xml
+++ b/dev-perl/Crypt-URandom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-X509/metadata.xml b/dev-perl/Crypt-X509/metadata.xml
index 00b80c1e44e5..068feeea6bf0 100644
--- a/dev-perl/Crypt-X509/metadata.xml
+++ b/dev-perl/Crypt-X509/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Crypt-X509</remote-id>
         <remote-id type="cpan-module">Crypt::X509</remote-id>
diff --git a/dev-perl/CryptX/metadata.xml b/dev-perl/CryptX/metadata.xml
index 04516f1b4201..81e7267f6d29 100644
--- a/dev-perl/CryptX/metadata.xml
+++ b/dev-perl/CryptX/metadata.xml
@@ -5,7 +5,10 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CryptX</remote-id>
     <remote-id type="cpan-module">CryptX</remote-id>
diff --git a/dev-perl/Curses-UI/metadata.xml b/dev-perl/Curses-UI/metadata.xml
index 6c61f73bac46..6b4b0d47b6ca 100644
--- a/dev-perl/Curses-UI/metadata.xml
+++ b/dev-perl/Curses-UI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Curses-UI</remote-id>
   </upstream>
diff --git a/dev-perl/Curses/metadata.xml b/dev-perl/Curses/metadata.xml
index c095bb01a13a..079a9fc87adb 100644
--- a/dev-perl/Curses/metadata.xml
+++ b/dev-perl/Curses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Curses</remote-id>
     <remote-id type="cpan-module">Curses</remote-id>
diff --git a/dev-perl/CursesWidgets/metadata.xml b/dev-perl/CursesWidgets/metadata.xml
index baed30aeceb8..267a304bccf4 100644
--- a/dev-perl/CursesWidgets/metadata.xml
+++ b/dev-perl/CursesWidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">CursesWidgets</remote-id>
     <remote-id type="cpan-module">Curses::Widgets</remote-id>
diff --git a/dev-perl/Cwd-Guard/metadata.xml b/dev-perl/Cwd-Guard/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Cwd-Guard/metadata.xml
+++ b/dev-perl/Cwd-Guard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/DBD-Pg/metadata.xml b/dev-perl/DBD-Pg/metadata.xml
index dfb7e1a2dc36..1385d47cd015 100644
--- a/dev-perl/DBD-Pg/metadata.xml
+++ b/dev-perl/DBD-Pg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBD-Pg</remote-id>
     <remote-id type="cpan-module">Bundle::DBD::Pg</remote-id>
diff --git a/dev-perl/DBD-SQLite/metadata.xml b/dev-perl/DBD-SQLite/metadata.xml
index 321c7897fbf6..d0e9fe385f57 100644
--- a/dev-perl/DBD-SQLite/metadata.xml
+++ b/dev-perl/DBD-SQLite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBD-SQLite</remote-id>
     <remote-id type="cpan-module">DBD::SQLite</remote-id>
diff --git a/dev-perl/DBD-mysql/metadata.xml b/dev-perl/DBD-mysql/metadata.xml
index d76ec8fef57a..6de9d4ee4ca5 100644
--- a/dev-perl/DBD-mysql/metadata.xml
+++ b/dev-perl/DBD-mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBD-mysql</remote-id>
     <remote-id type="cpan-module">Bundle::DBD::mysql</remote-id>
diff --git a/dev-perl/DBI-Shell/metadata.xml b/dev-perl/DBI-Shell/metadata.xml
index 5934e602a818..d246ede1e98d 100644
--- a/dev-perl/DBI-Shell/metadata.xml
+++ b/dev-perl/DBI-Shell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Provides dbish, a command line tool for interacting with
 	any installed DBD module directly.</longdescription>
   <upstream>
diff --git a/dev-perl/DBI/metadata.xml b/dev-perl/DBI/metadata.xml
index 15062e20267d..318eee88e035 100644
--- a/dev-perl/DBI/metadata.xml
+++ b/dev-perl/DBI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBI</remote-id>
     <remote-id type="cpan-module">Bundle::DBI</remote-id>
diff --git a/dev-perl/DBICx-TestDatabase/metadata.xml b/dev-perl/DBICx-TestDatabase/metadata.xml
index f2ec6f341456..819ff12d2a0c 100644
--- a/dev-perl/DBICx-TestDatabase/metadata.xml
+++ b/dev-perl/DBICx-TestDatabase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBICx-TestDatabase</remote-id>
     <remote-id type="cpan-module">DBICx::TestDatabase</remote-id>
diff --git a/dev-perl/DBIx-Class-DynamicDefault/metadata.xml b/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
index f01253ea8576..f60b80fe80a9 100644
--- a/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
+++ b/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-DynamicDefault</remote-id>
     <remote-id type="cpan-module">DBIx::Class::DynamicDefault</remote-id>
diff --git a/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
index aa8eed29013a..6f7333fdab25 100644
--- a/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-Boolean</remote-id>
     <remote-id type="cpan-module">DBIx::Class::InflateColumn::Boolean</remote-id>
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
index 07bcf776219b..25e63fd83c74 100644
--- a/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-IP</remote-id>
     <remote-id type="cpan-module">DBIx::Class::InflateColumn::IP</remote-id>
diff --git a/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
index ba4cd24c9ae1..78cc12f65777 100644
--- a/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-Object-Enum</remote-id>
     <remote-id type="cpan-module">DBIx::Class::InflateColumn::Object::Enum</remote-id>
diff --git a/dev-perl/DBIx-Class-UserStamp/metadata.xml b/dev-perl/DBIx-Class-UserStamp/metadata.xml
index 3b34577f314d..fe735a7a9f09 100644
--- a/dev-perl/DBIx-Class-UserStamp/metadata.xml
+++ b/dev-perl/DBIx-Class-UserStamp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-UserStamp</remote-id>
     <remote-id type="cpan-module">DBIx::Class::UserStamp</remote-id>
diff --git a/dev-perl/DBIx-Class/metadata.xml b/dev-perl/DBIx-Class/metadata.xml
index 6b2182b93cae..7b30ebd45be7 100644
--- a/dev-perl/DBIx-Class/metadata.xml
+++ b/dev-perl/DBIx-Class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="admin">
 			Modules required for the DBIx::Class administrative library
diff --git a/dev-perl/DBIx-ContextualFetch/metadata.xml b/dev-perl/DBIx-ContextualFetch/metadata.xml
index 093170a13aee..a9a1c88ff425 100644
--- a/dev-perl/DBIx-ContextualFetch/metadata.xml
+++ b/dev-perl/DBIx-ContextualFetch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-ContextualFetch</remote-id>
     <remote-id type="cpan-module">DBIx::ContextualFetch</remote-id>
diff --git a/dev-perl/DBIx-DBSchema/metadata.xml b/dev-perl/DBIx-DBSchema/metadata.xml
index 6d3ff454ec76..86d4759cf407 100644
--- a/dev-perl/DBIx-DBSchema/metadata.xml
+++ b/dev-perl/DBIx-DBSchema/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-DBSchema</remote-id>
     <remote-id type="cpan-module">DBIx::DBSchema</remote-id>
diff --git a/dev-perl/DBIx-Migration/metadata.xml b/dev-perl/DBIx-Migration/metadata.xml
index 9149401f1728..a0c0839dfa09 100644
--- a/dev-perl/DBIx-Migration/metadata.xml
+++ b/dev-perl/DBIx-Migration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Migration</remote-id>
     <remote-id type="cpan-module">DBIx::Migration</remote-id>
diff --git a/dev-perl/DBIx-Safe/metadata.xml b/dev-perl/DBIx-Safe/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/DBIx-Safe/metadata.xml
+++ b/dev-perl/DBIx-Safe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/DB_File-Lock/metadata.xml b/dev-perl/DB_File-Lock/metadata.xml
index 67dc1f28221e..913fdb6d8bc3 100644
--- a/dev-perl/DB_File-Lock/metadata.xml
+++ b/dev-perl/DB_File-Lock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DB_File-Lock</remote-id>
     <remote-id type="cpan-module">DB_File::Lock</remote-id>
diff --git a/dev-perl/Daemon-Generic/metadata.xml b/dev-perl/Daemon-Generic/metadata.xml
index 6efea4ae72ab..af3b2f702121 100644
--- a/dev-perl/Daemon-Generic/metadata.xml
+++ b/dev-perl/Daemon-Generic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Daemon-Generic</remote-id>
     <remote-id type="cpan-module">Daemon::Generic</remote-id>
diff --git a/dev-perl/Danga-Socket/metadata.xml b/dev-perl/Danga-Socket/metadata.xml
index 78a5fe0de92c..100ba8ca476f 100644
--- a/dev-perl/Danga-Socket/metadata.xml
+++ b/dev-perl/Danga-Socket/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Danga-Socket</remote-id>
     <remote-id type="cpan-module">Danga::Socket</remote-id>
diff --git a/dev-perl/Data-AMF/metadata.xml b/dev-perl/Data-AMF/metadata.xml
index bf783a9f4521..3a8b5052aea0 100644
--- a/dev-perl/Data-AMF/metadata.xml
+++ b/dev-perl/Data-AMF/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-AMF</remote-id>
     <remote-id type="cpan-module">Data::AMF</remote-id>
diff --git a/dev-perl/Data-Compare/metadata.xml b/dev-perl/Data-Compare/metadata.xml
index 118ee75d1057..93cabe1e0eed 100644
--- a/dev-perl/Data-Compare/metadata.xml
+++ b/dev-perl/Data-Compare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Compare</remote-id>
     <remote-id type="cpan-module">Data::Compare</remote-id>
diff --git a/dev-perl/Data-Diver/metadata.xml b/dev-perl/Data-Diver/metadata.xml
index 43a9850ce60f..69e7591d70d5 100644
--- a/dev-perl/Data-Diver/metadata.xml
+++ b/dev-perl/Data-Diver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
@@ -10,6 +9,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Data-Diver</remote-id>
 		<remote-id type="cpan-module">Data::Diver</remote-id>
diff --git a/dev-perl/Data-Dump-Streamer/metadata.xml b/dev-perl/Data-Dump-Streamer/metadata.xml
index 34f82d4e02ce..93a271a65173 100644
--- a/dev-perl/Data-Dump-Streamer/metadata.xml
+++ b/dev-perl/Data-Dump-Streamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Dump-Streamer</remote-id>
     <remote-id type="cpan-module">Data::Dump::Streamer</remote-id>
diff --git a/dev-perl/Data-Dump/metadata.xml b/dev-perl/Data-Dump/metadata.xml
index 00c28cae9c43..5ad7c1f4153d 100644
--- a/dev-perl/Data-Dump/metadata.xml
+++ b/dev-perl/Data-Dump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Dump</remote-id>
     <remote-id type="cpan-module">Data::Dump</remote-id>
diff --git a/dev-perl/Data-DumpXML/metadata.xml b/dev-perl/Data-DumpXML/metadata.xml
index 7ddddabec64d..e12302e759ad 100644
--- a/dev-perl/Data-DumpXML/metadata.xml
+++ b/dev-perl/Data-DumpXML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-DumpXML</remote-id>
     <remote-id type="cpan-module">Data::DumpXML</remote-id>
diff --git a/dev-perl/Data-Dumper-Concise/metadata.xml b/dev-perl/Data-Dumper-Concise/metadata.xml
index 406cd19444dc..731ee00515af 100644
--- a/dev-perl/Data-Dumper-Concise/metadata.xml
+++ b/dev-perl/Data-Dumper-Concise/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Dumper-Concise</remote-id>
     <remote-id type="cpan-module">Data::Dumper::Concise</remote-id>
diff --git a/dev-perl/Data-FormValidator/metadata.xml b/dev-perl/Data-FormValidator/metadata.xml
index 06751dc17044..e49d47664197 100644
--- a/dev-perl/Data-FormValidator/metadata.xml
+++ b/dev-perl/Data-FormValidator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-FormValidator</remote-id>
     <remote-id type="cpan-module">Data::FormValidator</remote-id>
diff --git a/dev-perl/Data-GUID/metadata.xml b/dev-perl/Data-GUID/metadata.xml
index be01be6377f0..f1ae78d893c9 100644
--- a/dev-perl/Data-GUID/metadata.xml
+++ b/dev-perl/Data-GUID/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Data-GUID</remote-id>
         <remote-id type="cpan-module">Data::GUID</remote-id>
diff --git a/dev-perl/Data-HexDump/metadata.xml b/dev-perl/Data-HexDump/metadata.xml
index 3ed94dfe2d8e..337286a40724 100644
--- a/dev-perl/Data-HexDump/metadata.xml
+++ b/dev-perl/Data-HexDump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-HexDump</remote-id>
   </upstream>
diff --git a/dev-perl/Data-Hexify/metadata.xml b/dev-perl/Data-Hexify/metadata.xml
index b4c2799b6717..770ac968ad0f 100644
--- a/dev-perl/Data-Hexify/metadata.xml
+++ b/dev-perl/Data-Hexify/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<herd>perl</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
@@ -10,6 +8,14 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpan">Data-Hexify</remote-id>
 	<remote-id type="cpan-module">Data::Hexify</remote-id>
diff --git a/dev-perl/Data-Hierarchy/metadata.xml b/dev-perl/Data-Hierarchy/metadata.xml
index 9373d5426d8b..d2c45cccf6d1 100644
--- a/dev-perl/Data-Hierarchy/metadata.xml
+++ b/dev-perl/Data-Hierarchy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Hierarchy</remote-id>
     <remote-id type="cpan-module">Data::Hierarchy</remote-id>
diff --git a/dev-perl/Data-ICal/metadata.xml b/dev-perl/Data-ICal/metadata.xml
index be3ca50b500e..f05e3669499a 100644
--- a/dev-perl/Data-ICal/metadata.xml
+++ b/dev-perl/Data-ICal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-ICal</remote-id>
     <remote-id type="cpan-module">Data::ICal</remote-id>
diff --git a/dev-perl/Data-ObjectDriver/metadata.xml b/dev-perl/Data-ObjectDriver/metadata.xml
index 39bfdd3a1c88..d4ee22dc772f 100644
--- a/dev-perl/Data-ObjectDriver/metadata.xml
+++ b/dev-perl/Data-ObjectDriver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-ObjectDriver</remote-id>
     <remote-id type="cpan-module">Data::ObjectDriver</remote-id>
diff --git a/dev-perl/Data-OptList/metadata.xml b/dev-perl/Data-OptList/metadata.xml
index db61bd66c08a..767813a0197e 100644
--- a/dev-perl/Data-OptList/metadata.xml
+++ b/dev-perl/Data-OptList/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-OptList</remote-id>
     <remote-id type="cpan-module">Data::OptList</remote-id>
diff --git a/dev-perl/Data-Page/metadata.xml b/dev-perl/Data-Page/metadata.xml
index 1cac1dfd6ccf..bfe6ccc10890 100644
--- a/dev-perl/Data-Page/metadata.xml
+++ b/dev-perl/Data-Page/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Page</remote-id>
     <remote-id type="cpan-module">Data::Page</remote-id>
diff --git a/dev-perl/Data-Perl/metadata.xml b/dev-perl/Data-Perl/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Data-Perl/metadata.xml
+++ b/dev-perl/Data-Perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Data-Random/metadata.xml b/dev-perl/Data-Random/metadata.xml
index 0fa81c8e90f0..d70650c5c6a1 100644
--- a/dev-perl/Data-Random/metadata.xml
+++ b/dev-perl/Data-Random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Random</remote-id>
     <remote-id type="cpan-module">Data::Random</remote-id>
diff --git a/dev-perl/Data-Serializer/metadata.xml b/dev-perl/Data-Serializer/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Data-Serializer/metadata.xml
+++ b/dev-perl/Data-Serializer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Data-ShowTable/metadata.xml b/dev-perl/Data-ShowTable/metadata.xml
index 66b9841e60ab..19ef3b7ce37f 100644
--- a/dev-perl/Data-ShowTable/metadata.xml
+++ b/dev-perl/Data-ShowTable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-ShowTable</remote-id>
     <remote-id type="cpan-module">Data::ShowTable</remote-id>
diff --git a/dev-perl/Data-Stag/metadata.xml b/dev-perl/Data-Stag/metadata.xml
index 0881fb4d78d7..c7860f3a2067 100644
--- a/dev-perl/Data-Stag/metadata.xml
+++ b/dev-perl/Data-Stag/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Stag</remote-id>
     <remote-id type="cpan-module">Data::Stag</remote-id>
diff --git a/dev-perl/Data-Stream-Bulk/metadata.xml b/dev-perl/Data-Stream-Bulk/metadata.xml
index 007d2cd68fc4..2cba5fbd74fd 100644
--- a/dev-perl/Data-Stream-Bulk/metadata.xml
+++ b/dev-perl/Data-Stream-Bulk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Stream-Bulk</remote-id>
     <remote-id type="cpan-module">Data::Stream::Bulk</remote-id>
diff --git a/dev-perl/Data-Structure-Util/metadata.xml b/dev-perl/Data-Structure-Util/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Data-Structure-Util/metadata.xml
+++ b/dev-perl/Data-Structure-Util/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Data-Types/metadata.xml b/dev-perl/Data-Types/metadata.xml
index 1417717201a0..ba730efac8b0 100644
--- a/dev-perl/Data-Types/metadata.xml
+++ b/dev-perl/Data-Types/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Types</remote-id>
     <remote-id type="cpan-module">Data::Types</remote-id>
diff --git a/dev-perl/Data-URIEncode/metadata.xml b/dev-perl/Data-URIEncode/metadata.xml
index 26bf9c1a7f87..e5f92fc358a0 100644
--- a/dev-perl/Data-URIEncode/metadata.xml
+++ b/dev-perl/Data-URIEncode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-URIEncode</remote-id>
     <remote-id type="cpan-module">Data::URIEncode</remote-id>
diff --git a/dev-perl/Data-UUID/metadata.xml b/dev-perl/Data-UUID/metadata.xml
index 945870da611f..d353a3915787 100644
--- a/dev-perl/Data-UUID/metadata.xml
+++ b/dev-perl/Data-UUID/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-UUID</remote-id>
     <remote-id type="cpan-module">Data::UUID</remote-id>
diff --git a/dev-perl/Data-Uniqid/metadata.xml b/dev-perl/Data-Uniqid/metadata.xml
index 5f8a23363c3a..66f24cae9bce 100644
--- a/dev-perl/Data-Uniqid/metadata.xml
+++ b/dev-perl/Data-Uniqid/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Uniqid</remote-id>
     <remote-id type="cpan-module">Data::Uniqid</remote-id>
diff --git a/dev-perl/Data-Utilities/metadata.xml b/dev-perl/Data-Utilities/metadata.xml
index fc3d1186c26f..2cc50447807b 100644
--- a/dev-perl/Data-Utilities/metadata.xml
+++ b/dev-perl/Data-Utilities/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Utilities</remote-id>
     <remote-id type="cpan-module">Data::Comparator</remote-id>
diff --git a/dev-perl/Data-Validate-Domain/metadata.xml b/dev-perl/Data-Validate-Domain/metadata.xml
index 4f1bdba50108..3c913eca4c3b 100644
--- a/dev-perl/Data-Validate-Domain/metadata.xml
+++ b/dev-perl/Data-Validate-Domain/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Validate-Domain</remote-id>
   </upstream>
diff --git a/dev-perl/Data-Validate-IP/metadata.xml b/dev-perl/Data-Validate-IP/metadata.xml
index 17d630c68bfc..af4ae061d49d 100644
--- a/dev-perl/Data-Validate-IP/metadata.xml
+++ b/dev-perl/Data-Validate-IP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Validate-IP</remote-id>
   </upstream>
diff --git a/dev-perl/Data-Visitor/metadata.xml b/dev-perl/Data-Visitor/metadata.xml
index 105b30b8c18f..26b728b80cd3 100644
--- a/dev-perl/Data-Visitor/metadata.xml
+++ b/dev-perl/Data-Visitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Visitor</remote-id>
     <remote-id type="cpan-module">Data::Visitor</remote-id>
diff --git a/dev-perl/Date-Calc/metadata.xml b/dev-perl/Date-Calc/metadata.xml
index 8a1f2e2f273d..acb1d5e32b09 100644
--- a/dev-perl/Date-Calc/metadata.xml
+++ b/dev-perl/Date-Calc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-Calc</remote-id>
     <remote-id type="cpan-module">Date::Calc</remote-id>
diff --git a/dev-perl/Date-Extract/metadata.xml b/dev-perl/Date-Extract/metadata.xml
index 1ad6714c54bf..a49c84fc96eb 100644
--- a/dev-perl/Date-Extract/metadata.xml
+++ b/dev-perl/Date-Extract/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Date-Extract</remote-id>
         <remote-id type="cpan-module">Date::Extract</remote-id>
diff --git a/dev-perl/Date-ICal/metadata.xml b/dev-perl/Date-ICal/metadata.xml
index ed304c7ce834..e9d8c2683e75 100644
--- a/dev-perl/Date-ICal/metadata.xml
+++ b/dev-perl/Date-ICal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-ICal</remote-id>
     <remote-id type="cpan-module">Date::ICal</remote-id>
diff --git a/dev-perl/Date-Leapyear/metadata.xml b/dev-perl/Date-Leapyear/metadata.xml
index ea46c723e4ae..348b80648dff 100644
--- a/dev-perl/Date-Leapyear/metadata.xml
+++ b/dev-perl/Date-Leapyear/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-Leapyear</remote-id>
     <remote-id type="cpan-module">Date::Leapyear</remote-id>
diff --git a/dev-perl/Date-Pcalc/metadata.xml b/dev-perl/Date-Pcalc/metadata.xml
index ecf0919c4da9..94b67595255a 100644
--- a/dev-perl/Date-Pcalc/metadata.xml
+++ b/dev-perl/Date-Pcalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-Pcalc</remote-id>
     <remote-id type="cpan-module">Date::Pcalc</remote-id>
diff --git a/dev-perl/Date-Simple/metadata.xml b/dev-perl/Date-Simple/metadata.xml
index 798842c2f3cb..f8c8dc64848b 100644
--- a/dev-perl/Date-Simple/metadata.xml
+++ b/dev-perl/Date-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-Simple</remote-id>
     <remote-id type="cpan-module">Date::Simple</remote-id>
diff --git a/dev-perl/DateManip/metadata.xml b/dev-perl/DateManip/metadata.xml
index 44f59b9f4ae1..49036591eab1 100644
--- a/dev-perl/DateManip/metadata.xml
+++ b/dev-perl/DateManip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Date-Manip</remote-id>
     <remote-id type="cpan-module">Date::Manip</remote-id>
diff --git a/dev-perl/DateTime-Event-ICal/metadata.xml b/dev-perl/DateTime-Event-ICal/metadata.xml
index 7b4acd81495c..ba975be5ed89 100644
--- a/dev-perl/DateTime-Event-ICal/metadata.xml
+++ b/dev-perl/DateTime-Event-ICal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Event-ICal</remote-id>
     <remote-id type="cpan-module">DateTime::Event::ICal</remote-id>
diff --git a/dev-perl/DateTime-Event-Recurrence/metadata.xml b/dev-perl/DateTime-Event-Recurrence/metadata.xml
index f2563832034b..e3a0302e0869 100644
--- a/dev-perl/DateTime-Event-Recurrence/metadata.xml
+++ b/dev-perl/DateTime-Event-Recurrence/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Event-Recurrence</remote-id>
     <remote-id type="cpan-module">DateTime::Event::Recurrence</remote-id>
diff --git a/dev-perl/DateTime-Format-Builder/metadata.xml b/dev-perl/DateTime-Format-Builder/metadata.xml
index 6347a3b12fda..183407b964fb 100644
--- a/dev-perl/DateTime-Format-Builder/metadata.xml
+++ b/dev-perl/DateTime-Format-Builder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Builder</remote-id>
     <remote-id type="cpan-module">DateTime::Format::Builder</remote-id>
diff --git a/dev-perl/DateTime-Format-DateParse/metadata.xml b/dev-perl/DateTime-Format-DateParse/metadata.xml
index e3c7c8efc9a8..0c084274aabb 100644
--- a/dev-perl/DateTime-Format-DateParse/metadata.xml
+++ b/dev-perl/DateTime-Format-DateParse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-DateParse</remote-id>
     <remote-id type="cpan-module">DateTime::Format::DateParse</remote-id>
diff --git a/dev-perl/DateTime-Format-Flexible/metadata.xml b/dev-perl/DateTime-Format-Flexible/metadata.xml
index 178942e727d6..6562b1e5bfd1 100644
--- a/dev-perl/DateTime-Format-Flexible/metadata.xml
+++ b/dev-perl/DateTime-Format-Flexible/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Flexible</remote-id>
     <remote-id type="cpan-module">DateTime::Format::Flexible</remote-id>
diff --git a/dev-perl/DateTime-Format-HTTP/metadata.xml b/dev-perl/DateTime-Format-HTTP/metadata.xml
index e4321b59f61a..7d5c6754a9d7 100644
--- a/dev-perl/DateTime-Format-HTTP/metadata.xml
+++ b/dev-perl/DateTime-Format-HTTP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-HTTP</remote-id>
     <remote-id type="cpan-module">DateTime::Format::HTTP</remote-id>
diff --git a/dev-perl/DateTime-Format-ICal/metadata.xml b/dev-perl/DateTime-Format-ICal/metadata.xml
index 3bf4e5ed9ba8..fcd29faa6054 100644
--- a/dev-perl/DateTime-Format-ICal/metadata.xml
+++ b/dev-perl/DateTime-Format-ICal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-ICal</remote-id>
     <remote-id type="cpan-module">DateTime::Format::ICal</remote-id>
diff --git a/dev-perl/DateTime-Format-ISO8601/metadata.xml b/dev-perl/DateTime-Format-ISO8601/metadata.xml
index c0e6db5027a4..0d1e66af01cc 100644
--- a/dev-perl/DateTime-Format-ISO8601/metadata.xml
+++ b/dev-perl/DateTime-Format-ISO8601/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-ISO8601</remote-id>
     <remote-id type="cpan-module">DateTime::Format::ISO8601</remote-id>
diff --git a/dev-perl/DateTime-Format-Mail/metadata.xml b/dev-perl/DateTime-Format-Mail/metadata.xml
index 7d67d905300a..020bd4666b8e 100644
--- a/dev-perl/DateTime-Format-Mail/metadata.xml
+++ b/dev-perl/DateTime-Format-Mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Mail</remote-id>
     <remote-id type="cpan-module">DateTime::Format::Mail</remote-id>
diff --git a/dev-perl/DateTime-Format-Natural/metadata.xml b/dev-perl/DateTime-Format-Natural/metadata.xml
index 3bf86429614d..8377e0bd8d01 100644
--- a/dev-perl/DateTime-Format-Natural/metadata.xml
+++ b/dev-perl/DateTime-Format-Natural/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Natural</remote-id>
     <remote-id type="cpan-module">DateTime::Format::Natural</remote-id>
diff --git a/dev-perl/DateTime-Format-SQLite/metadata.xml b/dev-perl/DateTime-Format-SQLite/metadata.xml
index b4961120911f..fb42a78cb191 100644
--- a/dev-perl/DateTime-Format-SQLite/metadata.xml
+++ b/dev-perl/DateTime-Format-SQLite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-SQLite</remote-id>
     <remote-id type="cpan-module">DateTime::Format::SQLite</remote-id>
diff --git a/dev-perl/DateTime-Format-Strptime/metadata.xml b/dev-perl/DateTime-Format-Strptime/metadata.xml
index 089054b8ab6e..2ed947749026 100644
--- a/dev-perl/DateTime-Format-Strptime/metadata.xml
+++ b/dev-perl/DateTime-Format-Strptime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Strptime</remote-id>
     <remote-id type="cpan-module">DateTime::Format::Strptime</remote-id>
diff --git a/dev-perl/DateTime-Format-W3CDTF/metadata.xml b/dev-perl/DateTime-Format-W3CDTF/metadata.xml
index 4852f9e8a689..3071810de1d0 100644
--- a/dev-perl/DateTime-Format-W3CDTF/metadata.xml
+++ b/dev-perl/DateTime-Format-W3CDTF/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-W3CDTF</remote-id>
     <remote-id type="cpan-module">DateTime::Format::W3CDTF</remote-id>
diff --git a/dev-perl/DateTime-HiRes/metadata.xml b/dev-perl/DateTime-HiRes/metadata.xml
index c5316421a06b..6f1f3afba9a3 100644
--- a/dev-perl/DateTime-HiRes/metadata.xml
+++ b/dev-perl/DateTime-HiRes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-HiRes</remote-id>
     <remote-id type="cpan-module">DateTime::HiRes</remote-id>
diff --git a/dev-perl/DateTime-Locale/metadata.xml b/dev-perl/DateTime-Locale/metadata.xml
index d58dd83edb2a..080aa69bea2c 100644
--- a/dev-perl/DateTime-Locale/metadata.xml
+++ b/dev-perl/DateTime-Locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Locale</remote-id>
     <remote-id type="cpan-module">DateTime::Locale</remote-id>
diff --git a/dev-perl/DateTime-Set/metadata.xml b/dev-perl/DateTime-Set/metadata.xml
index 1cd758244d34..b0275aaddaad 100644
--- a/dev-perl/DateTime-Set/metadata.xml
+++ b/dev-perl/DateTime-Set/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Set</remote-id>
     <remote-id type="cpan-module">DateTime::Set</remote-id>
diff --git a/dev-perl/DateTime-TimeZone/metadata.xml b/dev-perl/DateTime-TimeZone/metadata.xml
index cfc6556b96e3..0d41be9aa2d1 100644
--- a/dev-perl/DateTime-TimeZone/metadata.xml
+++ b/dev-perl/DateTime-TimeZone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-TimeZone</remote-id>
     <remote-id type="cpan-module">DateTime::TimeZone</remote-id>
diff --git a/dev-perl/DateTime-Tiny/metadata.xml b/dev-perl/DateTime-Tiny/metadata.xml
index 3955b0702683..e5c246bce44d 100644
--- a/dev-perl/DateTime-Tiny/metadata.xml
+++ b/dev-perl/DateTime-Tiny/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Tiny</remote-id>
     <remote-id type="cpan-module">DateTime::Tiny</remote-id>
diff --git a/dev-perl/DateTime/metadata.xml b/dev-perl/DateTime/metadata.xml
index e0c32f6cf4d6..240575717880 100644
--- a/dev-perl/DateTime/metadata.xml
+++ b/dev-perl/DateTime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime</remote-id>
     <remote-id type="cpan-module">DateTime</remote-id>
diff --git a/dev-perl/DateTimeX-Easy/metadata.xml b/dev-perl/DateTimeX-Easy/metadata.xml
index 8e164d0c90c1..fbc9922b95f0 100644
--- a/dev-perl/DateTimeX-Easy/metadata.xml
+++ b/dev-perl/DateTimeX-Easy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DateTimeX-Easy</remote-id>
     <remote-id type="cpan-module">DateTimeX::Easy</remote-id>
diff --git a/dev-perl/Debug-Client/metadata.xml b/dev-perl/Debug-Client/metadata.xml
index c4dacdc9063d..17a430db4d5c 100644
--- a/dev-perl/Debug-Client/metadata.xml
+++ b/dev-perl/Debug-Client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Debug-Client</remote-id>
     <remote-id type="cpan-module">Debug::Client</remote-id>
diff --git a/dev-perl/DelimMatch/metadata.xml b/dev-perl/DelimMatch/metadata.xml
index 7c457a0c1fa6..881d2fbe07ae 100644
--- a/dev-perl/DelimMatch/metadata.xml
+++ b/dev-perl/DelimMatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DelimMatch</remote-id>
     <remote-id type="cpan-module">Text::DelimMatch</remote-id>
diff --git a/dev-perl/Devel-ArgNames/metadata.xml b/dev-perl/Devel-ArgNames/metadata.xml
index a3606f4450f2..cca2cd8ee6be 100644
--- a/dev-perl/Devel-ArgNames/metadata.xml
+++ b/dev-perl/Devel-ArgNames/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-ArgNames</remote-id>
     <remote-id type="cpan-module">DB</remote-id>
diff --git a/dev-perl/Devel-Caller/metadata.xml b/dev-perl/Devel-Caller/metadata.xml
index 41b684cae164..5e640cd7e3bf 100644
--- a/dev-perl/Devel-Caller/metadata.xml
+++ b/dev-perl/Devel-Caller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Caller</remote-id>
     <remote-id type="cpan-module">DB</remote-id>
diff --git a/dev-perl/Devel-CheckCompiler/metadata.xml b/dev-perl/Devel-CheckCompiler/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Devel-CheckCompiler/metadata.xml
+++ b/dev-perl/Devel-CheckCompiler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Cover/metadata.xml b/dev-perl/Devel-Cover/metadata.xml
index 39f518f53d7a..6a7d49f9ba94 100644
--- a/dev-perl/Devel-Cover/metadata.xml
+++ b/dev-perl/Devel-Cover/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Cover</remote-id>
   </upstream>
diff --git a/dev-perl/Devel-Cycle/metadata.xml b/dev-perl/Devel-Cycle/metadata.xml
index 5e35acf0fc73..bd7b53838ff1 100644
--- a/dev-perl/Devel-Cycle/metadata.xml
+++ b/dev-perl/Devel-Cycle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Cycle</remote-id>
     <remote-id type="cpan-module">Devel::Cycle</remote-id>
diff --git a/dev-perl/Devel-Declare/metadata.xml b/dev-perl/Devel-Declare/metadata.xml
index a894f3fe8980..6734e458393b 100644
--- a/dev-perl/Devel-Declare/metadata.xml
+++ b/dev-perl/Devel-Declare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Declare</remote-id>
     <remote-id type="cpan-module">Devel::Declare</remote-id>
diff --git a/dev-perl/Devel-Dumpvar/metadata.xml b/dev-perl/Devel-Dumpvar/metadata.xml
index 324900d498ec..aa5e53a90b36 100644
--- a/dev-perl/Devel-Dumpvar/metadata.xml
+++ b/dev-perl/Devel-Dumpvar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Dumpvar</remote-id>
     <remote-id type="cpan-module">Devel::Dumpvar</remote-id>
diff --git a/dev-perl/Devel-GlobalDestruction/metadata.xml b/dev-perl/Devel-GlobalDestruction/metadata.xml
index baabe5d85d7a..d33ee2fa27dc 100644
--- a/dev-perl/Devel-GlobalDestruction/metadata.xml
+++ b/dev-perl/Devel-GlobalDestruction/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-GlobalDestruction</remote-id>
     <remote-id type="cpan-module">Devel::GlobalDestruction</remote-id>
diff --git a/dev-perl/Devel-Hide/metadata.xml b/dev-perl/Devel-Hide/metadata.xml
index 6ea7bc47f185..f84cd1e73df8 100644
--- a/dev-perl/Devel-Hide/metadata.xml
+++ b/dev-perl/Devel-Hide/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Devel-Hide</remote-id>
 		<remote-id type="cpan-module">Devel::Hide</remote-id>
diff --git a/dev-perl/Devel-LexAlias/metadata.xml b/dev-perl/Devel-LexAlias/metadata.xml
index 94e7156cad05..5142a2d7a877 100644
--- a/dev-perl/Devel-LexAlias/metadata.xml
+++ b/dev-perl/Devel-LexAlias/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-LexAlias</remote-id>
     <remote-id type="cpan-module">Devel::LexAlias</remote-id>
diff --git a/dev-perl/Devel-NYTProf/metadata.xml b/dev-perl/Devel-NYTProf/metadata.xml
index 1eaf722a22a5..648e26a421f1 100644
--- a/dev-perl/Devel-NYTProf/metadata.xml
+++ b/dev-perl/Devel-NYTProf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-NYTProf</remote-id>
     <remote-id type="cpan-module">Devel::NYTProf</remote-id>
diff --git a/dev-perl/Devel-OverloadInfo/metadata.xml b/dev-perl/Devel-OverloadInfo/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Devel-OverloadInfo/metadata.xml
+++ b/dev-perl/Devel-OverloadInfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Devel-PatchPerl/metadata.xml b/dev-perl/Devel-PatchPerl/metadata.xml
index 007ac8e0ffb6..25b7d0d906a6 100644
--- a/dev-perl/Devel-PatchPerl/metadata.xml
+++ b/dev-perl/Devel-PatchPerl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Devel-PatchPerl</remote-id>
         <remote-id type="cpan-module">Devel::PatchPerl</remote-id>
diff --git a/dev-perl/Devel-REPL/metadata.xml b/dev-perl/Devel-REPL/metadata.xml
index 90d87d52f7c2..a09c31dca50c 100644
--- a/dev-perl/Devel-REPL/metadata.xml
+++ b/dev-perl/Devel-REPL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-REPL</remote-id>
     <remote-id type="cpan-module">Devel::REPL</remote-id>
diff --git a/dev-perl/Devel-Refactor/metadata.xml b/dev-perl/Devel-Refactor/metadata.xml
index a425903bafbc..8742b7f11300 100644
--- a/dev-perl/Devel-Refactor/metadata.xml
+++ b/dev-perl/Devel-Refactor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Refactor</remote-id>
     <remote-id type="cpan-module">Devel::Refactor</remote-id>
diff --git a/dev-perl/Devel-Size/metadata.xml b/dev-perl/Devel-Size/metadata.xml
index 0ba76a8af4f3..51060bf1c176 100644
--- a/dev-perl/Devel-Size/metadata.xml
+++ b/dev-perl/Devel-Size/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Size</remote-id>
     <remote-id type="cpan-module">Devel::Size</remote-id>
diff --git a/dev-perl/Devel-SmallProf/metadata.xml b/dev-perl/Devel-SmallProf/metadata.xml
index d1176b68065b..f5b89d8a018a 100644
--- a/dev-perl/Devel-SmallProf/metadata.xml
+++ b/dev-perl/Devel-SmallProf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-SmallProf</remote-id>
     <remote-id type="cpan-module">DB</remote-id>
diff --git a/dev-perl/Devel-StackTrace-AsHTML/metadata.xml b/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
index fb68e582d80c..0896e1bface4 100644
--- a/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
+++ b/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-StackTrace-AsHTML</remote-id>
     <remote-id type="cpan-module">Devel::StackTrace::AsHTML</remote-id>
diff --git a/dev-perl/Devel-StackTrace/metadata.xml b/dev-perl/Devel-StackTrace/metadata.xml
index be7d8a5f3bde..e755ae5ca1ed 100644
--- a/dev-perl/Devel-StackTrace/metadata.xml
+++ b/dev-perl/Devel-StackTrace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-StackTrace</remote-id>
     <remote-id type="cpan-module">Devel::StackTrace</remote-id>
diff --git a/dev-perl/Devel-Symdump/metadata.xml b/dev-perl/Devel-Symdump/metadata.xml
index 0aa457f8e143..5d60702fd3ef 100644
--- a/dev-perl/Devel-Symdump/metadata.xml
+++ b/dev-perl/Devel-Symdump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Symdump</remote-id>
     <remote-id type="cpan-module">Devel::Symdump</remote-id>
diff --git a/dev-perl/Device-SerialPort/metadata.xml b/dev-perl/Device-SerialPort/metadata.xml
index f52f98cd9b53..4d8b00fda848 100644
--- a/dev-perl/Device-SerialPort/metadata.xml
+++ b/dev-perl/Device-SerialPort/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Device-SerialPort</remote-id>
     <remote-id type="cpan-module">Device::SerialPort</remote-id>
diff --git a/dev-perl/Digest-CRC/metadata.xml b/dev-perl/Digest-CRC/metadata.xml
index 91bf3307cb1f..c92168323435 100644
--- a/dev-perl/Digest-CRC/metadata.xml
+++ b/dev-perl/Digest-CRC/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<herd>perl</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
@@ -10,6 +8,14 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpan">Digest-CRC</remote-id>
 	<remote-id type="cpan-module">Digest::CRC</remote-id>
diff --git a/dev-perl/Digest-HMAC/metadata.xml b/dev-perl/Digest-HMAC/metadata.xml
index 991f5da6de41..2b0e383e4b07 100644
--- a/dev-perl/Digest-HMAC/metadata.xml
+++ b/dev-perl/Digest-HMAC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-HMAC</remote-id>
     <remote-id type="cpan-module">Digest::HMAC</remote-id>
diff --git a/dev-perl/Digest-JHash/metadata.xml b/dev-perl/Digest-JHash/metadata.xml
index 51fd6b2cd714..bbaae5913408 100644
--- a/dev-perl/Digest-JHash/metadata.xml
+++ b/dev-perl/Digest-JHash/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-JHash</remote-id>
     <remote-id type="cpan-module">Digest::JHash</remote-id>
diff --git a/dev-perl/Digest-MD4/metadata.xml b/dev-perl/Digest-MD4/metadata.xml
index 34b3fece7114..27c1235d5157 100644
--- a/dev-perl/Digest-MD4/metadata.xml
+++ b/dev-perl/Digest-MD4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-MD4</remote-id>
     <remote-id type="cpan-module">Digest::MD4</remote-id>
diff --git a/dev-perl/Digest-MD5-File/metadata.xml b/dev-perl/Digest-MD5-File/metadata.xml
index 86766d6bd6de..fc74a4c9331a 100644
--- a/dev-perl/Digest-MD5-File/metadata.xml
+++ b/dev-perl/Digest-MD5-File/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-MD5-File</remote-id>
     <remote-id type="cpan-module">Digest::MD5::File</remote-id>
diff --git a/dev-perl/Digest-Nilsimsa/metadata.xml b/dev-perl/Digest-Nilsimsa/metadata.xml
index 4e5d471fe61c..23e547a81300 100644
--- a/dev-perl/Digest-Nilsimsa/metadata.xml
+++ b/dev-perl/Digest-Nilsimsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-Nilsimsa</remote-id>
     <remote-id type="cpan-module">Digest::Nilsimsa</remote-id>
diff --git a/dev-perl/Digest-Perl-MD5/metadata.xml b/dev-perl/Digest-Perl-MD5/metadata.xml
index babd1767f122..fbe80b2bdc76 100644
--- a/dev-perl/Digest-Perl-MD5/metadata.xml
+++ b/dev-perl/Digest-Perl-MD5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-Perl-MD5</remote-id>
     <remote-id type="cpan-module">Digest::Perl::MD5</remote-id>
diff --git a/dev-perl/Digest-SHA1/metadata.xml b/dev-perl/Digest-SHA1/metadata.xml
index 8565ca2628ef..cc4fe0052732 100644
--- a/dev-perl/Digest-SHA1/metadata.xml
+++ b/dev-perl/Digest-SHA1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-SHA1</remote-id>
     <remote-id type="cpan-module">Digest::SHA1</remote-id>
diff --git a/dev-perl/Dist-CheckConflicts/metadata.xml b/dev-perl/Dist-CheckConflicts/metadata.xml
index faa8be585bc9..7cd6c57c2430 100644
--- a/dev-perl/Dist-CheckConflicts/metadata.xml
+++ b/dev-perl/Dist-CheckConflicts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Dist-CheckConflicts</remote-id>
     <remote-id type="cpan-module">Dist::CheckConflicts</remote-id>
diff --git a/dev-perl/EV/metadata.xml b/dev-perl/EV/metadata.xml
index 6b7dfb625e43..9b215a2df3d1 100644
--- a/dev-perl/EV/metadata.xml
+++ b/dev-perl/EV/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">EV</remote-id>
     <remote-id type="cpan-module">EV</remote-id>
diff --git a/dev-perl/Emacs-PDE/metadata.xml b/dev-perl/Emacs-PDE/metadata.xml
index 447ce92afa8d..1657b5963b20 100644
--- a/dev-perl/Emacs-PDE/metadata.xml
+++ b/dev-perl/Emacs-PDE/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Emacs-PDE</remote-id>
     <remote-id type="cpan-module">Emacs::PDE</remote-id>
diff --git a/dev-perl/Email-Abstract/metadata.xml b/dev-perl/Email-Abstract/metadata.xml
index a80f68c30350..f7b3844c38ed 100644
--- a/dev-perl/Email-Abstract/metadata.xml
+++ b/dev-perl/Email-Abstract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Abstract</remote-id>
     <remote-id type="cpan-module">Email::Abstract</remote-id>
diff --git a/dev-perl/Email-Address-List/metadata.xml b/dev-perl/Email-Address-List/metadata.xml
index a22d4ad6d380..1839c4e56c9a 100644
--- a/dev-perl/Email-Address-List/metadata.xml
+++ b/dev-perl/Email-Address-List/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Email-Address-List</remote-id>
         <remote-id type="cpan-module">Email::Address::List</remote-id>
diff --git a/dev-perl/Email-Address/metadata.xml b/dev-perl/Email-Address/metadata.xml
index fcfdcad8ce46..35b65877b075 100644
--- a/dev-perl/Email-Address/metadata.xml
+++ b/dev-perl/Email-Address/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Address</remote-id>
     <remote-id type="cpan-module">Email::Address</remote-id>
diff --git a/dev-perl/Email-Date-Format/metadata.xml b/dev-perl/Email-Date-Format/metadata.xml
index 42ba4e3ee6a1..1d3584d4b3a4 100644
--- a/dev-perl/Email-Date-Format/metadata.xml
+++ b/dev-perl/Email-Date-Format/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Email-Date-Format</remote-id>
 		<remote-id type="cpan-module">Email::Date::Format</remote-id>
diff --git a/dev-perl/Email-Date/metadata.xml b/dev-perl/Email-Date/metadata.xml
index 7c4d3e13861d..27dfd384d939 100644
--- a/dev-perl/Email-Date/metadata.xml
+++ b/dev-perl/Email-Date/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Date</remote-id>
     <remote-id type="cpan-module">Email::Date</remote-id>
diff --git a/dev-perl/Email-Filter/metadata.xml b/dev-perl/Email-Filter/metadata.xml
index 82bcf4b2ded8..455dd56ef637 100644
--- a/dev-perl/Email-Filter/metadata.xml
+++ b/dev-perl/Email-Filter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Filter</remote-id>
     <remote-id type="cpan-module">Email::Filter</remote-id>
diff --git a/dev-perl/Email-Find/metadata.xml b/dev-perl/Email-Find/metadata.xml
index 2fbaf6458cc9..efde69c704f4 100644
--- a/dev-perl/Email-Find/metadata.xml
+++ b/dev-perl/Email-Find/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Find</remote-id>
     <remote-id type="cpan-module">Email::Find</remote-id>
diff --git a/dev-perl/Email-FolderType/metadata.xml b/dev-perl/Email-FolderType/metadata.xml
index ad04c5942c2a..c10a9afccef9 100644
--- a/dev-perl/Email-FolderType/metadata.xml
+++ b/dev-perl/Email-FolderType/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-FolderType</remote-id>
     <remote-id type="cpan-module">Email::FolderType</remote-id>
diff --git a/dev-perl/Email-LocalDelivery/metadata.xml b/dev-perl/Email-LocalDelivery/metadata.xml
index c1f609ee2ac3..d7513d76e689 100644
--- a/dev-perl/Email-LocalDelivery/metadata.xml
+++ b/dev-perl/Email-LocalDelivery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-LocalDelivery</remote-id>
     <remote-id type="cpan-module">Email::LocalDelivery</remote-id>
diff --git a/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml b/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
index cb0110962216..57c885576d2e 100644
--- a/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
+++ b/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-MIME-Attachment-Stripper</remote-id>
     <remote-id type="cpan-module">Email::MIME::Attachment::Stripper</remote-id>
diff --git a/dev-perl/Email-MIME-ContentType/metadata.xml b/dev-perl/Email-MIME-ContentType/metadata.xml
index 7d722e49dd55..04d8c72906ac 100644
--- a/dev-perl/Email-MIME-ContentType/metadata.xml
+++ b/dev-perl/Email-MIME-ContentType/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-MIME-ContentType</remote-id>
     <remote-id type="cpan-module">Email::MIME::ContentType</remote-id>
diff --git a/dev-perl/Email-MIME-Encodings/metadata.xml b/dev-perl/Email-MIME-Encodings/metadata.xml
index 4bfcc8a74539..c4480f5b1975 100644
--- a/dev-perl/Email-MIME-Encodings/metadata.xml
+++ b/dev-perl/Email-MIME-Encodings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-MIME-Encodings</remote-id>
     <remote-id type="cpan-module">Email::MIME::Encodings</remote-id>
diff --git a/dev-perl/Email-MIME/metadata.xml b/dev-perl/Email-MIME/metadata.xml
index b7fd347f2bd2..299ebf11f9a4 100644
--- a/dev-perl/Email-MIME/metadata.xml
+++ b/dev-perl/Email-MIME/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-MIME</remote-id>
     <remote-id type="cpan-module">Email::MIME</remote-id>
diff --git a/dev-perl/Email-MessageID/metadata.xml b/dev-perl/Email-MessageID/metadata.xml
index 7c5a619806cc..35daf246525a 100644
--- a/dev-perl/Email-MessageID/metadata.xml
+++ b/dev-perl/Email-MessageID/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-MessageID</remote-id>
     <remote-id type="cpan-module">Email::MessageID</remote-id>
diff --git a/dev-perl/Email-Reply/metadata.xml b/dev-perl/Email-Reply/metadata.xml
index 37b49067758a..d0d55bfea4aa 100644
--- a/dev-perl/Email-Reply/metadata.xml
+++ b/dev-perl/Email-Reply/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Reply</remote-id>
     <remote-id type="cpan-module">Email::Reply</remote-id>
diff --git a/dev-perl/Email-Send-Gmail/metadata.xml b/dev-perl/Email-Send-Gmail/metadata.xml
index 9ad682597a32..2790a17da040 100644
--- a/dev-perl/Email-Send-Gmail/metadata.xml
+++ b/dev-perl/Email-Send-Gmail/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
@@ -10,6 +9,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Email-Send-Gmail</remote-id>
 		<remote-id type="cpan-module">Email::Send::Gmail</remote-id>
diff --git a/dev-perl/Email-Send/metadata.xml b/dev-perl/Email-Send/metadata.xml
index 5af783341d9f..1f93c3c990b3 100644
--- a/dev-perl/Email-Send/metadata.xml
+++ b/dev-perl/Email-Send/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Send</remote-id>
     <remote-id type="cpan-module">Email::Send</remote-id>
diff --git a/dev-perl/Email-Sender/metadata.xml b/dev-perl/Email-Sender/metadata.xml
index 1a0c11c67440..aa75bbf0a505 100644
--- a/dev-perl/Email-Sender/metadata.xml
+++ b/dev-perl/Email-Sender/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Sender</remote-id>
     <remote-id type="cpan-module">Email::Sender</remote-id>
diff --git a/dev-perl/Email-Simple/metadata.xml b/dev-perl/Email-Simple/metadata.xml
index acc7ce20bb15..fc238dbfb7c3 100644
--- a/dev-perl/Email-Simple/metadata.xml
+++ b/dev-perl/Email-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Simple</remote-id>
     <remote-id type="cpan-module">Email::Simple</remote-id>
diff --git a/dev-perl/Email-Valid/metadata.xml b/dev-perl/Email-Valid/metadata.xml
index 2e08fc6fec6f..ef52d06c60ad 100644
--- a/dev-perl/Email-Valid/metadata.xml
+++ b/dev-perl/Email-Valid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Email-Valid</remote-id>
     <remote-id type="cpan-module">Email::Valid</remote-id>
diff --git a/dev-perl/Encode-Detect/metadata.xml b/dev-perl/Encode-Detect/metadata.xml
index 0516670fe1e8..b3b1f8724b9a 100644
--- a/dev-perl/Encode-Detect/metadata.xml
+++ b/dev-perl/Encode-Detect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-Detect</remote-id>
     <remote-id type="cpan-module">Encode::Detect</remote-id>
diff --git a/dev-perl/Encode-EUCJPASCII/metadata.xml b/dev-perl/Encode-EUCJPASCII/metadata.xml
index b1196ff60467..0bfd420c8db0 100644
--- a/dev-perl/Encode-EUCJPASCII/metadata.xml
+++ b/dev-perl/Encode-EUCJPASCII/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-EUCJPASCII</remote-id>
     <remote-id type="cpan-module"> Encode::EUCJPASCII</remote-id>
diff --git a/dev-perl/Encode-HanConvert/metadata.xml b/dev-perl/Encode-HanConvert/metadata.xml
index 08b3f67d35ce..4dac69172bb8 100644
--- a/dev-perl/Encode-HanConvert/metadata.xml
+++ b/dev-perl/Encode-HanConvert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-HanConvert</remote-id>
     <remote-id type="cpan-module">Encode::HanConvert</remote-id>
diff --git a/dev-perl/Encode-HanExtra/metadata.xml b/dev-perl/Encode-HanExtra/metadata.xml
index e404bff8ad8d..1854fd5a2787 100644
--- a/dev-perl/Encode-HanExtra/metadata.xml
+++ b/dev-perl/Encode-HanExtra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-HanExtra</remote-id>
     <remote-id type="cpan-module">Encode::HanExtra</remote-id>
diff --git a/dev-perl/Encode-IMAPUTF7/metadata.xml b/dev-perl/Encode-IMAPUTF7/metadata.xml
index 86b174562511..c87788b303c3 100644
--- a/dev-perl/Encode-IMAPUTF7/metadata.xml
+++ b/dev-perl/Encode-IMAPUTF7/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-IMAPUTF7</remote-id>
     <remote-id type="cpan-module">Encode::IMAPUTF7</remote-id>
diff --git a/dev-perl/Encode-JIS2K/metadata.xml b/dev-perl/Encode-JIS2K/metadata.xml
index ef1c795e4e20..78c3ffcd44b7 100644
--- a/dev-perl/Encode-JIS2K/metadata.xml
+++ b/dev-perl/Encode-JIS2K/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-JIS2K</remote-id>
     <remote-id type="cpan-module"> Encode::JIS2K</remote-id>
diff --git a/dev-perl/Encode-Locale/metadata.xml b/dev-perl/Encode-Locale/metadata.xml
index 0b26b9e65d8f..bcdcdbb498a9 100644
--- a/dev-perl/Encode-Locale/metadata.xml
+++ b/dev-perl/Encode-Locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Encode-Locale</remote-id>
 		<remote-id type="cpan-module">Encode::Locale</remote-id>
diff --git a/dev-perl/Encode-compat/metadata.xml b/dev-perl/Encode-compat/metadata.xml
index b1d1bb03e65a..ae8d3d15f332 100644
--- a/dev-perl/Encode-compat/metadata.xml
+++ b/dev-perl/Encode-compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode-compat</remote-id>
     <remote-id type="cpan-module">Encode</remote-id>
diff --git a/dev-perl/Error/metadata.xml b/dev-perl/Error/metadata.xml
index a96e01256d1a..0a576b055e96 100644
--- a/dev-perl/Error/metadata.xml
+++ b/dev-perl/Error/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Error</remote-id>
     <remote-id type="cpan-module">Error</remote-id>
diff --git a/dev-perl/Eval-Closure/metadata.xml b/dev-perl/Eval-Closure/metadata.xml
index 96ba05dc0098..67973b04616d 100644
--- a/dev-perl/Eval-Closure/metadata.xml
+++ b/dev-perl/Eval-Closure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
 	<remote-id type="cpan">Eval-Closure</remote-id>
 	<remote-id type="cpan-module">Eval::Closure</remote-id>
diff --git a/dev-perl/Eval-LineNumbers/metadata.xml b/dev-perl/Eval-LineNumbers/metadata.xml
index c9a04fda05f0..26e813243cc7 100644
--- a/dev-perl/Eval-LineNumbers/metadata.xml
+++ b/dev-perl/Eval-LineNumbers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Eval-LineNumbers</remote-id>
     <remote-id type="cpan-module">Eval::LineNumbers</remote-id>
diff --git a/dev-perl/Event-ExecFlow/metadata.xml b/dev-perl/Event-ExecFlow/metadata.xml
index 84182f80b090..2932320be34e 100644
--- a/dev-perl/Event-ExecFlow/metadata.xml
+++ b/dev-perl/Event-ExecFlow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Event-ExecFlow</remote-id>
     <remote-id type="cpan-module">AnyEvent::Impl::Event::CondVar</remote-id>
diff --git a/dev-perl/Event-RPC/metadata.xml b/dev-perl/Event-RPC/metadata.xml
index 5cbcc967e79f..884b94911dbf 100644
--- a/dev-perl/Event-RPC/metadata.xml
+++ b/dev-perl/Event-RPC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Event-RPC</remote-id>
     <remote-id type="cpan-module">Event::RPC</remote-id>
diff --git a/dev-perl/Event/metadata.xml b/dev-perl/Event/metadata.xml
index a188696de99c..b44b11bd5c17 100644
--- a/dev-perl/Event/metadata.xml
+++ b/dev-perl/Event/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Event</remote-id>
     <remote-id type="cpan-module">Event</remote-id>
diff --git a/dev-perl/Exception-Base/metadata.xml b/dev-perl/Exception-Base/metadata.xml
index c15160fe20e2..5f1cca88ff48 100644
--- a/dev-perl/Exception-Base/metadata.xml
+++ b/dev-perl/Exception-Base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Base</remote-id>
     <remote-id type="cpan-module">Exception::Base</remote-id>
diff --git a/dev-perl/Exception-Class/metadata.xml b/dev-perl/Exception-Class/metadata.xml
index 654c23483a25..694195fb2dc7 100644
--- a/dev-perl/Exception-Class/metadata.xml
+++ b/dev-perl/Exception-Class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Class</remote-id>
     <remote-id type="cpan-module">Exception::Class</remote-id>
diff --git a/dev-perl/Exception-Died/metadata.xml b/dev-perl/Exception-Died/metadata.xml
index c8234883d46f..d6971e54dc8a 100644
--- a/dev-perl/Exception-Died/metadata.xml
+++ b/dev-perl/Exception-Died/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Died</remote-id>
     <remote-id type="cpan-module">Exception::Died</remote-id>
diff --git a/dev-perl/Exception-System/metadata.xml b/dev-perl/Exception-System/metadata.xml
index a7179cbcb1da..9e8e79f6d416 100644
--- a/dev-perl/Exception-System/metadata.xml
+++ b/dev-perl/Exception-System/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-System</remote-id>
     <remote-id type="cpan-module">Exception::System</remote-id>
diff --git a/dev-perl/Exception-Warning/metadata.xml b/dev-perl/Exception-Warning/metadata.xml
index 501efb988b2f..aa257c6d7636 100644
--- a/dev-perl/Exception-Warning/metadata.xml
+++ b/dev-perl/Exception-Warning/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Warning</remote-id>
     <remote-id type="cpan-module">Exception::Warning</remote-id>
diff --git a/dev-perl/Expect/metadata.xml b/dev-perl/Expect/metadata.xml
index 208e37f1672b..9a8d0502903f 100644
--- a/dev-perl/Expect/metadata.xml
+++ b/dev-perl/Expect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Expect</remote-id>
     <remote-id type="cpan-module">Expect</remote-id>
diff --git a/dev-perl/Exporter-Cluster/metadata.xml b/dev-perl/Exporter-Cluster/metadata.xml
index 978c67c42ed8..546b62a2924e 100644
--- a/dev-perl/Exporter-Cluster/metadata.xml
+++ b/dev-perl/Exporter-Cluster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exporter-Cluster</remote-id>
     <remote-id type="cpan-module">Exporter::Cluster</remote-id>
diff --git a/dev-perl/Exporter-Lite/metadata.xml b/dev-perl/Exporter-Lite/metadata.xml
index 667a0ba37ae1..c284c185f511 100644
--- a/dev-perl/Exporter-Lite/metadata.xml
+++ b/dev-perl/Exporter-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Exporter-Lite</remote-id>
     <remote-id type="cpan-module">Exporter::Lite</remote-id>
diff --git a/dev-perl/Exporter-Tiny/metadata.xml b/dev-perl/Exporter-Tiny/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Exporter-Tiny/metadata.xml
+++ b/dev-perl/Exporter-Tiny/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-AutoInstall/metadata.xml b/dev-perl/ExtUtils-AutoInstall/metadata.xml
index fdbe9a1ef066..aba4bbd671d0 100644
--- a/dev-perl/ExtUtils-AutoInstall/metadata.xml
+++ b/dev-perl/ExtUtils-AutoInstall/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-AutoInstall</remote-id>
     <remote-id type="cpan-module">ExtUtils::AutoInstall</remote-id>
diff --git a/dev-perl/ExtUtils-CChecker/metadata.xml b/dev-perl/ExtUtils-CChecker/metadata.xml
index 7b2b3e15361b..a6e22d9fd17e 100644
--- a/dev-perl/ExtUtils-CChecker/metadata.xml
+++ b/dev-perl/ExtUtils-CChecker/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-CChecker</remote-id>
     <remote-id type="cpan-module">ExtUtils::CChecker</remote-id>
diff --git a/dev-perl/ExtUtils-Config/metadata.xml b/dev-perl/ExtUtils-Config/metadata.xml
index f68470d8ee16..1a2dff49494b 100644
--- a/dev-perl/ExtUtils-Config/metadata.xml
+++ b/dev-perl/ExtUtils-Config/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ExtUtils-Config</remote-id>
 		<remote-id type="cpan-module">ExtUtils::Config</remote-id>
diff --git a/dev-perl/ExtUtils-Constant/metadata.xml b/dev-perl/ExtUtils-Constant/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/ExtUtils-Constant/metadata.xml
+++ b/dev-perl/ExtUtils-Constant/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-Depends/metadata.xml b/dev-perl/ExtUtils-Depends/metadata.xml
index 54ee633e5c5c..82cf769795be 100644
--- a/dev-perl/ExtUtils-Depends/metadata.xml
+++ b/dev-perl/ExtUtils-Depends/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-Depends</remote-id>
     <remote-id type="cpan-module">ExtUtils::Depends</remote-id>
diff --git a/dev-perl/ExtUtils-F77/metadata.xml b/dev-perl/ExtUtils-F77/metadata.xml
index e715bbe1c8fa..d826adde2231 100644
--- a/dev-perl/ExtUtils-F77/metadata.xml
+++ b/dev-perl/ExtUtils-F77/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-F77</remote-id>
     <remote-id type="cpan-module">ExtUtils::F77</remote-id>
diff --git a/dev-perl/ExtUtils-Helpers/metadata.xml b/dev-perl/ExtUtils-Helpers/metadata.xml
index 333753452dec..07af02d9acdb 100644
--- a/dev-perl/ExtUtils-Helpers/metadata.xml
+++ b/dev-perl/ExtUtils-Helpers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ExtUtils-Helpers</remote-id>
 		<remote-id type="cpan-module">ExtUtils::Helpers</remote-id>
diff --git a/dev-perl/ExtUtils-InstallPaths/metadata.xml b/dev-perl/ExtUtils-InstallPaths/metadata.xml
index da21790ec88c..259f6759b3dc 100644
--- a/dev-perl/ExtUtils-InstallPaths/metadata.xml
+++ b/dev-perl/ExtUtils-InstallPaths/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ExtUtils-InstallPaths</remote-id>
 		<remote-id type="cpan-module">ExtUtils::InstallPaths</remote-id>
diff --git a/dev-perl/ExtUtils-LibBuilder/metadata.xml b/dev-perl/ExtUtils-LibBuilder/metadata.xml
index 6bf0251dda90..f9c741c13de4 100644
--- a/dev-perl/ExtUtils-LibBuilder/metadata.xml
+++ b/dev-perl/ExtUtils-LibBuilder/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-Libbuilder</remote-id>
     <remote-id type="cpan-module">ExtUtils::LibBuilder</remote-id>
diff --git a/dev-perl/ExtUtils-XSBuilder/metadata.xml b/dev-perl/ExtUtils-XSBuilder/metadata.xml
index d1f142c8fbff..5b959a13323a 100644
--- a/dev-perl/ExtUtils-XSBuilder/metadata.xml
+++ b/dev-perl/ExtUtils-XSBuilder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-XSBuilder</remote-id>
     <remote-id type="cpan-module">ExtUtils::XSBuilder</remote-id>
diff --git a/dev-perl/ExtUtils-XSpp/metadata.xml b/dev-perl/ExtUtils-XSpp/metadata.xml
index f47248d8c444..52ce54dd15d4 100644
--- a/dev-perl/ExtUtils-XSpp/metadata.xml
+++ b/dev-perl/ExtUtils-XSpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-XSpp</remote-id>
     <remote-id type="cpan-module">ExtUtils::XSpp</remote-id>
diff --git a/dev-perl/FCGI-ProcManager/metadata.xml b/dev-perl/FCGI-ProcManager/metadata.xml
index b6630a68a5de..315a6604d89a 100644
--- a/dev-perl/FCGI-ProcManager/metadata.xml
+++ b/dev-perl/FCGI-ProcManager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">FCGI-ProcManager</remote-id>
     <remote-id type="cpan-module">FCGI::ProcManager</remote-id>
diff --git a/dev-perl/FCGI/metadata.xml b/dev-perl/FCGI/metadata.xml
index dada22096b1a..1bcd16bd4608 100644
--- a/dev-perl/FCGI/metadata.xml
+++ b/dev-perl/FCGI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">FCGI</remote-id>
     <remote-id type="cpan-module">FCGI</remote-id>
diff --git a/dev-perl/FLV-AudioExtractor/metadata.xml b/dev-perl/FLV-AudioExtractor/metadata.xml
index 47fcfdfa5986..7897bd74b29f 100644
--- a/dev-perl/FLV-AudioExtractor/metadata.xml
+++ b/dev-perl/FLV-AudioExtractor/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">FLV-AudioExtractor</remote-id>
 		<remote-id type="cpan-module">FLV::AudioExtractor</remote-id>
diff --git a/dev-perl/Fatal-Exception/metadata.xml b/dev-perl/Fatal-Exception/metadata.xml
index 0374a951a9a9..fe3d80bd87a4 100644
--- a/dev-perl/Fatal-Exception/metadata.xml
+++ b/dev-perl/Fatal-Exception/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Fatal-Exception</remote-id>
     <remote-id type="cpan-module">Exception::Argument</remote-id>
diff --git a/dev-perl/Feed-Find/metadata.xml b/dev-perl/Feed-Find/metadata.xml
index b0c66db5091b..165d211e6540 100644
--- a/dev-perl/Feed-Find/metadata.xml
+++ b/dev-perl/Feed-Find/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Feed-Find</remote-id>
     <remote-id type="cpan-module">Feed::Find</remote-id>
diff --git a/dev-perl/Festival-Client-Async/metadata.xml b/dev-perl/Festival-Client-Async/metadata.xml
index f6aef09bf638..34fb2b3aaf92 100644
--- a/dev-perl/Festival-Client-Async/metadata.xml
+++ b/dev-perl/Festival-Client-Async/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Festival-Client-Async</remote-id>
     <remote-id type="cpan-module">Festival::Client::Async</remote-id>
diff --git a/dev-perl/File-BOM/metadata.xml b/dev-perl/File-BOM/metadata.xml
index 46b549d08d79..8738e539f203 100644
--- a/dev-perl/File-BOM/metadata.xml
+++ b/dev-perl/File-BOM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-BOM</remote-id>
     <remote-id type="cpan-module">File::BOM</remote-id>
diff --git a/dev-perl/File-BaseDir/metadata.xml b/dev-perl/File-BaseDir/metadata.xml
index 85bd0e215caa..bad0e2ba3dc6 100644
--- a/dev-perl/File-BaseDir/metadata.xml
+++ b/dev-perl/File-BaseDir/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-BaseDir</remote-id>
     <remote-id type="cpan-module">File::BaseDir</remote-id>
diff --git a/dev-perl/File-Copy-Link/metadata.xml b/dev-perl/File-Copy-Link/metadata.xml
index 2e20cc30a4b2..9320a0a20841 100644
--- a/dev-perl/File-Copy-Link/metadata.xml
+++ b/dev-perl/File-Copy-Link/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
@@ -10,6 +9,10 @@
 		<email>dev-zero@gentoo.org</email>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 	<longdescription>The Quota module provides access to file system quotas. The quotactl system call or ioctl is used to query or set quotas on the local host, or queries are submitted via RPC to a remote host. Mount tables can be parsed with getmntent and paths can be translated to device files (or whatever the actual quotactl implementations needs as argument) of the according file system.</longdescription>
   <upstream>
     <remote-id type="cpan">File-Copy-Link</remote-id>
diff --git a/dev-perl/File-Copy-Recursive/metadata.xml b/dev-perl/File-Copy-Recursive/metadata.xml
index 00e82041c0b8..e30e92a0a542 100644
--- a/dev-perl/File-Copy-Recursive/metadata.xml
+++ b/dev-perl/File-Copy-Recursive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Copy-Recursive</remote-id>
     <remote-id type="cpan-module">File::Copy::Recursive</remote-id>
diff --git a/dev-perl/File-DesktopEntry/metadata.xml b/dev-perl/File-DesktopEntry/metadata.xml
index a8efbbde2006..10f53a0d8b29 100644
--- a/dev-perl/File-DesktopEntry/metadata.xml
+++ b/dev-perl/File-DesktopEntry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-DesktopEntry</remote-id>
     <remote-id type="cpan-module">File::DesktopEntry</remote-id>
diff --git a/dev-perl/File-DirWalk/metadata.xml b/dev-perl/File-DirWalk/metadata.xml
index a306bb979f99..dec2d148d217 100644
--- a/dev-perl/File-DirWalk/metadata.xml
+++ b/dev-perl/File-DirWalk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-DirWalk</remote-id>
     <remote-id type="cpan-module">File::DirWalk</remote-id>
diff --git a/dev-perl/File-Find-Rule-Perl/metadata.xml b/dev-perl/File-Find-Rule-Perl/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/File-Find-Rule-Perl/metadata.xml
+++ b/dev-perl/File-Find-Rule-Perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/File-Find-Rule/metadata.xml b/dev-perl/File-Find-Rule/metadata.xml
index a591bf460384..52a3d0cd889b 100644
--- a/dev-perl/File-Find-Rule/metadata.xml
+++ b/dev-perl/File-Find-Rule/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Find-Rule</remote-id>
     <remote-id type="cpan-module">File::Find::Rule</remote-id>
diff --git a/dev-perl/File-Flat/metadata.xml b/dev-perl/File-Flat/metadata.xml
index c539fad499f2..94919a213535 100644
--- a/dev-perl/File-Flat/metadata.xml
+++ b/dev-perl/File-Flat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Flat</remote-id>
     <remote-id type="cpan-module">File::Flat</remote-id>
diff --git a/dev-perl/File-Flock/metadata.xml b/dev-perl/File-Flock/metadata.xml
index a3233b30b7a0..7c087f2a6d5c 100644
--- a/dev-perl/File-Flock/metadata.xml
+++ b/dev-perl/File-Flock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Flock</remote-id>
     <remote-id type="cpan-module">File::Flock</remote-id>
diff --git a/dev-perl/File-Grep/metadata.xml b/dev-perl/File-Grep/metadata.xml
index 8d4a1493909e..d29ba72096a9 100644
--- a/dev-perl/File-Grep/metadata.xml
+++ b/dev-perl/File-Grep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Grep</remote-id>
     <remote-id type="cpan-module">File::Grep</remote-id>
diff --git a/dev-perl/File-HomeDir/metadata.xml b/dev-perl/File-HomeDir/metadata.xml
index 1993c60d81d9..659e69d1d057 100644
--- a/dev-perl/File-HomeDir/metadata.xml
+++ b/dev-perl/File-HomeDir/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-HomeDir</remote-id>
     <remote-id type="cpan-module">File::HomeDir</remote-id>
diff --git a/dev-perl/File-KeePass/metadata.xml b/dev-perl/File-KeePass/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/File-KeePass/metadata.xml
+++ b/dev-perl/File-KeePass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/File-Listing/metadata.xml b/dev-perl/File-Listing/metadata.xml
index de2c36a27f81..58043b9573a2 100644
--- a/dev-perl/File-Listing/metadata.xml
+++ b/dev-perl/File-Listing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">File-Listing</remote-id>
 		<remote-id type="cpan-module">File::Listing</remote-id>
diff --git a/dev-perl/File-MMagic/metadata.xml b/dev-perl/File-MMagic/metadata.xml
index b8c57e2219a3..d56176fd9232 100644
--- a/dev-perl/File-MMagic/metadata.xml
+++ b/dev-perl/File-MMagic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-MMagic</remote-id>
     <remote-id type="cpan-module">File::MMagic</remote-id>
diff --git a/dev-perl/File-Map/metadata.xml b/dev-perl/File-Map/metadata.xml
index eb9dc383bb65..1c8b88969a3b 100644
--- a/dev-perl/File-Map/metadata.xml
+++ b/dev-perl/File-Map/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>perl</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
 <longdescription lang="en">
   File::Map maps files or anonymous memory into perl variables.
 </longdescription>
diff --git a/dev-perl/File-MimeInfo/metadata.xml b/dev-perl/File-MimeInfo/metadata.xml
index 51356485ffef..d286692758a2 100644
--- a/dev-perl/File-MimeInfo/metadata.xml
+++ b/dev-perl/File-MimeInfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-MimeInfo</remote-id>
     <remote-id type="cpan-module">File::MimeInfo</remote-id>
diff --git a/dev-perl/File-NCopy/metadata.xml b/dev-perl/File-NCopy/metadata.xml
index 9f41b1eaee2f..14d488043cff 100644
--- a/dev-perl/File-NCopy/metadata.xml
+++ b/dev-perl/File-NCopy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-NCopy</remote-id>
     <remote-id type="cpan-module">File::NCopy</remote-id>
diff --git a/dev-perl/File-NFSLock/metadata.xml b/dev-perl/File-NFSLock/metadata.xml
index bf3edce1141e..f0335a875b00 100644
--- a/dev-perl/File-NFSLock/metadata.xml
+++ b/dev-perl/File-NFSLock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-NFSLock</remote-id>
     <remote-id type="cpan-module">File::NFSLock</remote-id>
diff --git a/dev-perl/File-Next/metadata.xml b/dev-perl/File-Next/metadata.xml
index 574da2f7a34f..f2b9acd766c5 100644
--- a/dev-perl/File-Next/metadata.xml
+++ b/dev-perl/File-Next/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Next</remote-id>
     <remote-id type="cpan-module">File::Next</remote-id>
diff --git a/dev-perl/File-Path-Expand/metadata.xml b/dev-perl/File-Path-Expand/metadata.xml
index d0eabc4fd077..da75917cea10 100644
--- a/dev-perl/File-Path-Expand/metadata.xml
+++ b/dev-perl/File-Path-Expand/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Path-Expand</remote-id>
     <remote-id type="cpan-module">File::Path::Expand</remote-id>
diff --git a/dev-perl/File-ReadBackwards/metadata.xml b/dev-perl/File-ReadBackwards/metadata.xml
index 672a308a6b23..b7b168bb1ded 100644
--- a/dev-perl/File-ReadBackwards/metadata.xml
+++ b/dev-perl/File-ReadBackwards/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-ReadBackwards</remote-id>
     <remote-id type="cpan-module">File::ReadBackwards</remote-id>
diff --git a/dev-perl/File-Remove/metadata.xml b/dev-perl/File-Remove/metadata.xml
index 6f4c4e9dea99..48527b5b6461 100644
--- a/dev-perl/File-Remove/metadata.xml
+++ b/dev-perl/File-Remove/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Remove</remote-id>
     <remote-id type="cpan-module">File::Remove</remote-id>
diff --git a/dev-perl/File-RsyncP/metadata.xml b/dev-perl/File-RsyncP/metadata.xml
index 844e1c60b70e..8c52277a9b49 100644
--- a/dev-perl/File-RsyncP/metadata.xml
+++ b/dev-perl/File-RsyncP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-RsyncP</remote-id>
     <remote-id type="cpan-module">File::RsyncP</remote-id>
diff --git a/dev-perl/File-Scan-ClamAV/metadata.xml b/dev-perl/File-Scan-ClamAV/metadata.xml
index 9f1048850627..a18051200d89 100644
--- a/dev-perl/File-Scan-ClamAV/metadata.xml
+++ b/dev-perl/File-Scan-ClamAV/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Scan-ClamAV</remote-id>
     <remote-id type="cpan-module">File::Scan::ClamAV</remote-id>
diff --git a/dev-perl/File-SearchPath/metadata.xml b/dev-perl/File-SearchPath/metadata.xml
index f1cd6fed1e99..7b62b242825c 100644
--- a/dev-perl/File-SearchPath/metadata.xml
+++ b/dev-perl/File-SearchPath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-SearchPath</remote-id>
     <remote-id type="cpan-module">File::SearchPath</remote-id>
diff --git a/dev-perl/File-ShareDir-Install/metadata.xml b/dev-perl/File-ShareDir-Install/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/File-ShareDir-Install/metadata.xml
+++ b/dev-perl/File-ShareDir-Install/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/File-ShareDir/metadata.xml b/dev-perl/File-ShareDir/metadata.xml
index 499001211c68..e84d36dc3a1d 100644
--- a/dev-perl/File-ShareDir/metadata.xml
+++ b/dev-perl/File-ShareDir/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-ShareDir</remote-id>
     <remote-id type="cpan-module">File::ShareDir</remote-id>
diff --git a/dev-perl/File-Slurp-Tiny/metadata.xml b/dev-perl/File-Slurp-Tiny/metadata.xml
index f3ecb2bcd8ae..952eda61b5f5 100644
--- a/dev-perl/File-Slurp-Tiny/metadata.xml
+++ b/dev-perl/File-Slurp-Tiny/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">File-Slurp-Tiny</remote-id>
 		<remote-id type="cpan-module">File::Slurp::Tiny</remote-id>
diff --git a/dev-perl/File-Slurp-Unicode/metadata.xml b/dev-perl/File-Slurp-Unicode/metadata.xml
index 27bb95518e07..4d9e9fcbcb70 100644
--- a/dev-perl/File-Slurp-Unicode/metadata.xml
+++ b/dev-perl/File-Slurp-Unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Slurp-Unicode</remote-id>
     <remote-id type="cpan-module">File::Slurp::Unicode</remote-id>
diff --git a/dev-perl/File-Slurp/metadata.xml b/dev-perl/File-Slurp/metadata.xml
index a79093adafdd..dbba05b48539 100644
--- a/dev-perl/File-Slurp/metadata.xml
+++ b/dev-perl/File-Slurp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Slurp</remote-id>
     <remote-id type="cpan-module">File::Slurp</remote-id>
diff --git a/dev-perl/File-Slurper/metadata.xml b/dev-perl/File-Slurper/metadata.xml
index d47da5b496ec..c098a7e7db5b 100644
--- a/dev-perl/File-Slurper/metadata.xml
+++ b/dev-perl/File-Slurper/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Slurper</remote-id>
     <remote-id type="cpan-module">File::Slurper</remote-id>
diff --git a/dev-perl/File-Sort/metadata.xml b/dev-perl/File-Sort/metadata.xml
index b47a53fd2ac7..af9aded013da 100644
--- a/dev-perl/File-Sort/metadata.xml
+++ b/dev-perl/File-Sort/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Sort</remote-id>
     <remote-id type="cpan-module">File::Sort</remote-id>
diff --git a/dev-perl/File-Stat-Bits/metadata.xml b/dev-perl/File-Stat-Bits/metadata.xml
index 798fe0c50e3f..c8c3d26cfb1c 100644
--- a/dev-perl/File-Stat-Bits/metadata.xml
+++ b/dev-perl/File-Stat-Bits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Stat-Bits</remote-id>
     <remote-id type="cpan-module">File::Stat::Bits</remote-id>
diff --git a/dev-perl/File-Stat-Moose/metadata.xml b/dev-perl/File-Stat-Moose/metadata.xml
index bdc6698bbca4..07ffe91abc25 100644
--- a/dev-perl/File-Stat-Moose/metadata.xml
+++ b/dev-perl/File-Stat-Moose/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Stat-Moose</remote-id>
     <remote-id type="cpan-module">Exception::IO</remote-id>
diff --git a/dev-perl/File-Sync/metadata.xml b/dev-perl/File-Sync/metadata.xml
index d5f59ff3dcae..3e277ecaaa4b 100644
--- a/dev-perl/File-Sync/metadata.xml
+++ b/dev-perl/File-Sync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Sync</remote-id>
     <remote-id type="cpan-module">File::Sync</remote-id>
diff --git a/dev-perl/File-Tail/metadata.xml b/dev-perl/File-Tail/metadata.xml
index fda7212d4967..0b68fd800fe2 100644
--- a/dev-perl/File-Tail/metadata.xml
+++ b/dev-perl/File-Tail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Tail</remote-id>
     <remote-id type="cpan-module">File::Tail</remote-id>
diff --git a/dev-perl/File-Tempdir/metadata.xml b/dev-perl/File-Tempdir/metadata.xml
index d7be16a1dfba..8b89190e38a5 100644
--- a/dev-perl/File-Tempdir/metadata.xml
+++ b/dev-perl/File-Tempdir/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Tempdir</remote-id>
     <remote-id type="cpan-module">File::Tempdir</remote-id>
diff --git a/dev-perl/File-Type/metadata.xml b/dev-perl/File-Type/metadata.xml
index cb581a897c2d..791cf89e06f5 100644
--- a/dev-perl/File-Type/metadata.xml
+++ b/dev-perl/File-Type/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Type</remote-id>
     <remote-id type="cpan-module">File::Type</remote-id>
diff --git a/dev-perl/File-Which/metadata.xml b/dev-perl/File-Which/metadata.xml
index 98674b01a174..03ed1511378c 100644
--- a/dev-perl/File-Which/metadata.xml
+++ b/dev-perl/File-Which/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Which</remote-id>
     <remote-id type="cpan-module">File::Which</remote-id>
diff --git a/dev-perl/File-chdir/metadata.xml b/dev-perl/File-chdir/metadata.xml
index 7ba1b7eca646..7d62c96eef62 100644
--- a/dev-perl/File-chdir/metadata.xml
+++ b/dev-perl/File-chdir/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-chdir</remote-id>
     <remote-id type="cpan-module">File::chdir</remote-id>
diff --git a/dev-perl/File-chmod/metadata.xml b/dev-perl/File-chmod/metadata.xml
index 46001de9ec64..adc7cd62f0e2 100644
--- a/dev-perl/File-chmod/metadata.xml
+++ b/dev-perl/File-chmod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-chmod</remote-id>
     <remote-id type="cpan-module">File::chmod</remote-id>
diff --git a/dev-perl/File-pushd/metadata.xml b/dev-perl/File-pushd/metadata.xml
index 845518865ded..c7b8714c84d2 100644
--- a/dev-perl/File-pushd/metadata.xml
+++ b/dev-perl/File-pushd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-pushd</remote-id>
     <remote-id type="cpan-module">File::pushd</remote-id>
diff --git a/dev-perl/FileHandle-Unget/metadata.xml b/dev-perl/FileHandle-Unget/metadata.xml
index ba47adc9c959..e3433de36e36 100644
--- a/dev-perl/FileHandle-Unget/metadata.xml
+++ b/dev-perl/FileHandle-Unget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">FileHandle-Unget</remote-id>
     <remote-id type="cpan-module">FileHandle::Unget</remote-id>
diff --git a/dev-perl/Filesys-Df/metadata.xml b/dev-perl/Filesys-Df/metadata.xml
index cf4a3b469190..7f527530ada7 100644
--- a/dev-perl/Filesys-Df/metadata.xml
+++ b/dev-perl/Filesys-Df/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Filesys-Df</remote-id>
     <remote-id type="cpan-module">Filesys::Df</remote-id>
diff --git a/dev-perl/Filesys-DiskSpace/metadata.xml b/dev-perl/Filesys-DiskSpace/metadata.xml
index dc9cd8494b83..123dc421de72 100644
--- a/dev-perl/Filesys-DiskSpace/metadata.xml
+++ b/dev-perl/Filesys-DiskSpace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Filesys-DiskSpace</remote-id>
     <remote-id type="cpan-module">Filesys::DiskSpace</remote-id>
diff --git a/dev-perl/Filesys-Notify-Simple/metadata.xml b/dev-perl/Filesys-Notify-Simple/metadata.xml
index 1e606e070876..3657921a8f02 100644
--- a/dev-perl/Filesys-Notify-Simple/metadata.xml
+++ b/dev-perl/Filesys-Notify-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Filesys-Notify-Simple</remote-id>
     <remote-id type="cpan-module">Filesys::Notify::Simple</remote-id>
diff --git a/dev-perl/Filesys-SmbClient/metadata.xml b/dev-perl/Filesys-SmbClient/metadata.xml
index 0f6904bcd96d..78a477df6035 100644
--- a/dev-perl/Filesys-SmbClient/metadata.xml
+++ b/dev-perl/Filesys-SmbClient/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Filesys-SmbClient</remote-id>
     <remote-id type="cpan-module">Filesys::SmbClient</remote-id>
diff --git a/dev-perl/Filter/metadata.xml b/dev-perl/Filter/metadata.xml
index 4271e4a413fa..c7d9e077430f 100644
--- a/dev-perl/Filter/metadata.xml
+++ b/dev-perl/Filter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Filter</remote-id>
     <remote-id type="cpan-module">Filter::Util::Call</remote-id>
diff --git a/dev-perl/Finance-Quote/metadata.xml b/dev-perl/Finance-Quote/metadata.xml
index c8041d3cae23..519579cda789 100644
--- a/dev-perl/Finance-Quote/metadata.xml
+++ b/dev-perl/Finance-Quote/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Finance-Quote</remote-id>
     <remote-id type="cpan-module">Finance::Quote</remote-id>
diff --git a/dev-perl/Finance-YahooQuote/metadata.xml b/dev-perl/Finance-YahooQuote/metadata.xml
index b9af8b3015a3..215c15e3fcd0 100644
--- a/dev-perl/Finance-YahooQuote/metadata.xml
+++ b/dev-perl/Finance-YahooQuote/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Finance-YahooQuote</remote-id>
     <remote-id type="cpan-module">Finance::YahooQuote</remote-id>
diff --git a/dev-perl/Font-AFM/metadata.xml b/dev-perl/Font-AFM/metadata.xml
index e95542d740dd..20d63a8687b2 100644
--- a/dev-perl/Font-AFM/metadata.xml
+++ b/dev-perl/Font-AFM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Font-AFM</remote-id>
     <remote-id type="cpan-module">Font::AFM</remote-id>
diff --git a/dev-perl/Font-TTF/metadata.xml b/dev-perl/Font-TTF/metadata.xml
index 7919afc80ec6..68a1d2fa3d8b 100644
--- a/dev-perl/Font-TTF/metadata.xml
+++ b/dev-perl/Font-TTF/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Font-TTF</remote-id>
     <remote-id type="cpan-module">Font::TTF</remote-id>
diff --git a/dev-perl/Format-Human-Bytes/metadata.xml b/dev-perl/Format-Human-Bytes/metadata.xml
index 3a2aa9890d1c..7e45fac2bf71 100644
--- a/dev-perl/Format-Human-Bytes/metadata.xml
+++ b/dev-perl/Format-Human-Bytes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Format-Human-Bytes</remote-id>
     <remote-id type="cpan-module">Format::Human::Bytes</remote-id>
diff --git a/dev-perl/FreezeThaw/metadata.xml b/dev-perl/FreezeThaw/metadata.xml
index b1fed1984bdd..56e591c649c2 100644
--- a/dev-perl/FreezeThaw/metadata.xml
+++ b/dev-perl/FreezeThaw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">FreezeThaw</remote-id>
     <remote-id type="cpan-module">FreezeThaw</remote-id>
diff --git a/dev-perl/Fuse/metadata.xml b/dev-perl/Fuse/metadata.xml
index 9acc7ad5980a..58cd4b65fd96 100644
--- a/dev-perl/Fuse/metadata.xml
+++ b/dev-perl/Fuse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Fuse</remote-id>
     <remote-id type="cpan-module">Fuse</remote-id>
diff --git a/dev-perl/GD-Barcode/metadata.xml b/dev-perl/GD-Barcode/metadata.xml
index 4fc479143ac5..8264bf458254 100644
--- a/dev-perl/GD-Barcode/metadata.xml
+++ b/dev-perl/GD-Barcode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GD-Barcode</remote-id>
     <remote-id type="cpan-module">GD::Barcode</remote-id>
diff --git a/dev-perl/GD-Graph3d/metadata.xml b/dev-perl/GD-Graph3d/metadata.xml
index e84b54edc29f..4fbdb9b497c1 100644
--- a/dev-perl/GD-Graph3d/metadata.xml
+++ b/dev-perl/GD-Graph3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GD-Graph3d</remote-id>
     <remote-id type="cpan-module">GD::Graph3d</remote-id>
diff --git a/dev-perl/GD-SVG/metadata.xml b/dev-perl/GD-SVG/metadata.xml
index eebad95d062f..d514aa09c843 100644
--- a/dev-perl/GD-SVG/metadata.xml
+++ b/dev-perl/GD-SVG/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GD-SVG</remote-id>
     <remote-id type="cpan-module">GD::SVG</remote-id>
diff --git a/dev-perl/GD/metadata.xml b/dev-perl/GD/metadata.xml
index ee4d2129fc42..fbe24dbd4de1 100644
--- a/dev-perl/GD/metadata.xml
+++ b/dev-perl/GD/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="animgif">Enable animated gif support</flag>
   </use>
diff --git a/dev-perl/GDGraph/metadata.xml b/dev-perl/GDGraph/metadata.xml
index 6fdb825eea3c..3d21250f4660 100644
--- a/dev-perl/GDGraph/metadata.xml
+++ b/dev-perl/GDGraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GDGraph</remote-id>
     <remote-id type="cpan-module">GD::Graph</remote-id>
diff --git a/dev-perl/GDTextUtil/metadata.xml b/dev-perl/GDTextUtil/metadata.xml
index 708672626642..6ee1622c664b 100644
--- a/dev-perl/GDTextUtil/metadata.xml
+++ b/dev-perl/GDTextUtil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GDTextUtil</remote-id>
     <remote-id type="cpan-module">GD::Text</remote-id>
diff --git a/dev-perl/GSSAPI/metadata.xml b/dev-perl/GSSAPI/metadata.xml
index 7d1e3403059e..e830d68c2fa7 100644
--- a/dev-perl/GSSAPI/metadata.xml
+++ b/dev-perl/GSSAPI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GSSAPI</remote-id>
     <remote-id type="cpan-module">GSSAPI</remote-id>
diff --git a/dev-perl/GStreamer-Interfaces/metadata.xml b/dev-perl/GStreamer-Interfaces/metadata.xml
index 2b18338b102f..78c7d73a5c73 100644
--- a/dev-perl/GStreamer-Interfaces/metadata.xml
+++ b/dev-perl/GStreamer-Interfaces/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GStreamer-Interfaces</remote-id>
     <remote-id type="cpan-module">GStreamer::Interfaces</remote-id>
diff --git a/dev-perl/GStreamer/metadata.xml b/dev-perl/GStreamer/metadata.xml
index 8ed26bf5ec06..40f247139a04 100644
--- a/dev-perl/GStreamer/metadata.xml
+++ b/dev-perl/GStreamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GStreamer</remote-id>
     <remote-id type="cpan-module">GStreamer</remote-id>
diff --git a/dev-perl/Gearman-Client-Async/metadata.xml b/dev-perl/Gearman-Client-Async/metadata.xml
index 5ded6298d510..30556ec4993d 100644
--- a/dev-perl/Gearman-Client-Async/metadata.xml
+++ b/dev-perl/Gearman-Client-Async/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman-Client-Async</remote-id>
     <remote-id type="cpan-module">Gearman::Client::Async</remote-id>
diff --git a/dev-perl/Gearman-Server/metadata.xml b/dev-perl/Gearman-Server/metadata.xml
index eab9c53e7e68..a912848f3499 100644
--- a/dev-perl/Gearman-Server/metadata.xml
+++ b/dev-perl/Gearman-Server/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman-Server</remote-id>
     <remote-id type="cpan-module">Gearman::Server</remote-id>
diff --git a/dev-perl/Gearman/metadata.xml b/dev-perl/Gearman/metadata.xml
index 2d37766df63d..be298ecfc5a8 100644
--- a/dev-perl/Gearman/metadata.xml
+++ b/dev-perl/Gearman/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman</remote-id>
     <remote-id type="cpan-module">Gearman::Client</remote-id>
diff --git a/dev-perl/Gentoo-PerlMod-Version/metadata.xml b/dev-perl/Gentoo-PerlMod-Version/metadata.xml
index 59e9346cb3a1..ea52bb147c9c 100644
--- a/dev-perl/Gentoo-PerlMod-Version/metadata.xml
+++ b/dev-perl/Gentoo-PerlMod-Version/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Gentoo-PerlMod-Version</remote-id>
 		<remote-id type="cpan-module">Gentoo::PerlMod::Version</remote-id>
diff --git a/dev-perl/Geo-IP/metadata.xml b/dev-perl/Geo-IP/metadata.xml
index 8b9ac5754a81..ddb7639a335f 100644
--- a/dev-perl/Geo-IP/metadata.xml
+++ b/dev-perl/Geo-IP/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Look up country by IP Address</longdescription>
   <upstream>
     <remote-id type="cpan">Geo-IP</remote-id>
diff --git a/dev-perl/Geography-Countries/metadata.xml b/dev-perl/Geography-Countries/metadata.xml
index 7bedde4bc424..bbebd5e8d4f4 100644
--- a/dev-perl/Geography-Countries/metadata.xml
+++ b/dev-perl/Geography-Countries/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Geography-Countries</remote-id>
     <remote-id type="cpan-module">Geography::Countries</remote-id>
diff --git a/dev-perl/Getopt-ArgvFile/metadata.xml b/dev-perl/Getopt-ArgvFile/metadata.xml
index d06941ef30c0..b581218609fa 100644
--- a/dev-perl/Getopt-ArgvFile/metadata.xml
+++ b/dev-perl/Getopt-ArgvFile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-ArgvFile</remote-id>
     <remote-id type="cpan-module">Getopt::ArgvFile</remote-id>
diff --git a/dev-perl/Getopt-GUI-Long/metadata.xml b/dev-perl/Getopt-GUI-Long/metadata.xml
index 3f019d2bc0c0..02724c068d55 100644
--- a/dev-perl/Getopt-GUI-Long/metadata.xml
+++ b/dev-perl/Getopt-GUI-Long/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
 <maintainer>
 	<email>xmw@gentoo.org</email>
 	<name>Michael Weber</name>
 </maintainer>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpan">Getopt-GUI-Long</remote-id>
 	<remote-id type="cpan-module">Getopt::GUI::Long</remote-id>
diff --git a/dev-perl/Getopt-Long-Descriptive/metadata.xml b/dev-perl/Getopt-Long-Descriptive/metadata.xml
index d624659aa3fa..de425eedbbd4 100644
--- a/dev-perl/Getopt-Long-Descriptive/metadata.xml
+++ b/dev-perl/Getopt-Long-Descriptive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-Long-Descriptive</remote-id>
     <remote-id type="cpan-module">Getopt::Long::Descriptive</remote-id>
diff --git a/dev-perl/Getopt-Mixed/metadata.xml b/dev-perl/Getopt-Mixed/metadata.xml
index b91b44f9b64f..3a3ba94036a9 100644
--- a/dev-perl/Getopt-Mixed/metadata.xml
+++ b/dev-perl/Getopt-Mixed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-Mixed</remote-id>
     <remote-id type="cpan-module">Getopt::Mixed</remote-id>
diff --git a/dev-perl/Getopt-Tabular/metadata.xml b/dev-perl/Getopt-Tabular/metadata.xml
index 65b2950e62fd..827a79f99e13 100644
--- a/dev-perl/Getopt-Tabular/metadata.xml
+++ b/dev-perl/Getopt-Tabular/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-Tabular</remote-id>
     <remote-id type="cpan-module">Getopt::Tabular</remote-id>
diff --git a/dev-perl/GnuPG-Interface/metadata.xml b/dev-perl/GnuPG-Interface/metadata.xml
index ed0b0ada4a80..52d1c0b17f8b 100644
--- a/dev-perl/GnuPG-Interface/metadata.xml
+++ b/dev-perl/GnuPG-Interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GnuPG-Interface</remote-id>
     <remote-id type="cpan-module">GnuPG::Fingerprint</remote-id>
diff --git a/dev-perl/Goo-Canvas/metadata.xml b/dev-perl/Goo-Canvas/metadata.xml
index 8742fce7fbdd..87284c497d8f 100644
--- a/dev-perl/Goo-Canvas/metadata.xml
+++ b/dev-perl/Goo-Canvas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 GTK+ does't has an buildin canvas widget. GooCanvas is wonderful. It is easy to use and has powerful and extensible way to create items in canvas. Just try it.
 </longdescription>
diff --git a/dev-perl/Graph/metadata.xml b/dev-perl/Graph/metadata.xml
index 646b85a2341a..2819b0049ca1 100644
--- a/dev-perl/Graph/metadata.xml
+++ b/dev-perl/Graph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Graph</remote-id>
     <remote-id type="cpan-module">Graph</remote-id>
diff --git a/dev-perl/GraphViz/metadata.xml b/dev-perl/GraphViz/metadata.xml
index 2e8626388d09..344fd86f1c87 100644
--- a/dev-perl/GraphViz/metadata.xml
+++ b/dev-perl/GraphViz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">GraphViz</remote-id>
     <remote-id type="cpan-module">Devel::GraphVizProf</remote-id>
diff --git a/dev-perl/Graphics-ColorNames-WWW/metadata.xml b/dev-perl/Graphics-ColorNames-WWW/metadata.xml
index 62ba7f247bfa..e1aff2af1433 100644
--- a/dev-perl/Graphics-ColorNames-WWW/metadata.xml
+++ b/dev-perl/Graphics-ColorNames-WWW/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>pinkbyte@gentoo.org</email>
         <name>Sergey Popov</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Graphics-ColorNames-WWW</remote-id>
         <remote-id type="cpan-module">Graphics::ColorNames::CSS</remote-id>
diff --git a/dev-perl/Graphics-ColorNames/metadata.xml b/dev-perl/Graphics-ColorNames/metadata.xml
index 5bf40d6d8458..12504710af02 100644
--- a/dev-perl/Graphics-ColorNames/metadata.xml
+++ b/dev-perl/Graphics-ColorNames/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="recommended">Install recommended support modules</flag>
   </use>
diff --git a/dev-perl/Graphics-ColorObject/metadata.xml b/dev-perl/Graphics-ColorObject/metadata.xml
index 0b6aadf7d415..c27594cb6f9b 100644
--- a/dev-perl/Graphics-ColorObject/metadata.xml
+++ b/dev-perl/Graphics-ColorObject/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>kentfredric@gmail.com</email>
     <name>Kent Fredric</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Graphics-ColorObject</remote-id>
     <remote-id type="cpan-module">Graphics::ColorObject</remote-id>
diff --git a/dev-perl/Gtk2-AppIndicator/metadata.xml b/dev-perl/Gtk2-AppIndicator/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/dev-perl/Gtk2-AppIndicator/metadata.xml
+++ b/dev-perl/Gtk2-AppIndicator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml b/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
index 80fce192a27d..0aae4de3212c 100644
--- a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
+++ b/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-PodViewer</remote-id>
     <remote-id type="cpan-module">Gtk2::Ex::PodViewer</remote-id>
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml b/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
index 3eb2788e005c..07497a259389 100644
--- a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
+++ b/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-PrintDialog</remote-id>
     <remote-id type="cpan-module">Gtk2::Ex::PrintDialog</remote-id>
diff --git a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml b/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
index 0dcafa018993..4f362f14bd7c 100644
--- a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
+++ b/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-Simple-List</remote-id>
     <remote-id type="cpan-module">Gtk2::Ex::Simple::List</remote-id>
diff --git a/dev-perl/Gtk2-ImageView/metadata.xml b/dev-perl/Gtk2-ImageView/metadata.xml
index dd464e96ade1..8cb19b20aa22 100644
--- a/dev-perl/Gtk2-ImageView/metadata.xml
+++ b/dev-perl/Gtk2-ImageView/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-ImageView</remote-id>
     <remote-id type="cpan-module">Gtk2::ImageView</remote-id>
diff --git a/dev-perl/Gtk2-Notify/metadata.xml b/dev-perl/Gtk2-Notify/metadata.xml
index c276f24f8902..4afe7b0f2921 100644
--- a/dev-perl/Gtk2-Notify/metadata.xml
+++ b/dev-perl/Gtk2-Notify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Notify</remote-id>
     <remote-id type="cpan-module">Gtk2::Notify</remote-id>
diff --git a/dev-perl/Gtk2-Unique/metadata.xml b/dev-perl/Gtk2-Unique/metadata.xml
index daa6afc1ff76..0c99a43417ff 100644
--- a/dev-perl/Gtk2-Unique/metadata.xml
+++ b/dev-perl/Gtk2-Unique/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
 <remote-id type="cpan">Gtk2-Unique</remote-id>
 <remote-id type="cpan-module">Gtk2::Unique</remote-id>
diff --git a/dev-perl/Gtk2-WebKit/metadata.xml b/dev-perl/Gtk2-WebKit/metadata.xml
index 1a33ebc2a4c6..50aaaee46d93 100644
--- a/dev-perl/Gtk2-WebKit/metadata.xml
+++ b/dev-perl/Gtk2-WebKit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-WebKit</remote-id>
     <remote-id type="cpan-module">Gtk2::WebKit</remote-id>
diff --git a/dev-perl/Guard/metadata.xml b/dev-perl/Guard/metadata.xml
index 03d75b955788..ef46c8142a3b 100644
--- a/dev-perl/Guard/metadata.xml
+++ b/dev-perl/Guard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Guard</remote-id>
     <remote-id type="cpan-module">Guard</remote-id>
diff --git a/dev-perl/HTML-Clean/metadata.xml b/dev-perl/HTML-Clean/metadata.xml
index 857a0aefecfc..0503b3d0fd99 100644
--- a/dev-perl/HTML-Clean/metadata.xml
+++ b/dev-perl/HTML-Clean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Clean</remote-id>
     <remote-id type="cpan-module">HTML::Clean</remote-id>
diff --git a/dev-perl/HTML-Element-Extended/metadata.xml b/dev-perl/HTML-Element-Extended/metadata.xml
index 2dd9015d3d64..c1d0f1ec727a 100644
--- a/dev-perl/HTML-Element-Extended/metadata.xml
+++ b/dev-perl/HTML-Element-Extended/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Element-Extended</remote-id>
     <remote-id type="cpan-module">HTML::ElementGlob</remote-id>
diff --git a/dev-perl/HTML-FillInForm/metadata.xml b/dev-perl/HTML-FillInForm/metadata.xml
index 521ac2789563..d19a163fbeae 100644
--- a/dev-perl/HTML-FillInForm/metadata.xml
+++ b/dev-perl/HTML-FillInForm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-FillInForm</remote-id>
     <remote-id type="cpan-module">HTML::FillInForm</remote-id>
diff --git a/dev-perl/HTML-Form/metadata.xml b/dev-perl/HTML-Form/metadata.xml
index 9ea2bf227f45..3ec7a699c377 100644
--- a/dev-perl/HTML-Form/metadata.xml
+++ b/dev-perl/HTML-Form/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">HTML-Form</remote-id>
 		<remote-id type="cpan-module">HTML::Form</remote-id>
diff --git a/dev-perl/HTML-Format/metadata.xml b/dev-perl/HTML-Format/metadata.xml
index 95f3302dc62d..6212f4085fbb 100644
--- a/dev-perl/HTML-Format/metadata.xml
+++ b/dev-perl/HTML-Format/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Format</remote-id>
     <remote-id type="cpan-module">HTML::FormatPS</remote-id>
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/metadata.xml b/dev-perl/HTML-FormatText-WithLinks-AndTables/metadata.xml
index 182f384abc39..fd111cde9ee7 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/metadata.xml
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">HTML-FormatText-WithLinks-AndTables</remote-id>
         <remote-id type="cpan-module">HTML::FormatText::WithLinks::AndTables</remote-id>
diff --git a/dev-perl/HTML-FormatText-WithLinks/metadata.xml b/dev-perl/HTML-FormatText-WithLinks/metadata.xml
index e36eb01f5f7d..229360bcd422 100644
--- a/dev-perl/HTML-FormatText-WithLinks/metadata.xml
+++ b/dev-perl/HTML-FormatText-WithLinks/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">HTML-FormatText-WithLinks</remote-id>
         <remote-id type="cpan-module">HTML::FormatText::WithLinks</remote-id>
diff --git a/dev-perl/HTML-FromText/metadata.xml b/dev-perl/HTML-FromText/metadata.xml
index 50ae4180f0ca..aad2486f752b 100644
--- a/dev-perl/HTML-FromText/metadata.xml
+++ b/dev-perl/HTML-FromText/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-FromText</remote-id>
     <remote-id type="cpan-module">HTML::FromText</remote-id>
diff --git a/dev-perl/HTML-HTMLDoc/metadata.xml b/dev-perl/HTML-HTMLDoc/metadata.xml
index 666edd355465..2435a2b9de8c 100644
--- a/dev-perl/HTML-HTMLDoc/metadata.xml
+++ b/dev-perl/HTML-HTMLDoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-HTMLDoc</remote-id>
     <remote-id type="cpan-module">HTML::HTMLDoc</remote-id>
diff --git a/dev-perl/HTML-Highlight/metadata.xml b/dev-perl/HTML-Highlight/metadata.xml
index d11d5477c4df..c1f28a961f08 100644
--- a/dev-perl/HTML-Highlight/metadata.xml
+++ b/dev-perl/HTML-Highlight/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">HTML-Highlight</remote-id>
                 <remote-id type="cpan-module">HTML::Highlight</remote-id>
diff --git a/dev-perl/HTML-LinkExtractor/metadata.xml b/dev-perl/HTML-LinkExtractor/metadata.xml
index 009a4df34397..6d6b94bdc077 100644
--- a/dev-perl/HTML-LinkExtractor/metadata.xml
+++ b/dev-perl/HTML-LinkExtractor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-LinkExtractor</remote-id>
     <remote-id type="cpan-module">HTML::LinkExtractor</remote-id>
diff --git a/dev-perl/HTML-Mason-PSGIHandler/metadata.xml b/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
index 933ccaa5fc70..e5dffe9ca05f 100644
--- a/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
+++ b/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Mason-PSGIHandler</remote-id>
     <remote-id type="cpan-module">HTML::Mason::PSGIHandler</remote-id>
diff --git a/dev-perl/HTML-Mason/metadata.xml b/dev-perl/HTML-Mason/metadata.xml
index 6f8534f86816..8c769ecafcf1 100644
--- a/dev-perl/HTML-Mason/metadata.xml
+++ b/dev-perl/HTML-Mason/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use><flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg>
 			support</flag>
   </use>
diff --git a/dev-perl/HTML-Object/metadata.xml b/dev-perl/HTML-Object/metadata.xml
index 551bdbb1435d..2ca030277ff9 100644
--- a/dev-perl/HTML-Object/metadata.xml
+++ b/dev-perl/HTML-Object/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">htmlobject</remote-id>
 	</upstream>
diff --git a/dev-perl/HTML-Packer/metadata.xml b/dev-perl/HTML-Packer/metadata.xml
index 75148d0c459f..07b304bfdd4f 100644
--- a/dev-perl/HTML-Packer/metadata.xml
+++ b/dev-perl/HTML-Packer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">HTML-Packer</remote-id>
                 <remote-id type="cpan-module">HTML::Packer</remote-id>
diff --git a/dev-perl/HTML-Parser/metadata.xml b/dev-perl/HTML-Parser/metadata.xml
index a09709141a05..ad93d9e5b753 100644
--- a/dev-perl/HTML-Parser/metadata.xml
+++ b/dev-perl/HTML-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Parser</remote-id>
     <remote-id type="cpan-module">HTML::Entities</remote-id>
diff --git a/dev-perl/HTML-Quoted/metadata.xml b/dev-perl/HTML-Quoted/metadata.xml
index 36046f8441f0..a2851dea6ebd 100644
--- a/dev-perl/HTML-Quoted/metadata.xml
+++ b/dev-perl/HTML-Quoted/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Quoted</remote-id>
     <remote-id type="cpan-module">HTML::Quoted</remote-id>
diff --git a/dev-perl/HTML-RewriteAttributes/metadata.xml b/dev-perl/HTML-RewriteAttributes/metadata.xml
index 044428967c5b..ed93f96e8591 100644
--- a/dev-perl/HTML-RewriteAttributes/metadata.xml
+++ b/dev-perl/HTML-RewriteAttributes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-RewriteAttributes</remote-id>
     <remote-id type="cpan-module">HTML::RewriteAttributes</remote-id>
diff --git a/dev-perl/HTML-Scrubber/metadata.xml b/dev-perl/HTML-Scrubber/metadata.xml
index d225c9fc5a34..a2d07d8268ed 100644
--- a/dev-perl/HTML-Scrubber/metadata.xml
+++ b/dev-perl/HTML-Scrubber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Scrubber</remote-id>
     <remote-id type="cpan-module">HTML::Scrubber</remote-id>
diff --git a/dev-perl/HTML-SimpleParse/metadata.xml b/dev-perl/HTML-SimpleParse/metadata.xml
index 68af9af5686b..7ea3aa1e8c1c 100644
--- a/dev-perl/HTML-SimpleParse/metadata.xml
+++ b/dev-perl/HTML-SimpleParse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-SimpleParse</remote-id>
     <remote-id type="cpan-module">HTML::SimpleParse</remote-id>
diff --git a/dev-perl/HTML-Strip/metadata.xml b/dev-perl/HTML-Strip/metadata.xml
index 76d3c1a9c968..a96480b6d952 100644
--- a/dev-perl/HTML-Strip/metadata.xml
+++ b/dev-perl/HTML-Strip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Strip</remote-id>
     <remote-id type="cpan-module">HTML::Strip</remote-id>
diff --git a/dev-perl/HTML-Table/metadata.xml b/dev-perl/HTML-Table/metadata.xml
index 9dfc2f5f0eab..19d8db0bfaf0 100644
--- a/dev-perl/HTML-Table/metadata.xml
+++ b/dev-perl/HTML-Table/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Table</remote-id>
     <remote-id type="cpan-module">HTML::Table</remote-id>
diff --git a/dev-perl/HTML-TableContentParser/metadata.xml b/dev-perl/HTML-TableContentParser/metadata.xml
index f1516fb8d4f6..aec26e5641d2 100644
--- a/dev-perl/HTML-TableContentParser/metadata.xml
+++ b/dev-perl/HTML-TableContentParser/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TableContentParser</remote-id>
     <remote-id type="cpan-module">HTML::TableContentParser</remote-id>
diff --git a/dev-perl/HTML-TableExtract/metadata.xml b/dev-perl/HTML-TableExtract/metadata.xml
index 3cdf03d12c65..820b00ebc56a 100644
--- a/dev-perl/HTML-TableExtract/metadata.xml
+++ b/dev-perl/HTML-TableExtract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TableExtract</remote-id>
     <remote-id type="cpan-module">HTML::TableExtract</remote-id>
diff --git a/dev-perl/HTML-TableParser/metadata.xml b/dev-perl/HTML-TableParser/metadata.xml
index 8e63e7def65e..57250577ac0e 100644
--- a/dev-perl/HTML-TableParser/metadata.xml
+++ b/dev-perl/HTML-TableParser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TableParser</remote-id>
     <remote-id type="cpan-module">HTML::TableParser</remote-id>
diff --git a/dev-perl/HTML-TagFilter/metadata.xml b/dev-perl/HTML-TagFilter/metadata.xml
index d4affa11eab0..28bdf80d6f5d 100644
--- a/dev-perl/HTML-TagFilter/metadata.xml
+++ b/dev-perl/HTML-TagFilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">HTML-TagFilter</remote-id>
                 <remote-id type="cpan-module">HTML::TagFilter</remote-id>
diff --git a/dev-perl/HTML-Tagset/metadata.xml b/dev-perl/HTML-Tagset/metadata.xml
index 15b13b959bff..c8603afe93fb 100644
--- a/dev-perl/HTML-Tagset/metadata.xml
+++ b/dev-perl/HTML-Tagset/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Tagset</remote-id>
     <remote-id type="cpan-module">HTML::Tagset</remote-id>
diff --git a/dev-perl/HTML-Template-Expr/metadata.xml b/dev-perl/HTML-Template-Expr/metadata.xml
index 71189b0bd4ac..9c2df49c0881 100644
--- a/dev-perl/HTML-Template-Expr/metadata.xml
+++ b/dev-perl/HTML-Template-Expr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Template-Expr</remote-id>
     <remote-id type="cpan-module">HTML::Template::Expr</remote-id>
diff --git a/dev-perl/HTML-Template-JIT/metadata.xml b/dev-perl/HTML-Template-JIT/metadata.xml
index 4fb8a25fbaff..fb14d2035402 100644
--- a/dev-perl/HTML-Template-JIT/metadata.xml
+++ b/dev-perl/HTML-Template-JIT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Template-JIT</remote-id>
     <remote-id type="cpan-module">HTML::Template::JIT</remote-id>
diff --git a/dev-perl/HTML-Template-Pro/metadata.xml b/dev-perl/HTML-Template-Pro/metadata.xml
index 8c81c090feab..e6a3cd0f6053 100644
--- a/dev-perl/HTML-Template-Pro/metadata.xml
+++ b/dev-perl/HTML-Template-Pro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">HTML-Template-Pro</remote-id>
         <remote-id type="cpan-module">HTML::Template::Pro</remote-id>
diff --git a/dev-perl/HTML-Template/metadata.xml b/dev-perl/HTML-Template/metadata.xml
index 8a393ba5c903..ea0dccb54867 100644
--- a/dev-perl/HTML-Template/metadata.xml
+++ b/dev-perl/HTML-Template/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Template</remote-id>
     <remote-id type="cpan-module">HTML::Template</remote-id>
diff --git a/dev-perl/HTML-TokeParser-Simple/metadata.xml b/dev-perl/HTML-TokeParser-Simple/metadata.xml
index c84bb59012fb..edd0943a376d 100644
--- a/dev-perl/HTML-TokeParser-Simple/metadata.xml
+++ b/dev-perl/HTML-TokeParser-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TokeParser-Simple</remote-id>
     <remote-id type="cpan-module">HTML::TokeParser::Simple</remote-id>
diff --git a/dev-perl/HTML-Tree/metadata.xml b/dev-perl/HTML-Tree/metadata.xml
index 34fba997f9a7..c84f64eaa74d 100644
--- a/dev-perl/HTML-Tree/metadata.xml
+++ b/dev-perl/HTML-Tree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-Tree</remote-id>
     <remote-id type="cpan-module">HTML::AsSubs</remote-id>
diff --git a/dev-perl/HTTP-Body/metadata.xml b/dev-perl/HTTP-Body/metadata.xml
index d0ddb33a9b23..4f1da8d71055 100644
--- a/dev-perl/HTTP-Body/metadata.xml
+++ b/dev-perl/HTTP-Body/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Body</remote-id>
     <remote-id type="cpan-module">HTTP::Body</remote-id>
diff --git a/dev-perl/HTTP-BrowserDetect/metadata.xml b/dev-perl/HTTP-BrowserDetect/metadata.xml
index b96430b2e350..84a9988628c8 100644
--- a/dev-perl/HTTP-BrowserDetect/metadata.xml
+++ b/dev-perl/HTTP-BrowserDetect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-BrowserDetect</remote-id>
     <remote-id type="cpan-module">HTTP::BrowserDetect</remote-id>
diff --git a/dev-perl/HTTP-Cache-Transparent/metadata.xml b/dev-perl/HTTP-Cache-Transparent/metadata.xml
index b9b90d19bef0..a038a9ff3a58 100644
--- a/dev-perl/HTTP-Cache-Transparent/metadata.xml
+++ b/dev-perl/HTTP-Cache-Transparent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Cache-Transparent</remote-id>
     <remote-id type="cpan-module">HTTP::Cache::Transparent</remote-id>
diff --git a/dev-perl/HTTP-Cookies/metadata.xml b/dev-perl/HTTP-Cookies/metadata.xml
index 5454d93d4da7..54ec6c104a8e 100644
--- a/dev-perl/HTTP-Cookies/metadata.xml
+++ b/dev-perl/HTTP-Cookies/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+	        <email>perl@gentoo.org</email>
+	        <name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 	        <remote-id type="cpan">HTTP-Cookies</remote-id>
 	        <remote-id type="cpan-module">HTTP::Cookies</remote-id>
diff --git a/dev-perl/HTTP-DAV/metadata.xml b/dev-perl/HTTP-DAV/metadata.xml
index be37eaf9d8a0..cda1df6a9224 100644
--- a/dev-perl/HTTP-DAV/metadata.xml
+++ b/dev-perl/HTTP-DAV/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-DAV</remote-id>
     <remote-id type="cpan-module">HTTP::DAV</remote-id>
diff --git a/dev-perl/HTTP-Daemon/metadata.xml b/dev-perl/HTTP-Daemon/metadata.xml
index 1a898955486c..fdf8b3d73702 100644
--- a/dev-perl/HTTP-Daemon/metadata.xml
+++ b/dev-perl/HTTP-Daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">HTTP-Daemon</remote-id>
 		<remote-id type="cpan-module">HTTP::Daemon</remote-id>
diff --git a/dev-perl/HTTP-Date/metadata.xml b/dev-perl/HTTP-Date/metadata.xml
index 07299304bb5a..02f210102624 100644
--- a/dev-perl/HTTP-Date/metadata.xml
+++ b/dev-perl/HTTP-Date/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">HTTP-Date</remote-id>
 		<remote-id type="cpan-module">HTTP::Date</remote-id>
diff --git a/dev-perl/HTTP-Headers-Fast/metadata.xml b/dev-perl/HTTP-Headers-Fast/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/HTTP-Headers-Fast/metadata.xml
+++ b/dev-perl/HTTP-Headers-Fast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Message/metadata.xml b/dev-perl/HTTP-Message/metadata.xml
index 98dd3178196c..33517c9f078b 100644
--- a/dev-perl/HTTP-Message/metadata.xml
+++ b/dev-perl/HTTP-Message/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">HTTP-Message</remote-id>
 		<remote-id type="cpan-module">HTTP::Config</remote-id>
diff --git a/dev-perl/HTTP-Negotiate/metadata.xml b/dev-perl/HTTP-Negotiate/metadata.xml
index 9ee008e66bb8..65104cf78a27 100644
--- a/dev-perl/HTTP-Negotiate/metadata.xml
+++ b/dev-perl/HTTP-Negotiate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">HTTP-Negotiate</remote-id>
 		<remote-id type="cpan-module">HTTP::Negotiate</remote-id>
diff --git a/dev-perl/HTTP-Response-Encoding/metadata.xml b/dev-perl/HTTP-Response-Encoding/metadata.xml
index cb9f7accb95f..409e0adb7d81 100644
--- a/dev-perl/HTTP-Response-Encoding/metadata.xml
+++ b/dev-perl/HTTP-Response-Encoding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Response-Encoding</remote-id>
     <remote-id type="cpan-module">HTTP::Response::Encoding</remote-id>
diff --git a/dev-perl/HTTP-Server-Simple-Mason/metadata.xml b/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
index 9f683c95c05d..4c0c781a770f 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
+++ b/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Server-Simple-Mason</remote-id>
     <remote-id type="cpan-module">HTTP::Server::Simple::Mason</remote-id>
diff --git a/dev-perl/HTTP-Server-Simple/metadata.xml b/dev-perl/HTTP-Server-Simple/metadata.xml
index 2d082f1b7b0e..979ca0fb3a19 100644
--- a/dev-perl/HTTP-Server-Simple/metadata.xml
+++ b/dev-perl/HTTP-Server-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Server-Simple</remote-id>
     <remote-id type="cpan-module">HTTP::Server::Simple</remote-id>
diff --git a/dev-perl/HTTPD-User-Manage/metadata.xml b/dev-perl/HTTPD-User-Manage/metadata.xml
index af8233a39c93..b78941be03af 100644
--- a/dev-perl/HTTPD-User-Manage/metadata.xml
+++ b/dev-perl/HTTPD-User-Manage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTPD-User-Manage</remote-id>
     <remote-id type="cpan-module">DBNull_File</remote-id>
diff --git a/dev-perl/Hash-Merge/metadata.xml b/dev-perl/Hash-Merge/metadata.xml
index 363b587020b4..84a61ade9f7d 100644
--- a/dev-perl/Hash-Merge/metadata.xml
+++ b/dev-perl/Hash-Merge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Hash-Merge</remote-id>
     <remote-id type="cpan-module">Hash::Merge</remote-id>
diff --git a/dev-perl/Hash-MoreUtils/metadata.xml b/dev-perl/Hash-MoreUtils/metadata.xml
index b002fd97a606..9764955203a3 100644
--- a/dev-perl/Hash-MoreUtils/metadata.xml
+++ b/dev-perl/Hash-MoreUtils/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Hash-MoreUtils</remote-id>
     <remote-id type="cpan-module">Hash::MoreUtils</remote-id>
diff --git a/dev-perl/Hash-MultiValue/metadata.xml b/dev-perl/Hash-MultiValue/metadata.xml
index acf2732aba52..7d59c65a24e8 100644
--- a/dev-perl/Hash-MultiValue/metadata.xml
+++ b/dev-perl/Hash-MultiValue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Hash-MultiValue</remote-id>
     <remote-id type="cpan-module">Hash::MultiValue</remote-id>
diff --git a/dev-perl/Hash-NoRef/metadata.xml b/dev-perl/Hash-NoRef/metadata.xml
index 8812b3d97168..23ab957fedf0 100644
--- a/dev-perl/Hash-NoRef/metadata.xml
+++ b/dev-perl/Hash-NoRef/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Hash-NoRef</remote-id>
     <remote-id type="cpan-module">Hash::NoRef</remote-id>
diff --git a/dev-perl/Heap/metadata.xml b/dev-perl/Heap/metadata.xml
index 4131b241f1b1..fa99ae531bc3 100644
--- a/dev-perl/Heap/metadata.xml
+++ b/dev-perl/Heap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Heap</remote-id>
     <remote-id type="cpan-module">Heap</remote-id>
diff --git a/dev-perl/Hook-LexWrap/metadata.xml b/dev-perl/Hook-LexWrap/metadata.xml
index 56e803c326d8..8d7d15bffe57 100644
--- a/dev-perl/Hook-LexWrap/metadata.xml
+++ b/dev-perl/Hook-LexWrap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Hook-LexWrap</remote-id>
     <remote-id type="cpan-module">Hook::LexWrap</remote-id>
diff --git a/dev-perl/IMAP-Admin/metadata.xml b/dev-perl/IMAP-Admin/metadata.xml
index 3fa78e222aee..f363a9e98f76 100644
--- a/dev-perl/IMAP-Admin/metadata.xml
+++ b/dev-perl/IMAP-Admin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IMAP-Admin</remote-id>
     <remote-id type="cpan-module">IMAP::Admin</remote-id>
diff --git a/dev-perl/IMAP-BodyStructure/metadata.xml b/dev-perl/IMAP-BodyStructure/metadata.xml
index c1760a463813..6352e5681ce6 100644
--- a/dev-perl/IMAP-BodyStructure/metadata.xml
+++ b/dev-perl/IMAP-BodyStructure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IMAP-BodyStructure</remote-id>
   </upstream>
diff --git a/dev-perl/IO-AIO/metadata.xml b/dev-perl/IO-AIO/metadata.xml
index 615578628634..2cf221e46302 100644
--- a/dev-perl/IO-AIO/metadata.xml
+++ b/dev-perl/IO-AIO/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-AIO</remote-id>
     <remote-id type="cpan-module">IO::AIO</remote-id>
diff --git a/dev-perl/IO-All/metadata.xml b/dev-perl/IO-All/metadata.xml
index 636f0c6fdb9a..3577fa3b8b1a 100644
--- a/dev-perl/IO-All/metadata.xml
+++ b/dev-perl/IO-All/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-All</remote-id>
     <remote-id type="cpan-module">IO::All</remote-id>
diff --git a/dev-perl/IO-BufferedSelect/metadata.xml b/dev-perl/IO-BufferedSelect/metadata.xml
index e69662c2c4f5..df65903b1abc 100644
--- a/dev-perl/IO-BufferedSelect/metadata.xml
+++ b/dev-perl/IO-BufferedSelect/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>atj@pulsewidth.org.uk</email>
     <name>Adam James</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-BufferedSelect</remote-id>
     <remote-id type="cpan-module">IO::BufferedSelect</remote-id>
diff --git a/dev-perl/IO-Capture/metadata.xml b/dev-perl/IO-Capture/metadata.xml
index dffced53c2be..77602dc6acd3 100644
--- a/dev-perl/IO-Capture/metadata.xml
+++ b/dev-perl/IO-Capture/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Capture</remote-id>
     <remote-id type="cpan-module">IO::Capture</remote-id>
diff --git a/dev-perl/IO-CaptureOutput/metadata.xml b/dev-perl/IO-CaptureOutput/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/IO-CaptureOutput/metadata.xml
+++ b/dev-perl/IO-CaptureOutput/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-Digest/metadata.xml b/dev-perl/IO-Digest/metadata.xml
index 52de4fee4822..874f477bf749 100644
--- a/dev-perl/IO-Digest/metadata.xml
+++ b/dev-perl/IO-Digest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Digest</remote-id>
     <remote-id type="cpan-module">IO::Digest</remote-id>
diff --git a/dev-perl/IO-Event/metadata.xml b/dev-perl/IO-Event/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/IO-Event/metadata.xml
+++ b/dev-perl/IO-Event/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-HTML/metadata.xml b/dev-perl/IO-HTML/metadata.xml
index 6b3bc49a4eee..3804615b648c 100644
--- a/dev-perl/IO-HTML/metadata.xml
+++ b/dev-perl/IO-HTML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">IO-HTML</remote-id>
 		<remote-id type="cpan-module">IO::HTML</remote-id>
diff --git a/dev-perl/IO-Interactive/metadata.xml b/dev-perl/IO-Interactive/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/IO-Interactive/metadata.xml
+++ b/dev-perl/IO-Interactive/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-Interface/metadata.xml b/dev-perl/IO-Interface/metadata.xml
index 28edd64995e5..fe0eb02d1953 100644
--- a/dev-perl/IO-Interface/metadata.xml
+++ b/dev-perl/IO-Interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Interface</remote-id>
     <remote-id type="cpan-module">IO::Interface</remote-id>
diff --git a/dev-perl/IO-LockedFile/metadata.xml b/dev-perl/IO-LockedFile/metadata.xml
index 8445f31194fe..74dddee72455 100644
--- a/dev-perl/IO-LockedFile/metadata.xml
+++ b/dev-perl/IO-LockedFile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-LockedFile</remote-id>
     <remote-id type="cpan-module">IO::LockedFile</remote-id>
diff --git a/dev-perl/IO-Multiplex/metadata.xml b/dev-perl/IO-Multiplex/metadata.xml
index 973979842116..87953755aea3 100644
--- a/dev-perl/IO-Multiplex/metadata.xml
+++ b/dev-perl/IO-Multiplex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Multiplex</remote-id>
     <remote-id type="cpan-module">IO::Multiplex</remote-id>
diff --git a/dev-perl/IO-Pager/metadata.xml b/dev-perl/IO-Pager/metadata.xml
index 6af72af582a0..2e8804fc75de 100644
--- a/dev-perl/IO-Pager/metadata.xml
+++ b/dev-perl/IO-Pager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Pager</remote-id>
     <remote-id type="cpan-module">IO::Pager</remote-id>
diff --git a/dev-perl/IO-Pipely/metadata.xml b/dev-perl/IO-Pipely/metadata.xml
index 6e0164141fc3..6d186ad1165e 100644
--- a/dev-perl/IO-Pipely/metadata.xml
+++ b/dev-perl/IO-Pipely/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Pipely</remote-id>
   </upstream>
diff --git a/dev-perl/IO-Prompt/metadata.xml b/dev-perl/IO-Prompt/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/IO-Prompt/metadata.xml
+++ b/dev-perl/IO-Prompt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-SessionData/metadata.xml b/dev-perl/IO-SessionData/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/IO-SessionData/metadata.xml
+++ b/dev-perl/IO-SessionData/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-Socket-INET6/metadata.xml b/dev-perl/IO-Socket-INET6/metadata.xml
index ae8ab76845fc..9849836b3009 100644
--- a/dev-perl/IO-Socket-INET6/metadata.xml
+++ b/dev-perl/IO-Socket-INET6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Socket-INET6</remote-id>
     <remote-id type="cpan-module">IO::Socket::INET6</remote-id>
diff --git a/dev-perl/IO-Socket-SSL/metadata.xml b/dev-perl/IO-Socket-SSL/metadata.xml
index 16424a949b4b..1e8beeef07f5 100644
--- a/dev-perl/IO-Socket-SSL/metadata.xml
+++ b/dev-perl/IO-Socket-SSL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Socket-SSL</remote-id>
     <remote-id type="cpan-module">IO::Socket::SSL</remote-id>
diff --git a/dev-perl/IO-Socket-Timeout/metadata.xml b/dev-perl/IO-Socket-Timeout/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/IO-Socket-Timeout/metadata.xml
+++ b/dev-perl/IO-Socket-Timeout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/IO-String/metadata.xml b/dev-perl/IO-String/metadata.xml
index e6aec16673c8..9e22aa3f59b4 100644
--- a/dev-perl/IO-String/metadata.xml
+++ b/dev-perl/IO-String/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-String</remote-id>
     <remote-id type="cpan-module">IO::String</remote-id>
diff --git a/dev-perl/IO-Stty/metadata.xml b/dev-perl/IO-Stty/metadata.xml
index 084cd01a252b..e3a2545e2b54 100644
--- a/dev-perl/IO-Stty/metadata.xml
+++ b/dev-perl/IO-Stty/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>kentfredric@gmail.com</email>
 		<name>Kent Fredric</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">IO-Stty</remote-id>
 		<remote-id type="cpan-module">IO::Stty</remote-id>
diff --git a/dev-perl/IO-Tee/metadata.xml b/dev-perl/IO-Tee/metadata.xml
index 3ee0b11b78b5..b4931b42dc35 100644
--- a/dev-perl/IO-Tee/metadata.xml
+++ b/dev-perl/IO-Tee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Tee</remote-id>
     <remote-id type="cpan-module">IO::Tee</remote-id>
diff --git a/dev-perl/IO-Tty/metadata.xml b/dev-perl/IO-Tty/metadata.xml
index 80b8a7073f6a..e792befa83ec 100644
--- a/dev-perl/IO-Tty/metadata.xml
+++ b/dev-perl/IO-Tty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Tty</remote-id>
     <remote-id type="cpan-module">IO::Pty</remote-id>
diff --git a/dev-perl/IO-Util/metadata.xml b/dev-perl/IO-Util/metadata.xml
index cf5e75a9da8b..03e73a2292e9 100644
--- a/dev-perl/IO-Util/metadata.xml
+++ b/dev-perl/IO-Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Util</remote-id>
     <remote-id type="cpan-module">IO::Util</remote-id>
diff --git a/dev-perl/IO-stringy/metadata.xml b/dev-perl/IO-stringy/metadata.xml
index 113a1e38dd06..f141cb59f569 100644
--- a/dev-perl/IO-stringy/metadata.xml
+++ b/dev-perl/IO-stringy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-stringy</remote-id>
     <remote-id type="cpan-module">IO::AtomicFile</remote-id>
diff --git a/dev-perl/IP-Anonymous/metadata.xml b/dev-perl/IP-Anonymous/metadata.xml
index 19228b8aa97e..326053e7d7fa 100644
--- a/dev-perl/IP-Anonymous/metadata.xml
+++ b/dev-perl/IP-Anonymous/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IP-Anonymous</remote-id>
     <remote-id type="cpan-module">IP::Anonymous</remote-id>
diff --git a/dev-perl/IPC-Run/metadata.xml b/dev-perl/IPC-Run/metadata.xml
index 02ff1de6dae0..f97a986b5159 100644
--- a/dev-perl/IPC-Run/metadata.xml
+++ b/dev-perl/IPC-Run/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IPC-Run</remote-id>
     <remote-id type="cpan-module">IPC::Run</remote-id>
diff --git a/dev-perl/IPC-Run3/metadata.xml b/dev-perl/IPC-Run3/metadata.xml
index c7951d47146a..388d4d8bdf84 100644
--- a/dev-perl/IPC-Run3/metadata.xml
+++ b/dev-perl/IPC-Run3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IPC-Run3</remote-id>
     <remote-id type="cpan-module">IPC::Run3</remote-id>
diff --git a/dev-perl/IPC-ShareLite/metadata.xml b/dev-perl/IPC-ShareLite/metadata.xml
index c4b787ffd8d7..23d04b9edc74 100644
--- a/dev-perl/IPC-ShareLite/metadata.xml
+++ b/dev-perl/IPC-ShareLite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IPC-ShareLite</remote-id>
     <remote-id type="cpan-module">IPC::ShareLite</remote-id>
diff --git a/dev-perl/IPC-Shareable/metadata.xml b/dev-perl/IPC-Shareable/metadata.xml
index ab14d96293da..8fe5329afb39 100644
--- a/dev-perl/IPC-Shareable/metadata.xml
+++ b/dev-perl/IPC-Shareable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IPC-Shareable</remote-id>
     <remote-id type="cpan-module">IPC::Shareable</remote-id>
diff --git a/dev-perl/IPC-Signal/metadata.xml b/dev-perl/IPC-Signal/metadata.xml
index c90699255c46..709f2b17d1c5 100644
--- a/dev-perl/IPC-Signal/metadata.xml
+++ b/dev-perl/IPC-Signal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IPC-Signal</remote-id>
     <remote-id type="cpan-module">IPC::Signal</remote-id>
diff --git a/dev-perl/IPC-System-Simple/metadata.xml b/dev-perl/IPC-System-Simple/metadata.xml
index 4f1c19de0522..32d15fd63351 100644
--- a/dev-perl/IPC-System-Simple/metadata.xml
+++ b/dev-perl/IPC-System-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">IPC-System-Simple</remote-id>
 		<remote-id type="cpan-module">IPC::System::Simple</remote-id>
diff --git a/dev-perl/IPTables-libiptc/metadata.xml b/dev-perl/IPTables-libiptc/metadata.xml
index cf1696c6fcb3..46c81d0106ed 100644
--- a/dev-perl/IPTables-libiptc/metadata.xml
+++ b/dev-perl/IPTables-libiptc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">IPTables-libiptc</remote-id>
 		<remote-id type="cpan-module">IPTables::libiptc</remote-id>
diff --git a/dev-perl/Ima-DBI/metadata.xml b/dev-perl/Ima-DBI/metadata.xml
index 1a9ccb8d2644..d530862ecc96 100644
--- a/dev-perl/Ima-DBI/metadata.xml
+++ b/dev-perl/Ima-DBI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Ima-DBI</remote-id>
     <remote-id type="cpan-module">Ima::DBI</remote-id>
diff --git a/dev-perl/Image-Imlib2/metadata.xml b/dev-perl/Image-Imlib2/metadata.xml
index 786690e41994..be6e2c7fba35 100644
--- a/dev-perl/Image-Imlib2/metadata.xml
+++ b/dev-perl/Image-Imlib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Image-Imlib2</remote-id>
     <remote-id type="cpan-module">Image::Imlib2</remote-id>
diff --git a/dev-perl/Image-Scale/metadata.xml b/dev-perl/Image-Scale/metadata.xml
index 71d60d822491..bbbb66c77b39 100644
--- a/dev-perl/Image-Scale/metadata.xml
+++ b/dev-perl/Image-Scale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Image-Scale</remote-id>
     <remote-id type="cpan-module">Image::Scale</remote-id>
diff --git a/dev-perl/ImageInfo/metadata.xml b/dev-perl/ImageInfo/metadata.xml
index 7cca0cb9b92a..6d624e46ccbd 100644
--- a/dev-perl/ImageInfo/metadata.xml
+++ b/dev-perl/ImageInfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Image-Info</remote-id>
     <remote-id type="cpan-module">Bundle::Image::Info::Everything</remote-id>
diff --git a/dev-perl/ImageSize/metadata.xml b/dev-perl/ImageSize/metadata.xml
index 804238efada6..92cf5fb2a7c5 100644
--- a/dev-perl/ImageSize/metadata.xml
+++ b/dev-perl/ImageSize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Image-Size</remote-id>
     <remote-id type="cpan-module">Image::Size</remote-id>
diff --git a/dev-perl/Import-Into/metadata.xml b/dev-perl/Import-Into/metadata.xml
index d2c6befede24..a12cd0815a6f 100644
--- a/dev-perl/Import-Into/metadata.xml
+++ b/dev-perl/Import-Into/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Import-Into</remote-id>
 		<remote-id type="cpan-module">Import::Into</remote-id>
diff --git a/dev-perl/Inline-C/metadata.xml b/dev-perl/Inline-C/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Inline-C/metadata.xml
+++ b/dev-perl/Inline-C/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Inline-Files/metadata.xml b/dev-perl/Inline-Files/metadata.xml
index 777e752e0090..21f5fc7ab4f3 100644
--- a/dev-perl/Inline-Files/metadata.xml
+++ b/dev-perl/Inline-Files/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Inline-Files</remote-id>
     <remote-id type="cpan-module">Inline::Files</remote-id>
diff --git a/dev-perl/Inline-Python/metadata.xml b/dev-perl/Inline-Python/metadata.xml
index 4c1f6a4f464c..30d0279c7d09 100644
--- a/dev-perl/Inline-Python/metadata.xml
+++ b/dev-perl/Inline-Python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Inline-Python</remote-id>
     <remote-id type="cpan-module">Inline::Python</remote-id>
diff --git a/dev-perl/Inline/metadata.xml b/dev-perl/Inline/metadata.xml
index 488b00aecebf..459e9f9fe125 100644
--- a/dev-perl/Inline/metadata.xml
+++ b/dev-perl/Inline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Inline</remote-id>
     <remote-id type="cpan-module">Foo::Tester</remote-id>
diff --git a/dev-perl/JSON-Any/metadata.xml b/dev-perl/JSON-Any/metadata.xml
index c862b07fe787..d693dbf3ad8e 100644
--- a/dev-perl/JSON-Any/metadata.xml
+++ b/dev-perl/JSON-Any/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JSON-Any</remote-id>
     <remote-id type="cpan-module">JSON::Any</remote-id>
diff --git a/dev-perl/JSON-MaybeXS/metadata.xml b/dev-perl/JSON-MaybeXS/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/JSON-MaybeXS/metadata.xml
+++ b/dev-perl/JSON-MaybeXS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/JSON-RPC/metadata.xml b/dev-perl/JSON-RPC/metadata.xml
index f98b8b111dfe..5cc645dabb61 100644
--- a/dev-perl/JSON-RPC/metadata.xml
+++ b/dev-perl/JSON-RPC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JSON-RPC</remote-id>
     <remote-id type="cpan-module">JSON::RPC</remote-id>
diff --git a/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml b/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
index 3d7903ae57fd..7f647de3161b 100644
--- a/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
+++ b/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JSON-XS-VersionOneAndTwo</remote-id>
     <remote-id type="cpan-module">JSON::XS::VersionOneAndTwo</remote-id>
diff --git a/dev-perl/JSON-XS/metadata.xml b/dev-perl/JSON-XS/metadata.xml
index ccf3411c6cfb..619568e4f0d5 100644
--- a/dev-perl/JSON-XS/metadata.xml
+++ b/dev-perl/JSON-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JSON-XS</remote-id>
     <remote-id type="cpan-module">JSON::XS</remote-id>
diff --git a/dev-perl/JSON/metadata.xml b/dev-perl/JSON/metadata.xml
index 71f7c40c070b..fcf4b82e6f7d 100644
--- a/dev-perl/JSON/metadata.xml
+++ b/dev-perl/JSON/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>hd_brummy@gentoo.org</email>
     <name>Joerg Bornkessel</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JSON</remote-id>
     <remote-id type="cpan-module">JSON</remote-id>
diff --git a/dev-perl/JavaScript-Minifier/metadata.xml b/dev-perl/JavaScript-Minifier/metadata.xml
index 5e64ef090b6a..da72ecfd4c16 100644
--- a/dev-perl/JavaScript-Minifier/metadata.xml
+++ b/dev-perl/JavaScript-Minifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JavaScript-Minifier</remote-id>
     <remote-id type="cpan-module">JavaScript::Minifier</remote-id>
diff --git a/dev-perl/JavaScript-Packer/metadata.xml b/dev-perl/JavaScript-Packer/metadata.xml
index ad2c6dd3face..c1eecab68d28 100644
--- a/dev-perl/JavaScript-Packer/metadata.xml
+++ b/dev-perl/JavaScript-Packer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">JavaScript-Packer</remote-id>
                 <remote-id type="cpan-module">JavaScript::Packer</remote-id>
diff --git a/dev-perl/JavaScript-SpiderMonkey/metadata.xml b/dev-perl/JavaScript-SpiderMonkey/metadata.xml
index be3cb2564a92..a426679249eb 100644
--- a/dev-perl/JavaScript-SpiderMonkey/metadata.xml
+++ b/dev-perl/JavaScript-SpiderMonkey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">JavaScript-SpiderMonkey</remote-id>
     <remote-id type="cpan-module">JavaScript::SpiderMonkey</remote-id>
diff --git a/dev-perl/Jcode/metadata.xml b/dev-perl/Jcode/metadata.xml
index 2f6e8e8a58fa..1cf3e556695c 100644
--- a/dev-perl/Jcode/metadata.xml
+++ b/dev-perl/Jcode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Jcode</remote-id>
     <remote-id type="cpan-module">Jcode</remote-id>
diff --git a/dev-perl/LWP-Authen-Wsse/metadata.xml b/dev-perl/LWP-Authen-Wsse/metadata.xml
index b4e34d0fb885..316511a3e114 100644
--- a/dev-perl/LWP-Authen-Wsse/metadata.xml
+++ b/dev-perl/LWP-Authen-Wsse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">LWP-Authen-Wsse</remote-id>
     <remote-id type="cpan-module">LWP::Authen::Wsse</remote-id>
diff --git a/dev-perl/LWP-MediaTypes/metadata.xml b/dev-perl/LWP-MediaTypes/metadata.xml
index 6518d8c41521..c3476a093589 100644
--- a/dev-perl/LWP-MediaTypes/metadata.xml
+++ b/dev-perl/LWP-MediaTypes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">LWP-MediaTypes</remote-id>
 		<remote-id type="cpan-module">LWP::MediaTypes</remote-id>
diff --git a/dev-perl/LWP-Protocol-https/metadata.xml b/dev-perl/LWP-Protocol-https/metadata.xml
index 4a0ec0000a27..66c56feaa7d2 100644
--- a/dev-perl/LWP-Protocol-https/metadata.xml
+++ b/dev-perl/LWP-Protocol-https/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">LWP-Protocol-https</remote-id>
 		<remote-id type="cpan-module">LWP::Protocol::https</remote-id>
diff --git a/dev-perl/LWP-UserAgent-Cached/metadata.xml b/dev-perl/LWP-UserAgent-Cached/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/LWP-UserAgent-Cached/metadata.xml
+++ b/dev-perl/LWP-UserAgent-Cached/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/LWP-UserAgent-Determined/metadata.xml b/dev-perl/LWP-UserAgent-Determined/metadata.xml
index cc7679008756..9f90184e092b 100644
--- a/dev-perl/LWP-UserAgent-Determined/metadata.xml
+++ b/dev-perl/LWP-UserAgent-Determined/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">LWP-UserAgent-Determined</remote-id>
     <remote-id type="cpan-module">LWP::UserAgent::Determined</remote-id>
diff --git a/dev-perl/LWPx-ParanoidAgent/metadata.xml b/dev-perl/LWPx-ParanoidAgent/metadata.xml
index d0311261bade..4d136232f157 100644
--- a/dev-perl/LWPx-ParanoidAgent/metadata.xml
+++ b/dev-perl/LWPx-ParanoidAgent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">LWPx-ParanoidAgent</remote-id>
     <remote-id type="cpan-module">LWPx::ParanoidAgent</remote-id>
diff --git a/dev-perl/LaTeX-Driver/metadata.xml b/dev-perl/LaTeX-Driver/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/LaTeX-Driver/metadata.xml
+++ b/dev-perl/LaTeX-Driver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/LaTeX-Encode/metadata.xml b/dev-perl/LaTeX-Encode/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/LaTeX-Encode/metadata.xml
+++ b/dev-perl/LaTeX-Encode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/LaTeX-Table/metadata.xml b/dev-perl/LaTeX-Table/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/LaTeX-Table/metadata.xml
+++ b/dev-perl/LaTeX-Table/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Lab-Measurement/metadata.xml b/dev-perl/Lab-Measurement/metadata.xml
index bcca721b1d9a..7901deac6518 100644
--- a/dev-perl/Lab-Measurement/metadata.xml
+++ b/dev-perl/Lab-Measurement/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+        <maintainer>
+                <email>sci@gentoo.org</email>
+                <name>Gentoo Science Project</name>
+        </maintainer>
         <use>
                 <flag name="xpression">Install the Xpression measurement framework</flag>
 	</use>
diff --git a/dev-perl/Lchown/metadata.xml b/dev-perl/Lchown/metadata.xml
index baa79e2a8697..2cbd979c9ab6 100644
--- a/dev-perl/Lchown/metadata.xml
+++ b/dev-perl/Lchown/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
   <remote-id type="cpan">Lchown</remote-id>
   <remote-id type="cpan-module">Lchown</remote-id>
diff --git a/dev-perl/Lexical-Persistence/metadata.xml b/dev-perl/Lexical-Persistence/metadata.xml
index a9f7df02dd98..230ed5a91411 100644
--- a/dev-perl/Lexical-Persistence/metadata.xml
+++ b/dev-perl/Lexical-Persistence/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lexical-Persistence</remote-id>
     <remote-id type="cpan-module">Lexical::Persistence</remote-id>
diff --git a/dev-perl/Lexical-SealRequireHints/metadata.xml b/dev-perl/Lexical-SealRequireHints/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Lexical-SealRequireHints/metadata.xml
+++ b/dev-perl/Lexical-SealRequireHints/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-EN-Inflect/metadata.xml b/dev-perl/Lingua-EN-Inflect/metadata.xml
index 194460dbe836..b43e3d8c81de 100644
--- a/dev-perl/Lingua-EN-Inflect/metadata.xml
+++ b/dev-perl/Lingua-EN-Inflect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-EN-Inflect</remote-id>
     <remote-id type="cpan-module">Lingua::EN::Inflect</remote-id>
diff --git a/dev-perl/Lingua-EN-NameCase/metadata.xml b/dev-perl/Lingua-EN-NameCase/metadata.xml
index 4e2d04fee77a..2ac1cfa9392a 100644
--- a/dev-perl/Lingua-EN-NameCase/metadata.xml
+++ b/dev-perl/Lingua-EN-NameCase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-EN-NameCase</remote-id>
   </upstream>
diff --git a/dev-perl/Lingua-EN-NameParse/metadata.xml b/dev-perl/Lingua-EN-NameParse/metadata.xml
index ebdbbf806355..b0c6a8a2c59a 100644
--- a/dev-perl/Lingua-EN-NameParse/metadata.xml
+++ b/dev-perl/Lingua-EN-NameParse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-EN-NameParse</remote-id>
     <remote-id type="cpan-module">Lingua::EN::NameParse</remote-id>
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml b/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
index 9f6e0c5e951f..298b05dc1b28 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-EN-Numbers-Ordinate</remote-id>
     <remote-id type="cpan-module">Lingua::EN::Numbers::Ordinate</remote-id>
diff --git a/dev-perl/Lingua-PT-Stemmer/metadata.xml b/dev-perl/Lingua-PT-Stemmer/metadata.xml
index d199b0249fab..3fede3971a98 100644
--- a/dev-perl/Lingua-PT-Stemmer/metadata.xml
+++ b/dev-perl/Lingua-PT-Stemmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-PT-Stemmer</remote-id>
     <remote-id type="cpan-module">Lingua::GL::Stemmer</remote-id>
diff --git a/dev-perl/Lingua-Preferred/metadata.xml b/dev-perl/Lingua-Preferred/metadata.xml
index 1f928ebcb118..249f2fa07939 100644
--- a/dev-perl/Lingua-Preferred/metadata.xml
+++ b/dev-perl/Lingua-Preferred/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Preferred</remote-id>
     <remote-id type="cpan-module">Lingua::Preferred</remote-id>
diff --git a/dev-perl/Lingua-Stem-Fr/metadata.xml b/dev-perl/Lingua-Stem-Fr/metadata.xml
index 63cbbcbb5237..8b3334b3366e 100644
--- a/dev-perl/Lingua-Stem-Fr/metadata.xml
+++ b/dev-perl/Lingua-Stem-Fr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Fr</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::Fr</remote-id>
diff --git a/dev-perl/Lingua-Stem-It/metadata.xml b/dev-perl/Lingua-Stem-It/metadata.xml
index 8c1897933ef5..5fdca9332b0c 100644
--- a/dev-perl/Lingua-Stem-It/metadata.xml
+++ b/dev-perl/Lingua-Stem-It/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-It</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::It</remote-id>
diff --git a/dev-perl/Lingua-Stem-Ru/metadata.xml b/dev-perl/Lingua-Stem-Ru/metadata.xml
index 20ec1f5c54bc..ec4f88f5041a 100644
--- a/dev-perl/Lingua-Stem-Ru/metadata.xml
+++ b/dev-perl/Lingua-Stem-Ru/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Ru</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::Ru</remote-id>
diff --git a/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml b/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
index 44e1b2c129cc..3fc5edf52152 100644
--- a/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
+++ b/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Snowball-Da</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::Snowball::Da</remote-id>
diff --git a/dev-perl/Lingua-Stem/metadata.xml b/dev-perl/Lingua-Stem/metadata.xml
index e1e070b2c0e9..7a6f2a6eaef2 100644
--- a/dev-perl/Lingua-Stem/metadata.xml
+++ b/dev-perl/Lingua-Stem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lingua-Stem</remote-id>
     <remote-id type="cpan-module">Lingua::Stem</remote-id>
diff --git a/dev-perl/Linux-DesktopFiles/metadata.xml b/dev-perl/Linux-DesktopFiles/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Linux-DesktopFiles/metadata.xml
+++ b/dev-perl/Linux-DesktopFiles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Linux-Inotify2/metadata.xml b/dev-perl/Linux-Inotify2/metadata.xml
index 5453c8b55cac..92b4de115894 100644
--- a/dev-perl/Linux-Inotify2/metadata.xml
+++ b/dev-perl/Linux-Inotify2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>hd_brummy@gentoo.org</email>
     <name>Joerg Bornkessel</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Linux-Inotify2</remote-id>
     <remote-id type="cpan-module">Linux::Inotify2</remote-id>
diff --git a/dev-perl/Linux-Pid/metadata.xml b/dev-perl/Linux-Pid/metadata.xml
index dadb58b767ca..8fc6c68a3272 100644
--- a/dev-perl/Linux-Pid/metadata.xml
+++ b/dev-perl/Linux-Pid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Linux-Pid</remote-id>
 		<remote-id type="cpan-module">Linux::Pid</remote-id>
diff --git a/dev-perl/Linux-Smaps/metadata.xml b/dev-perl/Linux-Smaps/metadata.xml
index 02bc427e1f72..00199a02a999 100644
--- a/dev-perl/Linux-Smaps/metadata.xml
+++ b/dev-perl/Linux-Smaps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Linux-Smaps</remote-id>
     <remote-id type="cpan-module">Linux::Smaps</remote-id>
diff --git a/dev-perl/Lirc-Client/metadata.xml b/dev-perl/Lirc-Client/metadata.xml
index 70df497571b3..e8f9cf4cdfb1 100644
--- a/dev-perl/Lirc-Client/metadata.xml
+++ b/dev-perl/Lirc-Client/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Lirc-Client</remote-id>
     <remote-id type="cpan-module">Lirc::Client</remote-id>
diff --git a/dev-perl/List-AllUtils/metadata.xml b/dev-perl/List-AllUtils/metadata.xml
index b2adbd6c1080..6d2bfadc536c 100644
--- a/dev-perl/List-AllUtils/metadata.xml
+++ b/dev-perl/List-AllUtils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">List-AllUtils</remote-id>
     <remote-id type="cpan-module">List::AllUtils</remote-id>
diff --git a/dev-perl/List-MoreUtils/metadata.xml b/dev-perl/List-MoreUtils/metadata.xml
index 39ba20d2822d..5e9c5178fb05 100644
--- a/dev-perl/List-MoreUtils/metadata.xml
+++ b/dev-perl/List-MoreUtils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">List-MoreUtils</remote-id>
     <remote-id type="cpan-module">List::MoreUtils</remote-id>
diff --git a/dev-perl/List-UtilsBy/metadata.xml b/dev-perl/List-UtilsBy/metadata.xml
index 8addc1399668..f8b9db014bdb 100644
--- a/dev-perl/List-UtilsBy/metadata.xml
+++ b/dev-perl/List-UtilsBy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">List-UtilsBy</remote-id>
     <remote-id type="cpan-module">List::UtilsBy</remote-id>
diff --git a/dev-perl/Locale-Maketext-Lexicon/metadata.xml b/dev-perl/Locale-Maketext-Lexicon/metadata.xml
index 38ff2abf3d23..432d773e6b62 100644
--- a/dev-perl/Locale-Maketext-Lexicon/metadata.xml
+++ b/dev-perl/Locale-Maketext-Lexicon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Lexicon</remote-id>
     <remote-id type="cpan-module">Locale::Maketext::Extract</remote-id>
diff --git a/dev-perl/Locale-Msgfmt/metadata.xml b/dev-perl/Locale-Msgfmt/metadata.xml
index 9ba58c5c0a6b..c369a82a9519 100644
--- a/dev-perl/Locale-Msgfmt/metadata.xml
+++ b/dev-perl/Locale-Msgfmt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Locale-Msgfmt</remote-id>
     <remote-id type="cpan-module">Locale::Msgfmt</remote-id>
diff --git a/dev-perl/Locale-PO/metadata.xml b/dev-perl/Locale-PO/metadata.xml
index 3feab6eb09b1..48159ffd4d08 100644
--- a/dev-perl/Locale-PO/metadata.xml
+++ b/dev-perl/Locale-PO/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Locale-PO</remote-id>
     <remote-id type="cpan-module">Locale::PO</remote-id>
diff --git a/dev-perl/Locale-gettext/metadata.xml b/dev-perl/Locale-gettext/metadata.xml
index e7805924ec21..df978b0188bc 100644
--- a/dev-perl/Locale-gettext/metadata.xml
+++ b/dev-perl/Locale-gettext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">gettext</remote-id>
     <remote-id type="cpan-module">Locale::gettext</remote-id>
diff --git a/dev-perl/LockFile-Simple/metadata.xml b/dev-perl/LockFile-Simple/metadata.xml
index 1f2c628628e6..1e7cca90adaf 100644
--- a/dev-perl/LockFile-Simple/metadata.xml
+++ b/dev-perl/LockFile-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">LockFile-Simple</remote-id>
     <remote-id type="cpan-module">LockFile::Lock</remote-id>
diff --git a/dev-perl/Log-Agent/metadata.xml b/dev-perl/Log-Agent/metadata.xml
index b25bc1c41203..32b9e9badb3d 100644
--- a/dev-perl/Log-Agent/metadata.xml
+++ b/dev-perl/Log-Agent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Log-Agent</remote-id>
     <remote-id type="cpan-module">Log::Agent</remote-id>
diff --git a/dev-perl/Log-Any/metadata.xml b/dev-perl/Log-Any/metadata.xml
index 148f76af9b29..b99e94988182 100644
--- a/dev-perl/Log-Any/metadata.xml
+++ b/dev-perl/Log-Any/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Log-Any</remote-id>
     <remote-id type="cpan-module">Log::Any</remote-id>
diff --git a/dev-perl/Log-Dispatch/metadata.xml b/dev-perl/Log-Dispatch/metadata.xml
index fccca803fe89..bc5b6ed3fd0e 100644
--- a/dev-perl/Log-Dispatch/metadata.xml
+++ b/dev-perl/Log-Dispatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Log-Dispatch</remote-id>
     <remote-id type="cpan-module">Log::Dispatch</remote-id>
diff --git a/dev-perl/Log-Log4perl/metadata.xml b/dev-perl/Log-Log4perl/metadata.xml
index 9fbb56f1d3f1..2bf230640389 100644
--- a/dev-perl/Log-Log4perl/metadata.xml
+++ b/dev-perl/Log-Log4perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Log-Log4perl</remote-id>
     <remote-id type="cpan-module">Log::Log4perl</remote-id>
diff --git a/dev-perl/Log-TraceMessages/metadata.xml b/dev-perl/Log-TraceMessages/metadata.xml
index e15ce2291240..8512f8616df8 100644
--- a/dev-perl/Log-TraceMessages/metadata.xml
+++ b/dev-perl/Log-TraceMessages/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Log-TraceMessages</remote-id>
     <remote-id type="cpan-module">Log::TraceMessages</remote-id>
diff --git a/dev-perl/MARC-Charset/metadata.xml b/dev-perl/MARC-Charset/metadata.xml
index 7cf1686f99d5..298796241a37 100644
--- a/dev-perl/MARC-Charset/metadata.xml
+++ b/dev-perl/MARC-Charset/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-Charset</remote-id>
     <remote-id type="cpan-module">MARC::Charset</remote-id>
diff --git a/dev-perl/MARC-Record/metadata.xml b/dev-perl/MARC-Record/metadata.xml
index f9a22d58ee2d..3834b2651f45 100644
--- a/dev-perl/MARC-Record/metadata.xml
+++ b/dev-perl/MARC-Record/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-Record</remote-id>
     <remote-id type="cpan-module">MARC::Batch</remote-id>
diff --git a/dev-perl/MARC-XML/metadata.xml b/dev-perl/MARC-XML/metadata.xml
index cbfec5f7e6be..916ec9ed730a 100644
--- a/dev-perl/MARC-XML/metadata.xml
+++ b/dev-perl/MARC-XML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-XML</remote-id>
     <remote-id type="cpan-module">MARC::File::SAX</remote-id>
diff --git a/dev-perl/MD5/metadata.xml b/dev-perl/MD5/metadata.xml
index e1ac3b6f2c0d..adaa110e3bd7 100644
--- a/dev-perl/MD5/metadata.xml
+++ b/dev-perl/MD5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MD5</remote-id>
     <remote-id type="cpan-module">MD5</remote-id>
diff --git a/dev-perl/MIME-Base32/metadata.xml b/dev-perl/MIME-Base32/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/MIME-Base32/metadata.xml
+++ b/dev-perl/MIME-Base32/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/MIME-Charset/metadata.xml b/dev-perl/MIME-Charset/metadata.xml
index 87eec2242476..7ac375e87766 100644
--- a/dev-perl/MIME-Charset/metadata.xml
+++ b/dev-perl/MIME-Charset/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MIME-Charset</remote-id>
     <remote-id type="cpan-module">MIME::Charset</remote-id>
diff --git a/dev-perl/MIME-EncWords/metadata.xml b/dev-perl/MIME-EncWords/metadata.xml
index cf46ca88badd..cd3f4bbc0a07 100644
--- a/dev-perl/MIME-EncWords/metadata.xml
+++ b/dev-perl/MIME-EncWords/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MIME-EncWords</remote-id>
     <remote-id type="cpan-module">Encode::MIME::EncWords</remote-id>
diff --git a/dev-perl/MIME-Lite/metadata.xml b/dev-perl/MIME-Lite/metadata.xml
index ef99fcc4d303..1f18457d054e 100644
--- a/dev-perl/MIME-Lite/metadata.xml
+++ b/dev-perl/MIME-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MIME-Lite</remote-id>
 		<remote-id type="cpan-module">MIME::Lite</remote-id>
diff --git a/dev-perl/MIME-Types/metadata.xml b/dev-perl/MIME-Types/metadata.xml
index ce25a1212f95..f7792985a21d 100644
--- a/dev-perl/MIME-Types/metadata.xml
+++ b/dev-perl/MIME-Types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MIME-Types</remote-id>
 		<remote-id type="cpan-module">MIME::Type</remote-id>
diff --git a/dev-perl/MIME-tools/metadata.xml b/dev-perl/MIME-tools/metadata.xml
index ca4ac1b996cd..d2578f2f7478 100644
--- a/dev-perl/MIME-tools/metadata.xml
+++ b/dev-perl/MIME-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MIME-tools</remote-id>
 		<remote-id type="cpan-module">MIME::Body</remote-id>
diff --git a/dev-perl/MLDBM-Sync/metadata.xml b/dev-perl/MLDBM-Sync/metadata.xml
index aa143c670e37..17aa4bf5bde3 100644
--- a/dev-perl/MLDBM-Sync/metadata.xml
+++ b/dev-perl/MLDBM-Sync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MLDBM-Sync</remote-id>
     <remote-id type="cpan-module">MLDBM::Sync</remote-id>
diff --git a/dev-perl/MLDBM/metadata.xml b/dev-perl/MLDBM/metadata.xml
index 49f082315ffc..72448fac952c 100644
--- a/dev-perl/MLDBM/metadata.xml
+++ b/dev-perl/MLDBM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MLDBM</remote-id>
     <remote-id type="cpan-module">MLDBM</remote-id>
diff --git a/dev-perl/MP3-Info/metadata.xml b/dev-perl/MP3-Info/metadata.xml
index 81c5914d95b0..c5763efb0f45 100644
--- a/dev-perl/MP3-Info/metadata.xml
+++ b/dev-perl/MP3-Info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MP3-Info</remote-id>
     <remote-id type="cpan-module">MP3::Info</remote-id>
diff --git a/dev-perl/MP3-Tag/metadata.xml b/dev-perl/MP3-Tag/metadata.xml
index a972af2cd483..6b8682024e90 100644
--- a/dev-perl/MP3-Tag/metadata.xml
+++ b/dev-perl/MP3-Tag/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MP3-Tag</remote-id>
     <remote-id type="cpan-module">Encode::transliterate_win1251</remote-id>
diff --git a/dev-perl/MP4-Info/metadata.xml b/dev-perl/MP4-Info/metadata.xml
index a54a96ae0fb9..2ea74b54b5fe 100644
--- a/dev-perl/MP4-Info/metadata.xml
+++ b/dev-perl/MP4-Info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">MP4-Info</remote-id>
                 <remote-id type="cpan-module">MP4::Info</remote-id>
diff --git a/dev-perl/MRO-Compat/metadata.xml b/dev-perl/MRO-Compat/metadata.xml
index 6ceb53b836c8..2ddf5ed612b5 100644
--- a/dev-perl/MRO-Compat/metadata.xml
+++ b/dev-perl/MRO-Compat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MRO-Compat</remote-id>
     <remote-id type="cpan-module">MRO::Compat</remote-id>
diff --git a/dev-perl/Mac-Pasteboard/metadata.xml b/dev-perl/Mac-Pasteboard/metadata.xml
index e3889681f0d8..6277015ad0ab 100644
--- a/dev-perl/Mac-Pasteboard/metadata.xml
+++ b/dev-perl/Mac-Pasteboard/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>prefix@gentoo.org</email>
     <description>Primary Maintainer (for OSX part)</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mac-Pasteboard</remote-id>
     <remote-id type="cpan-module">Mac::Pasteboard</remote-id>
diff --git a/dev-perl/Mail-Audit/metadata.xml b/dev-perl/Mail-Audit/metadata.xml
index 6eeb0e32d231..4219b46cb84c 100644
--- a/dev-perl/Mail-Audit/metadata.xml
+++ b/dev-perl/Mail-Audit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Audit</remote-id>
     <remote-id type="cpan-module">Mail::Audit</remote-id>
diff --git a/dev-perl/Mail-Box/metadata.xml b/dev-perl/Mail-Box/metadata.xml
index 022238590229..cb8965fb683f 100644
--- a/dev-perl/Mail-Box/metadata.xml
+++ b/dev-perl/Mail-Box/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Mail-Box</remote-id>
 		<remote-id type="cpan-module">Mail::Box</remote-id>
diff --git a/dev-perl/Mail-Builder-Simple/metadata.xml b/dev-perl/Mail-Builder-Simple/metadata.xml
index cbfbbd291cdb..a540247e5b9f 100644
--- a/dev-perl/Mail-Builder-Simple/metadata.xml
+++ b/dev-perl/Mail-Builder-Simple/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Builder-Simple</remote-id>
     <remote-id type="cpan-module">Mail::Builder::Simple</remote-id>
diff --git a/dev-perl/Mail-Builder/metadata.xml b/dev-perl/Mail-Builder/metadata.xml
index 407c4d8cb80c..dbc2047f8e7d 100644
--- a/dev-perl/Mail-Builder/metadata.xml
+++ b/dev-perl/Mail-Builder/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Builder</remote-id>
     <remote-id type="cpan-module">Mail::Builder</remote-id>
diff --git a/dev-perl/Mail-DKIM/metadata.xml b/dev-perl/Mail-DKIM/metadata.xml
index fcf756df9b0c..06c0561ac4cf 100644
--- a/dev-perl/Mail-DKIM/metadata.xml
+++ b/dev-perl/Mail-DKIM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-DKIM</remote-id>
     <remote-id type="cpan-module">Mail::DKIM</remote-id>
diff --git a/dev-perl/Mail-DomainKeys/metadata.xml b/dev-perl/Mail-DomainKeys/metadata.xml
index 271ce435aca7..d41b89b3cac8 100644
--- a/dev-perl/Mail-DomainKeys/metadata.xml
+++ b/dev-perl/Mail-DomainKeys/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-DomainKeys</remote-id>
     <remote-id type="cpan-module">Mail::DomainKeys</remote-id>
diff --git a/dev-perl/Mail-IMAPClient/metadata.xml b/dev-perl/Mail-IMAPClient/metadata.xml
index 0141a301dd2d..d50f1c0c05f3 100644
--- a/dev-perl/Mail-IMAPClient/metadata.xml
+++ b/dev-perl/Mail-IMAPClient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-IMAPClient</remote-id>
     <remote-id type="cpan-module">Mail::IMAPClient</remote-id>
diff --git a/dev-perl/Mail-ListDetector/metadata.xml b/dev-perl/Mail-ListDetector/metadata.xml
index 4bbe3a82924b..e8d19b2f88f8 100644
--- a/dev-perl/Mail-ListDetector/metadata.xml
+++ b/dev-perl/Mail-ListDetector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-ListDetector</remote-id>
     <remote-id type="cpan-module">Mail::ListDetector</remote-id>
diff --git a/dev-perl/Mail-Mbox-MessageParser/metadata.xml b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
index 2dadbdfcfc66..933b67e33772 100644
--- a/dev-perl/Mail-Mbox-MessageParser/metadata.xml
+++ b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Mbox-MessageParser</remote-id>
     <remote-id type="cpan-module">Mail::Mbox::MessageParser</remote-id>
diff --git a/dev-perl/Mail-POP3Client/metadata.xml b/dev-perl/Mail-POP3Client/metadata.xml
index c73bcfcd9d6a..0950fd3cae53 100644
--- a/dev-perl/Mail-POP3Client/metadata.xml
+++ b/dev-perl/Mail-POP3Client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-POP3Client</remote-id>
     <remote-id type="cpan-module">Mail::POP3Client</remote-id>
diff --git a/dev-perl/Mail-Procmail/metadata.xml b/dev-perl/Mail-Procmail/metadata.xml
index 8d4ac6621785..2527f39a7649 100644
--- a/dev-perl/Mail-Procmail/metadata.xml
+++ b/dev-perl/Mail-Procmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Procmail</remote-id>
     <remote-id type="cpan-module">Mail::Procmail</remote-id>
diff --git a/dev-perl/Mail-SPF-Query/metadata.xml b/dev-perl/Mail-SPF-Query/metadata.xml
index 651b3e181ca0..969f33b9a78f 100644
--- a/dev-perl/Mail-SPF-Query/metadata.xml
+++ b/dev-perl/Mail-SPF-Query/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SPF-Query</remote-id>
     <remote-id type="cpan-module">DirectiveSet</remote-id>
diff --git a/dev-perl/Mail-SPF/metadata.xml b/dev-perl/Mail-SPF/metadata.xml
index 54b3dd1730c1..723645beca0f 100644
--- a/dev-perl/Mail-SPF/metadata.xml
+++ b/dev-perl/Mail-SPF/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SPF</remote-id>
     <remote-id type="cpan-module">Mail::SPF</remote-id>
diff --git a/dev-perl/Mail-SRS/metadata.xml b/dev-perl/Mail-SRS/metadata.xml
index 6eefb0f38b73..406f92f7174e 100644
--- a/dev-perl/Mail-SRS/metadata.xml
+++ b/dev-perl/Mail-SRS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SRS</remote-id>
     <remote-id type="cpan-module">Mail::SRS</remote-id>
diff --git a/dev-perl/Mail-Sender/metadata.xml b/dev-perl/Mail-Sender/metadata.xml
index b744ec1104ef..0ed7e969b986 100644
--- a/dev-perl/Mail-Sender/metadata.xml
+++ b/dev-perl/Mail-Sender/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 	    Module for sending mails with attachments through an SMTP server
 	</longdescription>
diff --git a/dev-perl/Mail-Sendmail/metadata.xml b/dev-perl/Mail-Sendmail/metadata.xml
index 02f4cdd76ea3..a7198a5e73ee 100644
--- a/dev-perl/Mail-Sendmail/metadata.xml
+++ b/dev-perl/Mail-Sendmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Sendmail</remote-id>
     <remote-id type="cpan-module">Mail::Sendmail</remote-id>
diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
index 78d565fb8370..34a8300873a4 100644
--- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SpamAssassin-Plugin-GoogleSafeBrowsing</remote-id>
     <remote-id type="cpan-module">Mail::SpamAssassin::Plugin::GoogleSafeBrowsing</remote-id>
diff --git a/dev-perl/MailTools/metadata.xml b/dev-perl/MailTools/metadata.xml
index be3fd7af5e05..79cac2d56f21 100644
--- a/dev-perl/MailTools/metadata.xml
+++ b/dev-perl/MailTools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MailTools</remote-id>
     <remote-id type="cpan-module">Mail::Address</remote-id>
diff --git a/dev-perl/Math-Base-Convert/metadata.xml b/dev-perl/Math-Base-Convert/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Math-Base-Convert/metadata.xml
+++ b/dev-perl/Math-Base-Convert/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Math-Base36/metadata.xml b/dev-perl/Math-Base36/metadata.xml
index 5c7a70502852..0a670daaf8b7 100644
--- a/dev-perl/Math-Base36/metadata.xml
+++ b/dev-perl/Math-Base36/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Base36</remote-id>
     <remote-id type="cpan-module">Math::Base36</remote-id>
diff --git a/dev-perl/Math-Bezier/metadata.xml b/dev-perl/Math-Bezier/metadata.xml
index 7acdf440c63e..fbefa6465b6e 100644
--- a/dev-perl/Math-Bezier/metadata.xml
+++ b/dev-perl/Math-Bezier/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Bezier</remote-id>
     <remote-id type="cpan-module">Math::Bezier</remote-id>
diff --git a/dev-perl/Math-BigInt-GMP/metadata.xml b/dev-perl/Math-BigInt-GMP/metadata.xml
index cf05668fcdb3..c8381479b4ba 100644
--- a/dev-perl/Math-BigInt-GMP/metadata.xml
+++ b/dev-perl/Math-BigInt-GMP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-BigInt-GMP</remote-id>
     <remote-id type="cpan-module">Math::BigInt::GMP</remote-id>
diff --git a/dev-perl/Math-Calc-Units/metadata.xml b/dev-perl/Math-Calc-Units/metadata.xml
index b1fa4cce338f..3a6c54d5fe94 100644
--- a/dev-perl/Math-Calc-Units/metadata.xml
+++ b/dev-perl/Math-Calc-Units/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Calc-Units</remote-id>
     <remote-id type="cpan-module">Math::Calc::Units</remote-id>
diff --git a/dev-perl/Math-Derivative/metadata.xml b/dev-perl/Math-Derivative/metadata.xml
index f614126017cf..1d81fed24150 100644
--- a/dev-perl/Math-Derivative/metadata.xml
+++ b/dev-perl/Math-Derivative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Derivative</remote-id>
     <remote-id type="cpan-module">Math::Derivative</remote-id>
diff --git a/dev-perl/Math-GMP/metadata.xml b/dev-perl/Math-GMP/metadata.xml
index fef1355ce8de..6d0233aa43b7 100644
--- a/dev-perl/Math-GMP/metadata.xml
+++ b/dev-perl/Math-GMP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-GMP</remote-id>
     <remote-id type="cpan-module">Math::GMP</remote-id>
diff --git a/dev-perl/Math-ModInt/metadata.xml b/dev-perl/Math-ModInt/metadata.xml
index a78853c5113b..acdd0701d400 100644
--- a/dev-perl/Math-ModInt/metadata.xml
+++ b/dev-perl/Math-ModInt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-ModInt</remote-id>
   </upstream>
diff --git a/dev-perl/Math-NumberCruncher/metadata.xml b/dev-perl/Math-NumberCruncher/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Math-NumberCruncher/metadata.xml
+++ b/dev-perl/Math-NumberCruncher/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random-ISAAC-XS/metadata.xml b/dev-perl/Math-Random-ISAAC-XS/metadata.xml
index 74d08c6752bb..bb3e2c45b7dd 100644
--- a/dev-perl/Math-Random-ISAAC-XS/metadata.xml
+++ b/dev-perl/Math-Random-ISAAC-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Math-Random-ISAAC-XS</remote-id>
 		<remote-id type="cpan-module">Math::Random::ISAAC::XS</remote-id>
diff --git a/dev-perl/Math-Random-ISAAC/metadata.xml b/dev-perl/Math-Random-ISAAC/metadata.xml
index 003e491550eb..fe53efe2652d 100644
--- a/dev-perl/Math-Random-ISAAC/metadata.xml
+++ b/dev-perl/Math-Random-ISAAC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Math-Random-ISAAC</remote-id>
 		<remote-id type="cpan-module">Math::Random::ISAAC</remote-id>
diff --git a/dev-perl/Math-Random-MT/metadata.xml b/dev-perl/Math-Random-MT/metadata.xml
index 3dbdf04c273f..7c78a3ab694d 100644
--- a/dev-perl/Math-Random-MT/metadata.xml
+++ b/dev-perl/Math-Random-MT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Random-MT</remote-id>
     <remote-id type="cpan-module">Math::Random::MT</remote-id>
diff --git a/dev-perl/Math-Random-Secure/metadata.xml b/dev-perl/Math-Random-Secure/metadata.xml
index 3413dafbf358..673aba0441ae 100644
--- a/dev-perl/Math-Random-Secure/metadata.xml
+++ b/dev-perl/Math-Random-Secure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Math-Random-Secure</remote-id>
 		<remote-id type="cpan-module">Math::Random::Secure</remote-id>
diff --git a/dev-perl/Math-Random/metadata.xml b/dev-perl/Math-Random/metadata.xml
index 894399fa3fc6..f495d656443e 100644
--- a/dev-perl/Math-Random/metadata.xml
+++ b/dev-perl/Math-Random/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Random</remote-id>
     <remote-id type="cpan-module">Math::Random</remote-id>
diff --git a/dev-perl/Math-Round/metadata.xml b/dev-perl/Math-Round/metadata.xml
index 2a770f909990..f82dd0f7369f 100644
--- a/dev-perl/Math-Round/metadata.xml
+++ b/dev-perl/Math-Round/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Round</remote-id>
     <remote-id type="cpan-module">Math::Round</remote-id>
diff --git a/dev-perl/Math-Spline/metadata.xml b/dev-perl/Math-Spline/metadata.xml
index 103242232b33..f1e8045b95bf 100644
--- a/dev-perl/Math-Spline/metadata.xml
+++ b/dev-perl/Math-Spline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Spline</remote-id>
     <remote-id type="cpan-module">Math::Spline</remote-id>
diff --git a/dev-perl/Math-Vec/metadata.xml b/dev-perl/Math-Vec/metadata.xml
index af242fe30df1..3bb7b59dd681 100644
--- a/dev-perl/Math-Vec/metadata.xml
+++ b/dev-perl/Math-Vec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Vec</remote-id>
     <remote-id type="cpan-module">Math::Vec</remote-id>
diff --git a/dev-perl/Math-VecStat/metadata.xml b/dev-perl/Math-VecStat/metadata.xml
index 1efaa484d251..0c922950f013 100644
--- a/dev-perl/Math-VecStat/metadata.xml
+++ b/dev-perl/Math-VecStat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-VecStat</remote-id>
     <remote-id type="cpan-module">Math::VecStat</remote-id>
diff --git a/dev-perl/MediaWiki-API/metadata.xml b/dev-perl/MediaWiki-API/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/MediaWiki-API/metadata.xml
+++ b/dev-perl/MediaWiki-API/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Mo/metadata.xml b/dev-perl/Mo/metadata.xml
index a98e1bb11768..249175f0d842 100644
--- a/dev-perl/Mo/metadata.xml
+++ b/dev-perl/Mo/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mo</remote-id>
     <remote-id type="cpan-module">Mo</remote-id>
diff --git a/dev-perl/Modem-Vgetty/metadata.xml b/dev-perl/Modem-Vgetty/metadata.xml
index c9e3c8c5512a..3cea9be77aec 100644
--- a/dev-perl/Modem-Vgetty/metadata.xml
+++ b/dev-perl/Modem-Vgetty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Modem-Vgetty</remote-id>
     <remote-id type="cpan-module">Modem::Vgetty</remote-id>
diff --git a/dev-perl/Module-Build-Tiny/metadata.xml b/dev-perl/Module-Build-Tiny/metadata.xml
index f6a12b7bed2e..63dff204f5ed 100644
--- a/dev-perl/Module-Build-Tiny/metadata.xml
+++ b/dev-perl/Module-Build-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Module-Build-Tiny</remote-id>
 		<remote-id type="cpan-module">Module::Build::Tiny</remote-id>
diff --git a/dev-perl/Module-Build-XSUtil/metadata.xml b/dev-perl/Module-Build-XSUtil/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Module-Build-XSUtil/metadata.xml
+++ b/dev-perl/Module-Build-XSUtil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Module-Build/metadata.xml b/dev-perl/Module-Build/metadata.xml
index 526d38762096..ea8116b34d6c 100644
--- a/dev-perl/Module-Build/metadata.xml
+++ b/dev-perl/Module-Build/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Build</remote-id>
     <remote-id type="cpan-module">Module::Build</remote-id>
diff --git a/dev-perl/Module-Find/metadata.xml b/dev-perl/Module-Find/metadata.xml
index 362c3de071a1..56a41b997fd3 100644
--- a/dev-perl/Module-Find/metadata.xml
+++ b/dev-perl/Module-Find/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Find</remote-id>
     <remote-id type="cpan-module">Module::Find</remote-id>
diff --git a/dev-perl/Module-Implementation/metadata.xml b/dev-perl/Module-Implementation/metadata.xml
index ab7142b99e3e..7162155b9495 100644
--- a/dev-perl/Module-Implementation/metadata.xml
+++ b/dev-perl/Module-Implementation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Implementation</remote-id>
     <remote-id type="cpan-module">Module::Implementation</remote-id>
diff --git a/dev-perl/Module-Info/metadata.xml b/dev-perl/Module-Info/metadata.xml
index 12cf4d854049..6f1a6116ca8e 100644
--- a/dev-perl/Module-Info/metadata.xml
+++ b/dev-perl/Module-Info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Info</remote-id>
     <remote-id type="cpan-module">B::Module::Info</remote-id>
diff --git a/dev-perl/Module-Install-AuthorTests/metadata.xml b/dev-perl/Module-Install-AuthorTests/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Module-Install-AuthorTests/metadata.xml
+++ b/dev-perl/Module-Install-AuthorTests/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Module-Install/metadata.xml b/dev-perl/Module-Install/metadata.xml
index 1d68b8dea73a..75c706efe3cd 100644
--- a/dev-perl/Module-Install/metadata.xml
+++ b/dev-perl/Module-Install/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Install</remote-id>
     <remote-id type="cpan-module">Module::AutoInstall</remote-id>
diff --git a/dev-perl/Module-Locate/metadata.xml b/dev-perl/Module-Locate/metadata.xml
index fcb14addcd1c..211bb508d39d 100644
--- a/dev-perl/Module-Locate/metadata.xml
+++ b/dev-perl/Module-Locate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Module-Locate</remote-id>
         <remote-id type="cpan-module">Module::Locate</remote-id>
diff --git a/dev-perl/Module-Manifest/metadata.xml b/dev-perl/Module-Manifest/metadata.xml
index b7fbcac7e779..3cf9a8b41647 100644
--- a/dev-perl/Module-Manifest/metadata.xml
+++ b/dev-perl/Module-Manifest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Module-Manifest</remote-id>
 		<remote-id type="cpan-module">Module::Manifest</remote-id>
diff --git a/dev-perl/Module-Pluggable/metadata.xml b/dev-perl/Module-Pluggable/metadata.xml
index 5a08a6299f3d..f9a0f5f0ca75 100644
--- a/dev-perl/Module-Pluggable/metadata.xml
+++ b/dev-perl/Module-Pluggable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Pluggable</remote-id>
     <remote-id type="cpan-module">Devel::InnerPackage</remote-id>
diff --git a/dev-perl/Module-Refresh/metadata.xml b/dev-perl/Module-Refresh/metadata.xml
index 22d6d98186e1..254feef347b5 100644
--- a/dev-perl/Module-Refresh/metadata.xml
+++ b/dev-perl/Module-Refresh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Refresh</remote-id>
     <remote-id type="cpan-module">Module::Refresh</remote-id>
diff --git a/dev-perl/Module-Runtime-Conflicts/metadata.xml b/dev-perl/Module-Runtime-Conflicts/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Module-Runtime-Conflicts/metadata.xml
+++ b/dev-perl/Module-Runtime-Conflicts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Module-Runtime/metadata.xml b/dev-perl/Module-Runtime/metadata.xml
index 335785b16068..797f9954d080 100644
--- a/dev-perl/Module-Runtime/metadata.xml
+++ b/dev-perl/Module-Runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Module-Runtime</remote-id>
         <remote-id type="cpan-module">Module::Runtime</remote-id>
diff --git a/dev-perl/Module-ScanDeps/metadata.xml b/dev-perl/Module-ScanDeps/metadata.xml
index f7eedcc8d130..fedce81b2223 100644
--- a/dev-perl/Module-ScanDeps/metadata.xml
+++ b/dev-perl/Module-ScanDeps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-ScanDeps</remote-id>
     <remote-id type="cpan-module">Module::ScanDeps</remote-id>
diff --git a/dev-perl/Module-Signature/metadata.xml b/dev-perl/Module-Signature/metadata.xml
index 14d7cdabbcb2..e3108f5bb5ab 100644
--- a/dev-perl/Module-Signature/metadata.xml
+++ b/dev-perl/Module-Signature/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Signature</remote-id>
     <remote-id type="cpan-module">Module::Signature</remote-id>
diff --git a/dev-perl/Module-Starter/metadata.xml b/dev-perl/Module-Starter/metadata.xml
index e53679795fef..92bd08115d9e 100644
--- a/dev-perl/Module-Starter/metadata.xml
+++ b/dev-perl/Module-Starter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Starter</remote-id>
     <remote-id type="cpan-module">Module::Starter</remote-id>
diff --git a/dev-perl/Module-Util/metadata.xml b/dev-perl/Module-Util/metadata.xml
index d8a9e4de9d35..8a4cbf31278b 100644
--- a/dev-perl/Module-Util/metadata.xml
+++ b/dev-perl/Module-Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Module-Util</remote-id>
 		<remote-id type="cpan-module">Module::Util</remote-id>
diff --git a/dev-perl/Module-Versions-Report/metadata.xml b/dev-perl/Module-Versions-Report/metadata.xml
index 5af27ee7fe96..0fea369df539 100644
--- a/dev-perl/Module-Versions-Report/metadata.xml
+++ b/dev-perl/Module-Versions-Report/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Versions-Report</remote-id>
     <remote-id type="cpan-module">Module::Versions::Report</remote-id>
diff --git a/dev-perl/MogileFS-Client-Async/metadata.xml b/dev-perl/MogileFS-Client-Async/metadata.xml
index e01f54181dab..98d58739c784 100644
--- a/dev-perl/MogileFS-Client-Async/metadata.xml
+++ b/dev-perl/MogileFS-Client-Async/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Client-Async</remote-id>
     <remote-id type="cpan-module">MogileFS::Client::Async</remote-id>
diff --git a/dev-perl/MogileFS-Client/metadata.xml b/dev-perl/MogileFS-Client/metadata.xml
index b2d9785b50cb..2473774fe55b 100644
--- a/dev-perl/MogileFS-Client/metadata.xml
+++ b/dev-perl/MogileFS-Client/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Client</remote-id>
     <remote-id type="cpan-module">MogileFS::Admin</remote-id>
diff --git a/dev-perl/MogileFS-Network/metadata.xml b/dev-perl/MogileFS-Network/metadata.xml
index 476f0490203e..eca38e090bce 100644
--- a/dev-perl/MogileFS-Network/metadata.xml
+++ b/dev-perl/MogileFS-Network/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Network</remote-id>
     <remote-id type="cpan-module">MogileFS::Network</remote-id>
diff --git a/dev-perl/MogileFS-Utils/metadata.xml b/dev-perl/MogileFS-Utils/metadata.xml
index 3f4cb1674943..601e56caeb3d 100644
--- a/dev-perl/MogileFS-Utils/metadata.xml
+++ b/dev-perl/MogileFS-Utils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Utils</remote-id>
     <remote-id type="cpan-module">MogileFS::Utils</remote-id>
diff --git a/dev-perl/Mon/metadata.xml b/dev-perl/Mon/metadata.xml
index ee1c6c121827..a356856e7465 100644
--- a/dev-perl/Mon/metadata.xml
+++ b/dev-perl/Mon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mon</remote-id>
     <remote-id type="cpan-module">Mon::Client</remote-id>
diff --git a/dev-perl/MongoDB/metadata.xml b/dev-perl/MongoDB/metadata.xml
index 07a6575ced26..9ed984eefa33 100644
--- a/dev-perl/MongoDB/metadata.xml
+++ b/dev-perl/MongoDB/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MongoDB</remote-id>
     <remote-id type="cpan-module">MongoDB</remote-id>
diff --git a/dev-perl/Monitoring-Plugin/metadata.xml b/dev-perl/Monitoring-Plugin/metadata.xml
index bfa913289d0c..e5e4f9a75ba9 100644
--- a/dev-perl/Monitoring-Plugin/metadata.xml
+++ b/dev-perl/Monitoring-Plugin/metadata.xml
@@ -5,7 +5,10 @@
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Monitoring-Plugin</remote-id>
     <remote-id type="cpan-module">Monitoring::Plugin</remote-id>
diff --git a/dev-perl/Moo/metadata.xml b/dev-perl/Moo/metadata.xml
index c570f0ad7a43..6b7331a97ae6 100644
--- a/dev-perl/Moo/metadata.xml
+++ b/dev-perl/Moo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Moo</remote-id>
 		<remote-id type="cpan-module">Method::Generate::Accessor</remote-id>
diff --git a/dev-perl/MooX-HandlesVia/metadata.xml b/dev-perl/MooX-HandlesVia/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/MooX-HandlesVia/metadata.xml
+++ b/dev-perl/MooX-HandlesVia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/MooX-Types-MooseLike-Numeric/metadata.xml b/dev-perl/MooX-Types-MooseLike-Numeric/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/MooX-Types-MooseLike-Numeric/metadata.xml
+++ b/dev-perl/MooX-Types-MooseLike-Numeric/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/MooX-Types-MooseLike/metadata.xml b/dev-perl/MooX-Types-MooseLike/metadata.xml
index 21de86a305e7..935c42cab394 100644
--- a/dev-perl/MooX-Types-MooseLike/metadata.xml
+++ b/dev-perl/MooX-Types-MooseLike/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MooX-Types-MooseLike</remote-id>
 		<remote-id type="cpan-module">MooX::Types::MooseLike</remote-id>
diff --git a/dev-perl/MooX-late/metadata.xml b/dev-perl/MooX-late/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/MooX-late/metadata.xml
+++ b/dev-perl/MooX-late/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Moose/metadata.xml b/dev-perl/Moose/metadata.xml
index 8cd0920bb85a..fd4135ce9cbc 100644
--- a/dev-perl/Moose/metadata.xml
+++ b/dev-perl/Moose/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Moose</remote-id>
     <remote-id type="cpan-module">Class::MOP</remote-id>
diff --git a/dev-perl/MooseX-Aliases/metadata.xml b/dev-perl/MooseX-Aliases/metadata.xml
index 7bd01010476c..b6d62c8ac9b3 100644
--- a/dev-perl/MooseX-Aliases/metadata.xml
+++ b/dev-perl/MooseX-Aliases/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">MooseX-Aliases</remote-id>
                 <remote-id type="cpan-module">MooseX::Aliases</remote-id>
diff --git a/dev-perl/MooseX-ClassAttribute/metadata.xml b/dev-perl/MooseX-ClassAttribute/metadata.xml
index 1c030ed33d18..f221337c5d5c 100644
--- a/dev-perl/MooseX-ClassAttribute/metadata.xml
+++ b/dev-perl/MooseX-ClassAttribute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-ClassAttribute</remote-id>
     <remote-id type="cpan-module">MooseX::ClassAttribute</remote-id>
diff --git a/dev-perl/MooseX-ConfigFromFile/metadata.xml b/dev-perl/MooseX-ConfigFromFile/metadata.xml
index b161a0982846..b193041762e0 100644
--- a/dev-perl/MooseX-ConfigFromFile/metadata.xml
+++ b/dev-perl/MooseX-ConfigFromFile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">MooseX-ConfigFromFile</remote-id>
         <remote-id type="cpan-module">MooseX::ConfigFromFile</remote-id>
diff --git a/dev-perl/MooseX-FollowPBP/metadata.xml b/dev-perl/MooseX-FollowPBP/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/MooseX-FollowPBP/metadata.xml
+++ b/dev-perl/MooseX-FollowPBP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Getopt/metadata.xml b/dev-perl/MooseX-Getopt/metadata.xml
index afe0efcc7e7f..09feb6993780 100644
--- a/dev-perl/MooseX-Getopt/metadata.xml
+++ b/dev-perl/MooseX-Getopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Getopt</remote-id>
     <remote-id type="cpan-module">MooseX::Getopt</remote-id>
diff --git a/dev-perl/MooseX-GlobRef/metadata.xml b/dev-perl/MooseX-GlobRef/metadata.xml
index 0a797a8c68d8..57c968303642 100644
--- a/dev-perl/MooseX-GlobRef/metadata.xml
+++ b/dev-perl/MooseX-GlobRef/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-GlobRef</remote-id>
     <remote-id type="cpan-module">MooseX::GlobRef</remote-id>
diff --git a/dev-perl/MooseX-MultiInitArg/metadata.xml b/dev-perl/MooseX-MultiInitArg/metadata.xml
index ad2db452deb8..38a7e3e3d435 100644
--- a/dev-perl/MooseX-MultiInitArg/metadata.xml
+++ b/dev-perl/MooseX-MultiInitArg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-MultiInitArg</remote-id>
     <remote-id type="cpan-module">MooseX::MultiInitArg</remote-id>
diff --git a/dev-perl/MooseX-Object-Pluggable/metadata.xml b/dev-perl/MooseX-Object-Pluggable/metadata.xml
index b98afa7c3d96..d0a210746f55 100644
--- a/dev-perl/MooseX-Object-Pluggable/metadata.xml
+++ b/dev-perl/MooseX-Object-Pluggable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Object-Pluggable</remote-id>
     <remote-id type="cpan-module">MooseX::Object::Pluggable</remote-id>
diff --git a/dev-perl/MooseX-Role-Parameterized/metadata.xml b/dev-perl/MooseX-Role-Parameterized/metadata.xml
index 10ede33abd9a..9e6bfc6dbc83 100644
--- a/dev-perl/MooseX-Role-Parameterized/metadata.xml
+++ b/dev-perl/MooseX-Role-Parameterized/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">MooseX-Role-Parameterized</remote-id>
         <remote-id type="cpan-module">MooseX::Role::Parameterized</remote-id>
diff --git a/dev-perl/MooseX-Role-WithOverloading/metadata.xml b/dev-perl/MooseX-Role-WithOverloading/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/dev-perl/MooseX-Role-WithOverloading/metadata.xml
+++ b/dev-perl/MooseX-Role-WithOverloading/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-SimpleConfig/metadata.xml b/dev-perl/MooseX-SimpleConfig/metadata.xml
index fc6103470dc4..ecf8ab8e1864 100644
--- a/dev-perl/MooseX-SimpleConfig/metadata.xml
+++ b/dev-perl/MooseX-SimpleConfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MooseX-SimpleConfig</remote-id>
 		<remote-id type="cpan-module">MooseX::SimpleConfig</remote-id>
diff --git a/dev-perl/MooseX-StrictConstructor/metadata.xml b/dev-perl/MooseX-StrictConstructor/metadata.xml
index 173f3802e081..0761f726137c 100644
--- a/dev-perl/MooseX-StrictConstructor/metadata.xml
+++ b/dev-perl/MooseX-StrictConstructor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-StrictConstructor</remote-id>
     <remote-id type="cpan-module">MooseX::StrictConstructor</remote-id>
diff --git a/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml b/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
index b690b548f298..f378d93e4c46 100644
--- a/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime-ButMaintained</remote-id>
     <remote-id type="cpan-module">MooseX::Types::DateTime::ButMaintained</remote-id>
diff --git a/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml b/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
index 49eb5e1ad490..93b5f01c82c3 100644
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime-MoreCoercions</remote-id>
     <remote-id type="cpan-module">MooseX::Types::DateTime::MoreCoercions</remote-id>
diff --git a/dev-perl/MooseX-Types-DateTime/metadata.xml b/dev-perl/MooseX-Types-DateTime/metadata.xml
index f5166f90bc4e..4e5d8223de6b 100644
--- a/dev-perl/MooseX-Types-DateTime/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime</remote-id>
     <remote-id type="cpan-module">MooseX::Types::DateTime</remote-id>
diff --git a/dev-perl/MooseX-Types-DateTimeX/metadata.xml b/dev-perl/MooseX-Types-DateTimeX/metadata.xml
index c9e59b12d038..aace6627bd35 100644
--- a/dev-perl/MooseX-Types-DateTimeX/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTimeX/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTimeX</remote-id>
     <remote-id type="cpan-module">MooseX::Types::DateTimeX</remote-id>
diff --git a/dev-perl/MooseX-Types-JSON/metadata.xml b/dev-perl/MooseX-Types-JSON/metadata.xml
index ece5b245e729..c43d24dde515 100644
--- a/dev-perl/MooseX-Types-JSON/metadata.xml
+++ b/dev-perl/MooseX-Types-JSON/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-JSON</remote-id>
     <remote-id type="cpan-module">MooseX::Types::JSON</remote-id>
diff --git a/dev-perl/MooseX-Types-Path-Class/metadata.xml b/dev-perl/MooseX-Types-Path-Class/metadata.xml
index 35a22dc1c8e8..da4b5da05e9c 100644
--- a/dev-perl/MooseX-Types-Path-Class/metadata.xml
+++ b/dev-perl/MooseX-Types-Path-Class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types-Path-Class</remote-id>
     <remote-id type="cpan-module">MooseX::Types::Path::Class</remote-id>
diff --git a/dev-perl/MooseX-Types-Path-Tiny/metadata.xml b/dev-perl/MooseX-Types-Path-Tiny/metadata.xml
index 603f8d3ffdf9..5b637e3662e3 100644
--- a/dev-perl/MooseX-Types-Path-Tiny/metadata.xml
+++ b/dev-perl/MooseX-Types-Path-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MooseX-Types-Path-Tiny</remote-id>
 		<remote-id type="cpan-module">MooseX::Types::Path::Tiny</remote-id>
diff --git a/dev-perl/MooseX-Types-Stringlike/metadata.xml b/dev-perl/MooseX-Types-Stringlike/metadata.xml
index 12a9f144bafe..cc4afc91f6b0 100644
--- a/dev-perl/MooseX-Types-Stringlike/metadata.xml
+++ b/dev-perl/MooseX-Types-Stringlike/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">MooseX-Types-Stringlike</remote-id>
 		<remote-id type="cpan-module">MooseX::Types::Stringlike</remote-id>
diff --git a/dev-perl/MooseX-Types/metadata.xml b/dev-perl/MooseX-Types/metadata.xml
index 5ad460099964..ed7cd2d23279 100644
--- a/dev-perl/MooseX-Types/metadata.xml
+++ b/dev-perl/MooseX-Types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Types</remote-id>
     <remote-id type="cpan-module">MooseX::Types</remote-id>
diff --git a/dev-perl/Mouse/metadata.xml b/dev-perl/Mouse/metadata.xml
index ed6d8f776041..a09dabae7ec9 100644
--- a/dev-perl/Mouse/metadata.xml
+++ b/dev-perl/Mouse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Mouse</remote-id>
     <remote-id type="cpan-module">Mouse</remote-id>
diff --git a/dev-perl/MouseX-Types/metadata.xml b/dev-perl/MouseX-Types/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/MouseX-Types/metadata.xml
+++ b/dev-perl/MouseX-Types/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Mozilla-CA/metadata.xml b/dev-perl/Mozilla-CA/metadata.xml
index e3b8e6db7b26..5c1b2a88d81c 100644
--- a/dev-perl/Mozilla-CA/metadata.xml
+++ b/dev-perl/Mozilla-CA/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Mozilla-CA</remote-id>
         <remote-id type="cpan-module">Mozilla::CA</remote-id>
diff --git a/dev-perl/MusicBrainz-DiscID/metadata.xml b/dev-perl/MusicBrainz-DiscID/metadata.xml
index a40ce4720dfa..550fd1c47c31 100644
--- a/dev-perl/MusicBrainz-DiscID/metadata.xml
+++ b/dev-perl/MusicBrainz-DiscID/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
-<herd>sound</herd>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
 <upstream>
 <remote-id type="cpan">MusicBrainz-DiscID</remote-id>
 <remote-id type="cpan-module">MusicBrainz::DiscID</remote-id>
diff --git a/dev-perl/Nagios-Plugin/metadata.xml b/dev-perl/Nagios-Plugin/metadata.xml
index de1e4dcbd948..dc30f4126b79 100644
--- a/dev-perl/Nagios-Plugin/metadata.xml
+++ b/dev-perl/Nagios-Plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Nagios-Plugin</remote-id>
     <remote-id type="cpan-module">Nagios::Plugin</remote-id>
diff --git a/dev-perl/Net-ARP/metadata.xml b/dev-perl/Net-ARP/metadata.xml
index 8c5f5a6c727b..c7104b086e6c 100644
--- a/dev-perl/Net-ARP/metadata.xml
+++ b/dev-perl/Net-ARP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-ARP</remote-id>
     <remote-id type="cpan-module">Net::ARP</remote-id>
diff --git a/dev-perl/Net-Amazon-S3/metadata.xml b/dev-perl/Net-Amazon-S3/metadata.xml
index 6a4e5e03acba..8543560f3dd1 100644
--- a/dev-perl/Net-Amazon-S3/metadata.xml
+++ b/dev-perl/Net-Amazon-S3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Amazon-S3</remote-id>
     <remote-id type="cpan-module">Net::Amazon::S3</remote-id>
diff --git a/dev-perl/Net-Amazon/metadata.xml b/dev-perl/Net-Amazon/metadata.xml
index c22f5bc03011..a28b66277f27 100644
--- a/dev-perl/Net-Amazon/metadata.xml
+++ b/dev-perl/Net-Amazon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Amazon</remote-id>
     <remote-id type="cpan-module">Net::Amazon</remote-id>
diff --git a/dev-perl/Net-CIDR-Lite/metadata.xml b/dev-perl/Net-CIDR-Lite/metadata.xml
index 2f5ee7eb3195..a84972d03ba9 100644
--- a/dev-perl/Net-CIDR-Lite/metadata.xml
+++ b/dev-perl/Net-CIDR-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-CIDR-Lite</remote-id>
     <remote-id type="cpan-module">Net::CIDR::Lite</remote-id>
diff --git a/dev-perl/Net-CIDR/metadata.xml b/dev-perl/Net-CIDR/metadata.xml
index 30dd41d4d171..176d3ccff69d 100644
--- a/dev-perl/Net-CIDR/metadata.xml
+++ b/dev-perl/Net-CIDR/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-CIDR</remote-id>
     <remote-id type="cpan-module">Net::CIDR</remote-id>
diff --git a/dev-perl/Net-CUPS/metadata.xml b/dev-perl/Net-CUPS/metadata.xml
index b9c823bd8ff0..2a9de5b88d0f 100644
--- a/dev-perl/Net-CUPS/metadata.xml
+++ b/dev-perl/Net-CUPS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-CUPS</remote-id>
     <remote-id type="cpan-module">Net::CUPS</remote-id>
diff --git a/dev-perl/Net-DBus/metadata.xml b/dev-perl/Net-DBus/metadata.xml
index f9cded3c0ea3..bc63518eb096 100644
--- a/dev-perl/Net-DBus/metadata.xml
+++ b/dev-perl/Net-DBus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DBus</remote-id>
     <remote-id type="cpan-module">Net::DBus</remote-id>
diff --git a/dev-perl/Net-DNS-Async/metadata.xml b/dev-perl/Net-DNS-Async/metadata.xml
index 34283f1c1bab..f810e0e088cd 100644
--- a/dev-perl/Net-DNS-Async/metadata.xml
+++ b/dev-perl/Net-DNS-Async/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DNS-Async</remote-id>
     <remote-id type="cpan-module">Net::DNS::Async</remote-id>
diff --git a/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml b/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
index 6c624a9c6803..a413d31fa10f 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
+++ b/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DNS-Resolver-Programmable</remote-id>
     <remote-id type="cpan-module">Net::DNS::Resolver::Programmable</remote-id>
diff --git a/dev-perl/Net-DNS-SEC/metadata.xml b/dev-perl/Net-DNS-SEC/metadata.xml
index 8f9f02feaa6d..a8b4044227ea 100644
--- a/dev-perl/Net-DNS-SEC/metadata.xml
+++ b/dev-perl/Net-DNS-SEC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Net-DNS-SEC</remote-id>
 		<remote-id type="cpan-module">Net::DNS::Keyset</remote-id>
diff --git a/dev-perl/Net-DNS/metadata.xml b/dev-perl/Net-DNS/metadata.xml
index 07fd53dc36f7..b625e38100ad 100644
--- a/dev-perl/Net-DNS/metadata.xml
+++ b/dev-perl/Net-DNS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DNS</remote-id>
     <remote-id type="cpan-module">Net::DNS</remote-id>
diff --git a/dev-perl/Net-Daemon/metadata.xml b/dev-perl/Net-Daemon/metadata.xml
index 83dbeb6b633c..88aa0195dcc7 100644
--- a/dev-perl/Net-Daemon/metadata.xml
+++ b/dev-perl/Net-Daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Daemon</remote-id>
     <remote-id type="cpan-module">Net::Daemon</remote-id>
diff --git a/dev-perl/Net-Domain-TLD/metadata.xml b/dev-perl/Net-Domain-TLD/metadata.xml
index b3f0c02bb0d3..74c73ac48272 100644
--- a/dev-perl/Net-Domain-TLD/metadata.xml
+++ b/dev-perl/Net-Domain-TLD/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Domain-TLD</remote-id>
     <remote-id type="cpan-module">Net::Domain::TLD</remote-id>
diff --git a/dev-perl/Net-FreeDB/metadata.xml b/dev-perl/Net-FreeDB/metadata.xml
index ab0404d6e9af..98d17bf4c4cd 100644
--- a/dev-perl/Net-FreeDB/metadata.xml
+++ b/dev-perl/Net-FreeDB/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-FreeDB</remote-id>
     <remote-id type="cpan-module">Net::FreeDB</remote-id>
diff --git a/dev-perl/Net-Google-SafeBrowsing-Blocklist/metadata.xml b/dev-perl/Net-Google-SafeBrowsing-Blocklist/metadata.xml
index a5bc9a27526d..fa4759589516 100644
--- a/dev-perl/Net-Google-SafeBrowsing-Blocklist/metadata.xml
+++ b/dev-perl/Net-Google-SafeBrowsing-Blocklist/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Google-SafeBrowsing-Blocklist</remote-id>
   </upstream>
diff --git a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
index 72c937f66b79..50d53a4f125f 100644
--- a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
+++ b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Google-SafeBrowsing-UpdateRequest</remote-id>
     <remote-id type="cpan-module">Net::Google::SafeBrowsing::UpdateRequest</remote-id>
diff --git a/dev-perl/Net-HTTP/metadata.xml b/dev-perl/Net-HTTP/metadata.xml
index df015fe2b75c..2e53aa152a72 100644
--- a/dev-perl/Net-HTTP/metadata.xml
+++ b/dev-perl/Net-HTTP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Net-HTTP</remote-id>
 		<remote-id type="cpan-module">Net::HTTP</remote-id>
diff --git a/dev-perl/Net-IDN-Encode/metadata.xml b/dev-perl/Net-IDN-Encode/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Net-IDN-Encode/metadata.xml
+++ b/dev-perl/Net-IDN-Encode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Net-IMAP-Simple-SSL/metadata.xml b/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
index 57f94a0ae3f3..58cd9f2b3984 100644
--- a/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
+++ b/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-IMAP-Simple-SSL</remote-id>
     <remote-id type="cpan-module">Net::IMAP::Simple::SSL</remote-id>
diff --git a/dev-perl/Net-IMAP-Simple/metadata.xml b/dev-perl/Net-IMAP-Simple/metadata.xml
index 3345c86ace9c..119640b2fe87 100644
--- a/dev-perl/Net-IMAP-Simple/metadata.xml
+++ b/dev-perl/Net-IMAP-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-IMAP-Simple</remote-id>
     <remote-id type="cpan-module">Net::IMAP::Simple</remote-id>
diff --git a/dev-perl/Net-IP-Minimal/metadata.xml b/dev-perl/Net-IP-Minimal/metadata.xml
index 1cac6fb08dcb..411994db6c37 100644
--- a/dev-perl/Net-IP-Minimal/metadata.xml
+++ b/dev-perl/Net-IP-Minimal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Net-IP-Minimal</remote-id>
 		<remote-id type="cpan-module">Net::IP::Minimal</remote-id>
diff --git a/dev-perl/Net-IP/metadata.xml b/dev-perl/Net-IP/metadata.xml
index 3c0082b303a5..71c2011914c5 100644
--- a/dev-perl/Net-IP/metadata.xml
+++ b/dev-perl/Net-IP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-IP</remote-id>
     <remote-id type="cpan-module">Net::IP</remote-id>
diff --git a/dev-perl/Net-IPv4Addr/metadata.xml b/dev-perl/Net-IPv4Addr/metadata.xml
index 2248e4f78525..5d66dac3c3d2 100644
--- a/dev-perl/Net-IPv4Addr/metadata.xml
+++ b/dev-perl/Net-IPv4Addr/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-IPv4Addr</remote-id>
     <remote-id type="cpan-module">Net::IPv4Addr</remote-id>
diff --git a/dev-perl/Net-IRC/metadata.xml b/dev-perl/Net-IRC/metadata.xml
index b682e5972d0a..9a2a19a9fc52 100644
--- a/dev-perl/Net-IRC/metadata.xml
+++ b/dev-perl/Net-IRC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-IRC</remote-id>
     <remote-id type="cpan-module">Net::IRC</remote-id>
diff --git a/dev-perl/Net-Ident/metadata.xml b/dev-perl/Net-Ident/metadata.xml
index 07283811627e..7a2bd262e4d6 100644
--- a/dev-perl/Net-Ident/metadata.xml
+++ b/dev-perl/Net-Ident/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Ident</remote-id>
     <remote-id type="cpan-module">Net::Ident</remote-id>
diff --git a/dev-perl/Net-Jabber/metadata.xml b/dev-perl/Net-Jabber/metadata.xml
index 0254180e9435..71b51d39f7a5 100644
--- a/dev-perl/Net-Jabber/metadata.xml
+++ b/dev-perl/Net-Jabber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Jabber</remote-id>
     <remote-id type="cpan-module">Net::Jabber</remote-id>
diff --git a/dev-perl/Net-Kismet/metadata.xml b/dev-perl/Net-Kismet/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Net-Kismet/metadata.xml
+++ b/dev-perl/Net-Kismet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Net-LDAP-Server/metadata.xml b/dev-perl/Net-LDAP-Server/metadata.xml
index 3c29b85f4022..a826a4d79e95 100644
--- a/dev-perl/Net-LDAP-Server/metadata.xml
+++ b/dev-perl/Net-LDAP-Server/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-perl/Net-LDAPapi/metadata.xml b/dev-perl/Net-LDAPapi/metadata.xml
index af2fb93e808e..ac18561d928f 100644
--- a/dev-perl/Net-LDAPapi/metadata.xml
+++ b/dev-perl/Net-LDAPapi/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">net-ldapapi</remote-id>
     <remote-id type="cpan">Net-LDAPapi</remote-id>
diff --git a/dev-perl/Net-LibIDN/metadata.xml b/dev-perl/Net-LibIDN/metadata.xml
index b852d06792a5..cc799961d7fe 100644
--- a/dev-perl/Net-LibIDN/metadata.xml
+++ b/dev-perl/Net-LibIDN/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-LibIDN</remote-id>
     <remote-id type="cpan-module">Net::LibIDN</remote-id>
diff --git a/dev-perl/Net-Netmask/metadata.xml b/dev-perl/Net-Netmask/metadata.xml
index 74b22cef7899..6b9e5700fc39 100644
--- a/dev-perl/Net-Netmask/metadata.xml
+++ b/dev-perl/Net-Netmask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Netmask</remote-id>
     <remote-id type="cpan-module">Net::Netmask</remote-id>
diff --git a/dev-perl/Net-OAuth/metadata.xml b/dev-perl/Net-OAuth/metadata.xml
index cdd31e9b7fe0..9e229f8304a7 100644
--- a/dev-perl/Net-OAuth/metadata.xml
+++ b/dev-perl/Net-OAuth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-OAuth</remote-id>
     <remote-id type="cpan-module">Net::OAuth</remote-id>
diff --git a/dev-perl/Net-OpenID-Consumer/metadata.xml b/dev-perl/Net-OpenID-Consumer/metadata.xml
index 334d6da17850..5c708ae2cc20 100644
--- a/dev-perl/Net-OpenID-Consumer/metadata.xml
+++ b/dev-perl/Net-OpenID-Consumer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-OpenID-Consumer</remote-id>
     <remote-id type="cpan-module">Net::OpenID::Association</remote-id>
diff --git a/dev-perl/Net-OpenSSH/metadata.xml b/dev-perl/Net-OpenSSH/metadata.xml
index 4cb17ad1b30d..65fedbf9691f 100644
--- a/dev-perl/Net-OpenSSH/metadata.xml
+++ b/dev-perl/Net-OpenSSH/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-OpenSSH</remote-id>
     <remote-id type="cpan-module">Net::OpenSSH</remote-id>
diff --git a/dev-perl/Net-Patricia/metadata.xml b/dev-perl/Net-Patricia/metadata.xml
index 0e917f20c2bf..342f16e666c5 100644
--- a/dev-perl/Net-Patricia/metadata.xml
+++ b/dev-perl/Net-Patricia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Patricia</remote-id>
     <remote-id type="cpan-module">Net::Patricia</remote-id>
diff --git a/dev-perl/Net-Pcap/metadata.xml b/dev-perl/Net-Pcap/metadata.xml
index 09ad0ec59c3b..e261f43f6651 100644
--- a/dev-perl/Net-Pcap/metadata.xml
+++ b/dev-perl/Net-Pcap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Pcap</remote-id>
     <remote-id type="cpan-module">Net::Pcap</remote-id>
diff --git a/dev-perl/Net-PcapUtils/metadata.xml b/dev-perl/Net-PcapUtils/metadata.xml
index 00b23e91b654..6cbf96dee7a0 100644
--- a/dev-perl/Net-PcapUtils/metadata.xml
+++ b/dev-perl/Net-PcapUtils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-PcapUtils</remote-id>
     <remote-id type="cpan-module">Net::PcapUtils</remote-id>
diff --git a/dev-perl/Net-RBLClient/metadata.xml b/dev-perl/Net-RBLClient/metadata.xml
index 3f166efd9ad9..f83890b84187 100644
--- a/dev-perl/Net-RBLClient/metadata.xml
+++ b/dev-perl/Net-RBLClient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-RBLClient</remote-id>
     <remote-id type="cpan-module">Net::RBLClient</remote-id>
diff --git a/dev-perl/Net-RawIP/metadata.xml b/dev-perl/Net-RawIP/metadata.xml
index 02e7b40fc9bb..50c615aa1eb6 100644
--- a/dev-perl/Net-RawIP/metadata.xml
+++ b/dev-perl/Net-RawIP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-RawIP</remote-id>
     <remote-id type="cpan-module">Net::RawIP</remote-id>
diff --git a/dev-perl/Net-SFTP-Foreign/metadata.xml b/dev-perl/Net-SFTP-Foreign/metadata.xml
index 639f680c0ff4..da6b73d7eb6b 100644
--- a/dev-perl/Net-SFTP-Foreign/metadata.xml
+++ b/dev-perl/Net-SFTP-Foreign/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SFTP-Foreign</remote-id>
     <remote-id type="cpan-module">Net::SFTP::Foreign</remote-id>
diff --git a/dev-perl/Net-SMTP-SSL/metadata.xml b/dev-perl/Net-SMTP-SSL/metadata.xml
index 91ca28d5b125..879e917c5bad 100644
--- a/dev-perl/Net-SMTP-SSL/metadata.xml
+++ b/dev-perl/Net-SMTP-SSL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SMTP-SSL</remote-id>
     <remote-id type="cpan-module">Net::SMTP::SSL</remote-id>
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/metadata.xml b/dev-perl/Net-SMTP-TLS-ButMaintained/metadata.xml
index dd7e53e6e043..cb4771481a3a 100644
--- a/dev-perl/Net-SMTP-TLS-ButMaintained/metadata.xml
+++ b/dev-perl/Net-SMTP-TLS-ButMaintained/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Net-SMTP-TLS-ButMaintained</remote-id>
 		<remote-id type="cpan-module">Net::SMTP::TLS::ButMaintained</remote-id>
diff --git a/dev-perl/Net-SMTP-TLS/metadata.xml b/dev-perl/Net-SMTP-TLS/metadata.xml
index 28aeffb5dadd..9a287b0551fa 100644
--- a/dev-perl/Net-SMTP-TLS/metadata.xml
+++ b/dev-perl/Net-SMTP-TLS/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SMTP-TLS</remote-id>
     <remote-id type="cpan-module">Net::SMTP::TLS</remote-id>
diff --git a/dev-perl/Net-SMTPS/metadata.xml b/dev-perl/Net-SMTPS/metadata.xml
index 7a04efa0e552..ab291e2cc349 100644
--- a/dev-perl/Net-SMTPS/metadata.xml
+++ b/dev-perl/Net-SMTPS/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SMTPS</remote-id>
     <remote-id type="cpan-module">Net::SMTPS</remote-id>
diff --git a/dev-perl/Net-SNMP/metadata.xml b/dev-perl/Net-SNMP/metadata.xml
index 6b4327416c05..58e0260c7418 100644
--- a/dev-perl/Net-SNMP/metadata.xml
+++ b/dev-perl/Net-SNMP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SNMP</remote-id>
     <remote-id type="cpan-module">Net::SNMP</remote-id>
diff --git a/dev-perl/Net-SNPP/metadata.xml b/dev-perl/Net-SNPP/metadata.xml
index 6bd58065f457..3b1873a5fff5 100644
--- a/dev-perl/Net-SNPP/metadata.xml
+++ b/dev-perl/Net-SNPP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SNPP</remote-id>
     <remote-id type="cpan-module">Net::SNPP</remote-id>
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml b/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
index 18eb0be0d225..c53c4d41bb55 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SSH-AuthorizedKeysFile</remote-id>
     <remote-id type="cpan-module">Net::SSH::AuthorizedKey</remote-id>
diff --git a/dev-perl/Net-SSH2/metadata.xml b/dev-perl/Net-SSH2/metadata.xml
index 790764845120..e437fd03e508 100644
--- a/dev-perl/Net-SSH2/metadata.xml
+++ b/dev-perl/Net-SSH2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="gcrypt">Use libgcrypt instead of openssl</flag>
   </use>
diff --git a/dev-perl/Net-SSLeay/metadata.xml b/dev-perl/Net-SSLeay/metadata.xml
index 42960496c61c..e9d8182dc968 100644
--- a/dev-perl/Net-SSLeay/metadata.xml
+++ b/dev-perl/Net-SSLeay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SSLeay</remote-id>
     <remote-id type="cpan-module">Net::SSLeay</remote-id>
diff --git a/dev-perl/Net-Server-Coro/metadata.xml b/dev-perl/Net-Server-Coro/metadata.xml
index cd919028c58b..779cb5f8a31b 100644
--- a/dev-perl/Net-Server-Coro/metadata.xml
+++ b/dev-perl/Net-Server-Coro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Server-Coro</remote-id>
     <remote-id type="cpan-module">Net::Server::Coro</remote-id>
diff --git a/dev-perl/Net-Server-Mail/metadata.xml b/dev-perl/Net-Server-Mail/metadata.xml
index 148869095784..b424080c6b94 100644
--- a/dev-perl/Net-Server-Mail/metadata.xml
+++ b/dev-perl/Net-Server-Mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Net-Server-Mail</remote-id>
 		<remote-id type="cpan-module">Net::Server::Mail</remote-id>
diff --git a/dev-perl/Net-Subnet/metadata.xml b/dev-perl/Net-Subnet/metadata.xml
index 05a8c1807054..0b6ba14504b3 100644
--- a/dev-perl/Net-Subnet/metadata.xml
+++ b/dev-perl/Net-Subnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Subnet</remote-id>
   </upstream>
diff --git a/dev-perl/Net-Telnet-Cisco/metadata.xml b/dev-perl/Net-Telnet-Cisco/metadata.xml
index 9ce9b82c7d99..f0f43990c6f1 100644
--- a/dev-perl/Net-Telnet-Cisco/metadata.xml
+++ b/dev-perl/Net-Telnet-Cisco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Telnet-Cisco</remote-id>
     <remote-id type="cpan-module">Net::Telnet::Cisco</remote-id>
diff --git a/dev-perl/Net-Telnet/metadata.xml b/dev-perl/Net-Telnet/metadata.xml
index 65e79d5f58e1..bd16d221586f 100644
--- a/dev-perl/Net-Telnet/metadata.xml
+++ b/dev-perl/Net-Telnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Telnet</remote-id>
     <remote-id type="cpan-module">Net::Telnet</remote-id>
diff --git a/dev-perl/Net-Trackback/metadata.xml b/dev-perl/Net-Trackback/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Net-Trackback/metadata.xml
+++ b/dev-perl/Net-Trackback/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Net-Twitter/metadata.xml b/dev-perl/Net-Twitter/metadata.xml
index 83301c79d35c..71e6788b2f97 100644
--- a/dev-perl/Net-Twitter/metadata.xml
+++ b/dev-perl/Net-Twitter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Twitter</remote-id>
     <remote-id type="cpan-module">Net::Identica</remote-id>
diff --git a/dev-perl/Net-UPnP/metadata.xml b/dev-perl/Net-UPnP/metadata.xml
index c95dca8ec581..5f3c710b36fc 100644
--- a/dev-perl/Net-UPnP/metadata.xml
+++ b/dev-perl/Net-UPnP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-UPnP</remote-id>
     <remote-id type="cpan-module">Net::UPnP</remote-id>
diff --git a/dev-perl/Net-Whois-IP/metadata.xml b/dev-perl/Net-Whois-IP/metadata.xml
index 3c29b85f4022..a826a4d79e95 100644
--- a/dev-perl/Net-Whois-IP/metadata.xml
+++ b/dev-perl/Net-Whois-IP/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-perl/Net-XMPP/metadata.xml b/dev-perl/Net-XMPP/metadata.xml
index 6b331c63038e..cb9cf7230ca2 100644
--- a/dev-perl/Net-XMPP/metadata.xml
+++ b/dev-perl/Net-XMPP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Net::XMPP is a collection of Perl modules that provide a Perl Developer access to the XMPP protocol.</longdescription>
   <upstream>
     <remote-id type="cpan">Net-XMPP</remote-id>
diff --git a/dev-perl/Net-Z3950-ZOOM/metadata.xml b/dev-perl/Net-Z3950-ZOOM/metadata.xml
index cf2d5d8916f4..cfbd9eea1f2a 100644
--- a/dev-perl/Net-Z3950-ZOOM/metadata.xml
+++ b/dev-perl/Net-Z3950-ZOOM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Z3950-ZOOM</remote-id>
     <remote-id type="cpan-module">Net::Z3950</remote-id>
diff --git a/dev-perl/NetAddr-IP/metadata.xml b/dev-perl/NetAddr-IP/metadata.xml
index 0151b74aa9da..34ae341d2ca0 100644
--- a/dev-perl/NetAddr-IP/metadata.xml
+++ b/dev-perl/NetAddr-IP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">NetAddr-IP</remote-id>
     <remote-id type="cpan-module">NetAddr::IP</remote-id>
diff --git a/dev-perl/NetPacket/metadata.xml b/dev-perl/NetPacket/metadata.xml
index 8331404a849a..0b58645f3692 100644
--- a/dev-perl/NetPacket/metadata.xml
+++ b/dev-perl/NetPacket/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">NetPacket</remote-id>
     <remote-id type="cpan-module">NetPacket</remote-id>
diff --git a/dev-perl/NetxAP/metadata.xml b/dev-perl/NetxAP/metadata.xml
index 9762908080f9..b343ea34e73f 100644
--- a/dev-perl/NetxAP/metadata.xml
+++ b/dev-perl/NetxAP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">NetxAP</remote-id>
     <remote-id type="cpan-module">Net::IMAP</remote-id>
diff --git a/dev-perl/News-Newsrc/metadata.xml b/dev-perl/News-Newsrc/metadata.xml
index 9bf5fa54fcff..9df23a25051a 100644
--- a/dev-perl/News-Newsrc/metadata.xml
+++ b/dev-perl/News-Newsrc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">News-Newsrc</remote-id>
     <remote-id type="cpan-module">News::Newsrc</remote-id>
diff --git a/dev-perl/Nmap-Parser/metadata.xml b/dev-perl/Nmap-Parser/metadata.xml
index be22f134a6e3..bb0622c2c7a3 100644
--- a/dev-perl/Nmap-Parser/metadata.xml
+++ b/dev-perl/Nmap-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Nmap-Parser</remote-id>
     <remote-id type="cpan-module">Nmap::Parser</remote-id>
diff --git a/dev-perl/Number-Compare/metadata.xml b/dev-perl/Number-Compare/metadata.xml
index 18b0ee9d94fe..560d5547911e 100644
--- a/dev-perl/Number-Compare/metadata.xml
+++ b/dev-perl/Number-Compare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Number-Compare</remote-id>
     <remote-id type="cpan-module">Number::Compare</remote-id>
diff --git a/dev-perl/Number-Format/metadata.xml b/dev-perl/Number-Format/metadata.xml
index 14d4d7882042..9382c052cbe0 100644
--- a/dev-perl/Number-Format/metadata.xml
+++ b/dev-perl/Number-Format/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Number-Format</remote-id>
     <remote-id type="cpan-module">Number::Format</remote-id>
diff --git a/dev-perl/OLE-StorageLite/metadata.xml b/dev-perl/OLE-StorageLite/metadata.xml
index c80ee84c7261..d613092bcbdd 100644
--- a/dev-perl/OLE-StorageLite/metadata.xml
+++ b/dev-perl/OLE-StorageLite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">OLE-Storage_Lite</remote-id>
     <remote-id type="cpan-module">OLE::Storage_Lite</remote-id>
diff --git a/dev-perl/OOTools/metadata.xml b/dev-perl/OOTools/metadata.xml
index 4bfd66a3d1dc..d4f18be5ffab 100644
--- a/dev-perl/OOTools/metadata.xml
+++ b/dev-perl/OOTools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">OOTools</remote-id>
   </upstream>
diff --git a/dev-perl/ORLite-Migrate/metadata.xml b/dev-perl/ORLite-Migrate/metadata.xml
index e0f4bda3a961..9bedc9885ff4 100644
--- a/dev-perl/ORLite-Migrate/metadata.xml
+++ b/dev-perl/ORLite-Migrate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ORLite-Migrate</remote-id>
     <remote-id type="cpan-module">ORLite::Migrate</remote-id>
diff --git a/dev-perl/ORLite/metadata.xml b/dev-perl/ORLite/metadata.xml
index da969787eee4..9734340aaabd 100644
--- a/dev-perl/ORLite/metadata.xml
+++ b/dev-perl/ORLite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ORLite</remote-id>
     <remote-id type="cpan-module">ORLite</remote-id>
diff --git a/dev-perl/Object-Enum/metadata.xml b/dev-perl/Object-Enum/metadata.xml
index 6abe29044dd5..0d6400aa62de 100644
--- a/dev-perl/Object-Enum/metadata.xml
+++ b/dev-perl/Object-Enum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Object-Enum</remote-id>
     <remote-id type="cpan-module">Object::Enum</remote-id>
diff --git a/dev-perl/Object-MultiType/metadata.xml b/dev-perl/Object-MultiType/metadata.xml
index 3d315126c00e..9b8c29e2da8e 100644
--- a/dev-perl/Object-MultiType/metadata.xml
+++ b/dev-perl/Object-MultiType/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Object-MultiType</remote-id>
                 <remote-id type="cpan-module">Object::MultiType</remote-id>
diff --git a/dev-perl/Object-Realize-Later/metadata.xml b/dev-perl/Object-Realize-Later/metadata.xml
index 2278d7e459c8..c0d9b1df5da2 100644
--- a/dev-perl/Object-Realize-Later/metadata.xml
+++ b/dev-perl/Object-Realize-Later/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Object-Realize-Later</remote-id>
     <remote-id type="cpan-module">Object::Realize::Later</remote-id>
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml b/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
index 48b91733a5fb..3599c1d1749f 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Ogg-Vorbis-Header-PurePerl</remote-id>
     <remote-id type="cpan-module">Ogg::Vorbis::Header::PurePerl</remote-id>
diff --git a/dev-perl/Olson-Abbreviations/metadata.xml b/dev-perl/Olson-Abbreviations/metadata.xml
index 615b13636f79..c202d78254e7 100644
--- a/dev-perl/Olson-Abbreviations/metadata.xml
+++ b/dev-perl/Olson-Abbreviations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Olson-Abbreviations</remote-id>
     <remote-id type="cpan-module">Olson::Abbreviations</remote-id>
diff --git a/dev-perl/OpenGL/metadata.xml b/dev-perl/OpenGL/metadata.xml
index 51d5a0502876..4ba229b761c7 100644
--- a/dev-perl/OpenGL/metadata.xml
+++ b/dev-perl/OpenGL/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>perl</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
 <longdescription lang="en">
   OpenGL is a Perl module that provides an interface to most of Open Graphics
   Library, API versions 1.0, 1.1 and 1.2. There is full support for the Utility
diff --git a/dev-perl/PAR-Dist/metadata.xml b/dev-perl/PAR-Dist/metadata.xml
index 0e96f12ce270..665a895dd735 100644
--- a/dev-perl/PAR-Dist/metadata.xml
+++ b/dev-perl/PAR-Dist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PAR-Dist</remote-id>
     <remote-id type="cpan-module">PAR::Dist</remote-id>
diff --git a/dev-perl/PAR/metadata.xml b/dev-perl/PAR/metadata.xml
index 922c0e2a0132..3d65375f92a1 100644
--- a/dev-perl/PAR/metadata.xml
+++ b/dev-perl/PAR/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PAR</remote-id>
     <remote-id type="cpan-module">PAR</remote-id>
diff --git a/dev-perl/PBKDF2-Tiny/metadata.xml b/dev-perl/PBKDF2-Tiny/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/PBKDF2-Tiny/metadata.xml
+++ b/dev-perl/PBKDF2-Tiny/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/PBS-Client/metadata.xml b/dev-perl/PBS-Client/metadata.xml
index 538f1a07c511..4c48fb9f55f5 100644
--- a/dev-perl/PBS-Client/metadata.xml
+++ b/dev-perl/PBS-Client/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PBS-Client</remote-id>
     <remote-id type="cpan-module">PBS::Client</remote-id>
diff --git a/dev-perl/PDF-API2/metadata.xml b/dev-perl/PDF-API2/metadata.xml
index d907bf30078a..dd724ed051eb 100644
--- a/dev-perl/PDF-API2/metadata.xml
+++ b/dev-perl/PDF-API2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PDF-API2</remote-id>
     <remote-id type="cpan-module">PDF::API2</remote-id>
diff --git a/dev-perl/PDF-Create/metadata.xml b/dev-perl/PDF-Create/metadata.xml
index b22b8f285767..8e99e6766089 100644
--- a/dev-perl/PDF-Create/metadata.xml
+++ b/dev-perl/PDF-Create/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PDF-Create</remote-id>
     <remote-id type="cpan-module">PDF::Create</remote-id>
diff --git a/dev-perl/PDL/metadata.xml b/dev-perl/PDL/metadata.xml
index 25f13ee54dc2..1db7d8ec93fb 100644
--- a/dev-perl/PDL/metadata.xml
+++ b/dev-perl/PDL/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
  The Perl Data Language  gives standard perl the ability to compactly
  store and speedily manipulate the large N-dimensional data arrays 
diff --git a/dev-perl/PGPLOT/metadata.xml b/dev-perl/PGPLOT/metadata.xml
index 1424466eeaf4..aa3ac5c59b8b 100644
--- a/dev-perl/PGPLOT/metadata.xml
+++ b/dev-perl/PGPLOT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PGPLOT</remote-id>
     <remote-id type="cpan-module">PGPLOT</remote-id>
diff --git a/dev-perl/PHP-Serialization/metadata.xml b/dev-perl/PHP-Serialization/metadata.xml
index a17a18553a7d..7eb7c94cb16e 100644
--- a/dev-perl/PHP-Serialization/metadata.xml
+++ b/dev-perl/PHP-Serialization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PHP-Serialization</remote-id>
     <remote-id type="cpan-module">PHP::Serialization</remote-id>
diff --git a/dev-perl/POE-API-Peek/metadata.xml b/dev-perl/POE-API-Peek/metadata.xml
index c9572a3d98e9..d92d85fab137 100644
--- a/dev-perl/POE-API-Peek/metadata.xml
+++ b/dev-perl/POE-API-Peek/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-API-Peek</remote-id>
     <remote-id type="cpan-module">POE::API::Peek</remote-id>
diff --git a/dev-perl/POE-Component-Client-DNS/metadata.xml b/dev-perl/POE-Component-Client-DNS/metadata.xml
index a7d1ac58f3d4..7b354196007e 100644
--- a/dev-perl/POE-Component-Client-DNS/metadata.xml
+++ b/dev-perl/POE-Component-Client-DNS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">POE-Component-Client-DNS</remote-id>
                 <remote-id type="cpan-module">POE::Component::Client::DNS</remote-id>
diff --git a/dev-perl/POE-Component-Client-Keepalive/metadata.xml b/dev-perl/POE-Component-Client-Keepalive/metadata.xml
index 4a9d1e01590b..221731cd072f 100644
--- a/dev-perl/POE-Component-Client-Keepalive/metadata.xml
+++ b/dev-perl/POE-Component-Client-Keepalive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">POE-Component-Client-Keepalive</remote-id>
                 <remote-id type="cpan-module">POE::Component::Client::Keepalive</remote-id>
diff --git a/dev-perl/POE-Component-IKC/metadata.xml b/dev-perl/POE-Component-IKC/metadata.xml
index 49214624963a..9fc08392e928 100644
--- a/dev-perl/POE-Component-IKC/metadata.xml
+++ b/dev-perl/POE-Component-IKC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Component-IKC</remote-id>
     <remote-id type="cpan-module">POE::Component::IKC</remote-id>
diff --git a/dev-perl/POE-Component-PreforkDispatch/metadata.xml b/dev-perl/POE-Component-PreforkDispatch/metadata.xml
index de5fbdf4b0c9..242ed36dd964 100644
--- a/dev-perl/POE-Component-PreforkDispatch/metadata.xml
+++ b/dev-perl/POE-Component-PreforkDispatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Component-PreforkDispatch</remote-id>
     <remote-id type="cpan-module">POE::Component::PreforkDispatch</remote-id>
diff --git a/dev-perl/POE-Component-Resolver/metadata.xml b/dev-perl/POE-Component-Resolver/metadata.xml
index 915078f0347b..f881b8db9ca6 100644
--- a/dev-perl/POE-Component-Resolver/metadata.xml
+++ b/dev-perl/POE-Component-Resolver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">POE-Component-Resolver</remote-id>
                 <remote-id type="cpan-module">POE::Component::Resolver</remote-id>
diff --git a/dev-perl/POE-Test-Loops/metadata.xml b/dev-perl/POE-Test-Loops/metadata.xml
index 7f269c93081f..27e80c503887 100644
--- a/dev-perl/POE-Test-Loops/metadata.xml
+++ b/dev-perl/POE-Test-Loops/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Test-Loops</remote-id>
     <remote-id type="cpan-module">DynamicStates</remote-id>
diff --git a/dev-perl/POE-XS-Loop-EPoll/metadata.xml b/dev-perl/POE-XS-Loop-EPoll/metadata.xml
index c2df9a5e1af1..de9cc965d56e 100644
--- a/dev-perl/POE-XS-Loop-EPoll/metadata.xml
+++ b/dev-perl/POE-XS-Loop-EPoll/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Loop-EPoll</remote-id>
     <remote-id type="cpan-module">POE::XS::Loop::EPoll</remote-id>
diff --git a/dev-perl/POE-XS-Loop-Poll/metadata.xml b/dev-perl/POE-XS-Loop-Poll/metadata.xml
index 3fcc40b1e7aa..994b7e03f834 100644
--- a/dev-perl/POE-XS-Loop-Poll/metadata.xml
+++ b/dev-perl/POE-XS-Loop-Poll/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Loop-Poll</remote-id>
     <remote-id type="cpan-module">POE::XS::Loop::Poll</remote-id>
diff --git a/dev-perl/POE-XS-Queue-Array/metadata.xml b/dev-perl/POE-XS-Queue-Array/metadata.xml
index 97cec9f030a0..3ce15edb6e37 100644
--- a/dev-perl/POE-XS-Queue-Array/metadata.xml
+++ b/dev-perl/POE-XS-Queue-Array/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Queue-Array</remote-id>
     <remote-id type="cpan-module">POE::XS::Queue::Array</remote-id>
diff --git a/dev-perl/POE/metadata.xml b/dev-perl/POE/metadata.xml
index fd8df7677861..efa3daef05a2 100644
--- a/dev-perl/POE/metadata.xml
+++ b/dev-perl/POE/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">POE</remote-id>
     <remote-id type="cpan-module">POE</remote-id>
diff --git a/dev-perl/POSIX-strftime-Compiler/metadata.xml b/dev-perl/POSIX-strftime-Compiler/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/POSIX-strftime-Compiler/metadata.xml
+++ b/dev-perl/POSIX-strftime-Compiler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/PPI-PowerToys/metadata.xml b/dev-perl/PPI-PowerToys/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/PPI-PowerToys/metadata.xml
+++ b/dev-perl/PPI-PowerToys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/PPI/metadata.xml b/dev-perl/PPI/metadata.xml
index 627f2b47345b..6ebb00692e95 100644
--- a/dev-perl/PPI/metadata.xml
+++ b/dev-perl/PPI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PPI</remote-id>
     <remote-id type="cpan-module">PPI</remote-id>
diff --git a/dev-perl/PPIx-EditorTools/metadata.xml b/dev-perl/PPIx-EditorTools/metadata.xml
index 61cb72cde726..7aa8c10889ad 100644
--- a/dev-perl/PPIx-EditorTools/metadata.xml
+++ b/dev-perl/PPIx-EditorTools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PPIx-EditorTools</remote-id>
     <remote-id type="cpan-module">PPIx::EditorTools</remote-id>
diff --git a/dev-perl/PPIx-Regexp/metadata.xml b/dev-perl/PPIx-Regexp/metadata.xml
index 483e0b6a0de1..08f05f8f8d1d 100644
--- a/dev-perl/PPIx-Regexp/metadata.xml
+++ b/dev-perl/PPIx-Regexp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PPIx-Regexp</remote-id>
     <remote-id type="cpan-module">PPIx::Regexp</remote-id>
diff --git a/dev-perl/PPIx-Utilities/metadata.xml b/dev-perl/PPIx-Utilities/metadata.xml
index fb59146ea463..8bcc8ccd7588 100644
--- a/dev-perl/PPIx-Utilities/metadata.xml
+++ b/dev-perl/PPIx-Utilities/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PPIx-Utilities</remote-id>
     <remote-id type="cpan-module">PPIx::Utilities</remote-id>
diff --git a/dev-perl/Package-DeprecationManager/metadata.xml b/dev-perl/Package-DeprecationManager/metadata.xml
index 06efa761bffa..06a2cc1a78af 100644
--- a/dev-perl/Package-DeprecationManager/metadata.xml
+++ b/dev-perl/Package-DeprecationManager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Package-DeprecationManager</remote-id>
     <remote-id type="cpan-module">Package::DeprecationManager</remote-id>
diff --git a/dev-perl/Package-Stash-XS/metadata.xml b/dev-perl/Package-Stash-XS/metadata.xml
index 63dfddfeb966..f67ef64db0c5 100644
--- a/dev-perl/Package-Stash-XS/metadata.xml
+++ b/dev-perl/Package-Stash-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Package-Stash-XS</remote-id>
     <remote-id type="cpan-module">Package::Stash::XS</remote-id>
diff --git a/dev-perl/Package-Stash/metadata.xml b/dev-perl/Package-Stash/metadata.xml
index 48461dc56cbb..4785870697df 100644
--- a/dev-perl/Package-Stash/metadata.xml
+++ b/dev-perl/Package-Stash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Package-Stash</remote-id>
     <remote-id type="cpan-module">Package::Stash</remote-id>
diff --git a/dev-perl/Package-Variant/metadata.xml b/dev-perl/Package-Variant/metadata.xml
index d481e5a9b4d8..4d2b76a4487a 100644
--- a/dev-perl/Package-Variant/metadata.xml
+++ b/dev-perl/Package-Variant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Package-Variant</remote-id>
 		<remote-id type="cpan-module">Package::Variant</remote-id>
diff --git a/dev-perl/PadWalker/metadata.xml b/dev-perl/PadWalker/metadata.xml
index 48b618fb4f94..d4124c0149cd 100644
--- a/dev-perl/PadWalker/metadata.xml
+++ b/dev-perl/PadWalker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PadWalker</remote-id>
     <remote-id type="cpan-module">PadWalker</remote-id>
diff --git a/dev-perl/Pango/metadata.xml b/dev-perl/Pango/metadata.xml
index 1f8694134a39..50a785832cb2 100644
--- a/dev-perl/Pango/metadata.xml
+++ b/dev-perl/Pango/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pango</remote-id>
     <remote-id type="cpan-module">Pango</remote-id>
diff --git a/dev-perl/Panotools-Script/metadata.xml b/dev-perl/Panotools-Script/metadata.xml
index 5acc23760f5d..ca34c56140a4 100644
--- a/dev-perl/Panotools-Script/metadata.xml
+++ b/dev-perl/Panotools-Script/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="gui">
 			Installs GUIs for some tools
diff --git a/dev-perl/ParaDNS/metadata.xml b/dev-perl/ParaDNS/metadata.xml
index d8e0894880a9..f41c0e55737f 100644
--- a/dev-perl/ParaDNS/metadata.xml
+++ b/dev-perl/ParaDNS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ParaDNS</remote-id>
     <remote-id type="cpan-module">ParaDNS</remote-id>
diff --git a/dev-perl/Parallel-ForkManager/metadata.xml b/dev-perl/Parallel-ForkManager/metadata.xml
index c02239edb6c4..848980272eeb 100644
--- a/dev-perl/Parallel-ForkManager/metadata.xml
+++ b/dev-perl/Parallel-ForkManager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parallel-ForkManager</remote-id>
     <remote-id type="cpan-module">Parallel::ForkManager</remote-id>
diff --git a/dev-perl/Parallel-Prefork/metadata.xml b/dev-perl/Parallel-Prefork/metadata.xml
index 219d365a4fcb..e6eed8ed9ee3 100644
--- a/dev-perl/Parallel-Prefork/metadata.xml
+++ b/dev-perl/Parallel-Prefork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parallel-Prefork</remote-id>
     <remote-id type="cpan-module">Parallel::Prefork</remote-id>
diff --git a/dev-perl/Params-Classify/metadata.xml b/dev-perl/Params-Classify/metadata.xml
index 9d536a4fe0fb..88b6247a1891 100644
--- a/dev-perl/Params-Classify/metadata.xml
+++ b/dev-perl/Params-Classify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Params-Classify</remote-id>
         <remote-id type="cpan-module">Params::Classify</remote-id>
diff --git a/dev-perl/Params-Util/metadata.xml b/dev-perl/Params-Util/metadata.xml
index 983e05c2a9ac..ebf5ef1b0c42 100644
--- a/dev-perl/Params-Util/metadata.xml
+++ b/dev-perl/Params-Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Params-Util</remote-id>
     <remote-id type="cpan-module">Params::Util</remote-id>
diff --git a/dev-perl/Params-Validate/metadata.xml b/dev-perl/Params-Validate/metadata.xml
index 1325b9add2da..572ed65d15ec 100644
--- a/dev-perl/Params-Validate/metadata.xml
+++ b/dev-perl/Params-Validate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Params-Validate</remote-id>
     <remote-id type="cpan-module">Attribute::Params::Validate</remote-id>
diff --git a/dev-perl/Parse-ErrorString-Perl/metadata.xml b/dev-perl/Parse-ErrorString-Perl/metadata.xml
index 89715d46a7a1..30d9ee6a8af4 100644
--- a/dev-perl/Parse-ErrorString-Perl/metadata.xml
+++ b/dev-perl/Parse-ErrorString-Perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-ErrorString-Perl</remote-id>
     <remote-id type="cpan-module">Parse::ErrorString::Perl</remote-id>
diff --git a/dev-perl/Parse-ExuberantCTags/metadata.xml b/dev-perl/Parse-ExuberantCTags/metadata.xml
index 58819590ea76..02e8e8767db9 100644
--- a/dev-perl/Parse-ExuberantCTags/metadata.xml
+++ b/dev-perl/Parse-ExuberantCTags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-ExuberantCTags</remote-id>
     <remote-id type="cpan-module">Parse::ExuberantCTags</remote-id>
diff --git a/dev-perl/Parse-RecDescent/metadata.xml b/dev-perl/Parse-RecDescent/metadata.xml
index d48552cf87e0..e1e8af038ce0 100644
--- a/dev-perl/Parse-RecDescent/metadata.xml
+++ b/dev-perl/Parse-RecDescent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-RecDescent</remote-id>
     <remote-id type="cpan-module">Parse::RecDescent</remote-id>
diff --git a/dev-perl/Parse-Syslog/metadata.xml b/dev-perl/Parse-Syslog/metadata.xml
index 260067269a61..b47ca7e01f50 100644
--- a/dev-perl/Parse-Syslog/metadata.xml
+++ b/dev-perl/Parse-Syslog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-Syslog</remote-id>
     <remote-id type="cpan-module">Parse::Syslog</remote-id>
diff --git a/dev-perl/Parse-Yapp/metadata.xml b/dev-perl/Parse-Yapp/metadata.xml
index 0dfccacb21e2..f0d12acd75ba 100644
--- a/dev-perl/Parse-Yapp/metadata.xml
+++ b/dev-perl/Parse-Yapp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-Yapp</remote-id>
     <remote-id type="cpan-module">Parse::Yapp</remote-id>
diff --git a/dev-perl/Passwd-Linux/metadata.xml b/dev-perl/Passwd-Linux/metadata.xml
index d84058c83ef7..717d3560526b 100644
--- a/dev-perl/Passwd-Linux/metadata.xml
+++ b/dev-perl/Passwd-Linux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Passwd-Linux</remote-id>
     <remote-id type="cpan-module">Passwd::Linux</remote-id>
diff --git a/dev-perl/PatchReader/metadata.xml b/dev-perl/PatchReader/metadata.xml
index 94fe8edcdf1a..be6860e56187 100644
--- a/dev-perl/PatchReader/metadata.xml
+++ b/dev-perl/PatchReader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PatchReader</remote-id>
     <remote-id type="cpan-module">PatchReader</remote-id>
diff --git a/dev-perl/Path-Class/metadata.xml b/dev-perl/Path-Class/metadata.xml
index 83875e0fe861..150ac89c7aa8 100644
--- a/dev-perl/Path-Class/metadata.xml
+++ b/dev-perl/Path-Class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Path-Class</remote-id>
     <remote-id type="cpan-module">Path::Class</remote-id>
diff --git a/dev-perl/Path-Tiny/metadata.xml b/dev-perl/Path-Tiny/metadata.xml
index 963e8ddcd494..dc3f3b2818f9 100644
--- a/dev-perl/Path-Tiny/metadata.xml
+++ b/dev-perl/Path-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
 <remote-id type="cpan">Path-Tiny</remote-id>
 <remote-id type="cpan-module">Path::Tiny</remote-id>
diff --git a/dev-perl/Pegex/metadata.xml b/dev-perl/Pegex/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Pegex/metadata.xml
+++ b/dev-perl/Pegex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Period/metadata.xml b/dev-perl/Period/metadata.xml
index af3031e0ddc9..4bb395bda170 100644
--- a/dev-perl/Period/metadata.xml
+++ b/dev-perl/Period/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Period</remote-id>
     <remote-id type="cpan-module">Time::Period</remote-id>
diff --git a/dev-perl/Perl-Critic-Deprecated/metadata.xml b/dev-perl/Perl-Critic-Deprecated/metadata.xml
index 56e0becab002..0b6408fe2f87 100644
--- a/dev-perl/Perl-Critic-Deprecated/metadata.xml
+++ b/dev-perl/Perl-Critic-Deprecated/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Deprecated</remote-id>
 		<remote-id type="cpan-module">Perl::Critic::Deprecated</remote-id>
diff --git a/dev-perl/Perl-Critic-Dynamic/metadata.xml b/dev-perl/Perl-Critic-Dynamic/metadata.xml
index d7fcedc5b660..7197bd3bdcb0 100644
--- a/dev-perl/Perl-Critic-Dynamic/metadata.xml
+++ b/dev-perl/Perl-Critic-Dynamic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Dynamic</remote-id>
 		<remote-id type="cpan-module">Perl::Critic::Dynamic</remote-id>
diff --git a/dev-perl/Perl-Critic-Nits/metadata.xml b/dev-perl/Perl-Critic-Nits/metadata.xml
index 2305683265a3..f3f8b738c496 100644
--- a/dev-perl/Perl-Critic-Nits/metadata.xml
+++ b/dev-perl/Perl-Critic-Nits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Nits</remote-id>
 		<remote-id type="cpan-module">Perl::Critic::Nits</remote-id>
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
index c48b6daec64f..60e18d0302bc 100644
--- a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
+++ b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Policy-Dynamic-NoIndirect</remote-id>
 		<remote-id type="cpan-module">Perl::Critic::Policy::Dynamic::NoIndirect</remote-id>
diff --git a/dev-perl/Perl-Critic/metadata.xml b/dev-perl/Perl-Critic/metadata.xml
index 4773f26f513c..3b7413b90466 100644
--- a/dev-perl/Perl-Critic/metadata.xml
+++ b/dev-perl/Perl-Critic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Perl-Critic</remote-id>
     <remote-id type="cpan-module">Perl::Critic</remote-id>
diff --git a/dev-perl/Perl-Tags/metadata.xml b/dev-perl/Perl-Tags/metadata.xml
index beffa4a402be..ca6ef2182d07 100644
--- a/dev-perl/Perl-Tags/metadata.xml
+++ b/dev-perl/Perl-Tags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Perl-Tags</remote-id>
         <remote-id type="cpan-module">Perl::Tags</remote-id>
diff --git a/dev-perl/Perl-Unsafe-Signals/metadata.xml b/dev-perl/Perl-Unsafe-Signals/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Perl-Unsafe-Signals/metadata.xml
+++ b/dev-perl/Perl-Unsafe-Signals/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Perl6-Junction/metadata.xml b/dev-perl/Perl6-Junction/metadata.xml
index 480ffa4e999b..dfa6fc091bb1 100644
--- a/dev-perl/Perl6-Junction/metadata.xml
+++ b/dev-perl/Perl6-Junction/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Perl6-Junction</remote-id>
     <remote-id type="cpan-module">Perl6::Junction</remote-id>
diff --git a/dev-perl/PerlIO-Layers/metadata.xml b/dev-perl/PerlIO-Layers/metadata.xml
index 27a64213c90a..0843ba33a40c 100644
--- a/dev-perl/PerlIO-Layers/metadata.xml
+++ b/dev-perl/PerlIO-Layers/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>perl</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<maintainer>
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpan">PerlIO-Layers</remote-id>
   <remote-id type="cpan-module">PerlIO::Layers</remote-id>
diff --git a/dev-perl/PerlIO-eol/metadata.xml b/dev-perl/PerlIO-eol/metadata.xml
index 01efc66c0188..1e064e9edefd 100644
--- a/dev-perl/PerlIO-eol/metadata.xml
+++ b/dev-perl/PerlIO-eol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PerlIO-eol</remote-id>
     <remote-id type="cpan-module">PerlIO::eol</remote-id>
diff --git a/dev-perl/PerlIO-gzip/metadata.xml b/dev-perl/PerlIO-gzip/metadata.xml
index 29670eebc465..6c422fcbc6bb 100644
--- a/dev-perl/PerlIO-gzip/metadata.xml
+++ b/dev-perl/PerlIO-gzip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PerlIO-gzip</remote-id>
     <remote-id type="cpan-module">PerlIO::gzip</remote-id>
diff --git a/dev-perl/PerlIO-via-Timeout/metadata.xml b/dev-perl/PerlIO-via-Timeout/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/PerlIO-via-Timeout/metadata.xml
+++ b/dev-perl/PerlIO-via-Timeout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-via-dynamic/metadata.xml b/dev-perl/PerlIO-via-dynamic/metadata.xml
index 23d78baf7519..caf0532d9c04 100644
--- a/dev-perl/PerlIO-via-dynamic/metadata.xml
+++ b/dev-perl/PerlIO-via-dynamic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PerlIO-via-dynamic</remote-id>
     <remote-id type="cpan-module">PerlIO::via::dynamic</remote-id>
diff --git a/dev-perl/PerlIO-via-symlink/metadata.xml b/dev-perl/PerlIO-via-symlink/metadata.xml
index e47305237eb2..337a93a5a55f 100644
--- a/dev-perl/PerlIO-via-symlink/metadata.xml
+++ b/dev-perl/PerlIO-via-symlink/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PerlIO-via-symlink</remote-id>
     <remote-id type="cpan-module">PerlIO::via::symlink</remote-id>
diff --git a/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml b/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
index 55222e903fd8..e3c8cf8b0bb2 100644
--- a/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
+++ b/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Perlbal-XS-HTTPHeaders</remote-id>
     <remote-id type="cpan-module">Perlbal::XS::HTTPHeaders</remote-id>
diff --git a/dev-perl/Perlbal/metadata.xml b/dev-perl/Perlbal/metadata.xml
index e368a4c4c2df..467a74727e0b 100644
--- a/dev-perl/Perlbal/metadata.xml
+++ b/dev-perl/Perlbal/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Perlbal</remote-id>
     <remote-id type="cpan-module">PalImg</remote-id>
diff --git a/dev-perl/PlRPC/metadata.xml b/dev-perl/PlRPC/metadata.xml
index 1a59edd07e4e..e7ca9af612b4 100644
--- a/dev-perl/PlRPC/metadata.xml
+++ b/dev-perl/PlRPC/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PlRPC</remote-id>
     <remote-id type="cpan-module">Bundle::PlRPC</remote-id>
diff --git a/dev-perl/Plack/metadata.xml b/dev-perl/Plack/metadata.xml
index dd306b32d875..0af198038bdc 100644
--- a/dev-perl/Plack/metadata.xml
+++ b/dev-perl/Plack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Plack</remote-id>
     <remote-id type="cpan-module">HTTP::Message::PSGI</remote-id>
diff --git a/dev-perl/Plucene/metadata.xml b/dev-perl/Plucene/metadata.xml
index ac5208544539..90cac209dacf 100644
--- a/dev-perl/Plucene/metadata.xml
+++ b/dev-perl/Plucene/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Plucene</remote-id>
     <remote-id type="cpan-module">Plucene</remote-id>
diff --git a/dev-perl/Pod-Abstract/metadata.xml b/dev-perl/Pod-Abstract/metadata.xml
index 5dd361f898bf..ef1c48914b53 100644
--- a/dev-perl/Pod-Abstract/metadata.xml
+++ b/dev-perl/Pod-Abstract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Abstract</remote-id>
     <remote-id type="cpan-module">Pod::Abstract</remote-id>
diff --git a/dev-perl/Pod-Coverage/metadata.xml b/dev-perl/Pod-Coverage/metadata.xml
index 3567dffa018e..6e17f7eb643e 100644
--- a/dev-perl/Pod-Coverage/metadata.xml
+++ b/dev-perl/Pod-Coverage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Coverage</remote-id>
     <remote-id type="cpan-module">Pod::Coverage</remote-id>
diff --git a/dev-perl/Pod-LaTeX/metadata.xml b/dev-perl/Pod-LaTeX/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Pod-LaTeX/metadata.xml
+++ b/dev-perl/Pod-LaTeX/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Pod-POM/metadata.xml b/dev-perl/Pod-POM/metadata.xml
index d2a6faf41379..0aa7c642d2b2 100644
--- a/dev-perl/Pod-POM/metadata.xml
+++ b/dev-perl/Pod-POM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-POM</remote-id>
     <remote-id type="cpan-module">Pod::POM</remote-id>
diff --git a/dev-perl/Pod-Readme/metadata.xml b/dev-perl/Pod-Readme/metadata.xml
index e16b2fd62a5a..b6dd565f7e4a 100644
--- a/dev-perl/Pod-Readme/metadata.xml
+++ b/dev-perl/Pod-Readme/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>kentfredric@gmail.com</email>
     <name>Kent Fredric</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Readme</remote-id>
     <remote-id type="cpan-module">Pod::Readme</remote-id>
diff --git a/dev-perl/Pod-Spell/metadata.xml b/dev-perl/Pod-Spell/metadata.xml
index 348f945cb0e1..4244a4a9ea6f 100644
--- a/dev-perl/Pod-Spell/metadata.xml
+++ b/dev-perl/Pod-Spell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Pod-Spell</remote-id>
 	</upstream>
diff --git a/dev-perl/Pod-Strip/metadata.xml b/dev-perl/Pod-Strip/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Pod-Strip/metadata.xml
+++ b/dev-perl/Pod-Strip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Pod-Tests/metadata.xml b/dev-perl/Pod-Tests/metadata.xml
index 0c63bce07257..30b67763653e 100644
--- a/dev-perl/Pod-Tests/metadata.xml
+++ b/dev-perl/Pod-Tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Tests</remote-id>
     <remote-id type="cpan-module">Pod::Tests</remote-id>
diff --git a/dev-perl/PortageXS/metadata.xml b/dev-perl/PortageXS/metadata.xml
index c7043a52f96d..0209bac65dbd 100644
--- a/dev-perl/PortageXS/metadata.xml
+++ b/dev-perl/PortageXS/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>kentfredric@gmail.com</email>
 		<name>Kent Fredric</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">PortageXS</remote-id>
 		<remote-id type="cpan">PortageXS::Core</remote-id>
diff --git a/dev-perl/PostScript-Simple/metadata.xml b/dev-perl/PostScript-Simple/metadata.xml
index 9adb60d44d67..011df0f5513c 100644
--- a/dev-perl/PostScript-Simple/metadata.xml
+++ b/dev-perl/PostScript-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PostScript-Simple</remote-id>
     <remote-id type="cpan-module">PostScript::Simple</remote-id>
diff --git a/dev-perl/PostScript/metadata.xml b/dev-perl/PostScript/metadata.xml
index d57213544a51..93504c64c274 100644
--- a/dev-perl/PostScript/metadata.xml
+++ b/dev-perl/PostScript/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">PostScript</remote-id>
     <remote-id type="cpan-module">PostScript::Document</remote-id>
diff --git a/dev-perl/Probe-Perl/metadata.xml b/dev-perl/Probe-Perl/metadata.xml
index 0004601386a9..8a85a3374070 100644
--- a/dev-perl/Probe-Perl/metadata.xml
+++ b/dev-perl/Probe-Perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Probe-Perl</remote-id>
     <remote-id type="cpan-module">Probe::Perl</remote-id>
diff --git a/dev-perl/Proc-Background/metadata.xml b/dev-perl/Proc-Background/metadata.xml
index e5e3ed0a4ad1..de5605c717fe 100644
--- a/dev-perl/Proc-Background/metadata.xml
+++ b/dev-perl/Proc-Background/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-Background</remote-id>
     <remote-id type="cpan-module">Proc::Background</remote-id>
diff --git a/dev-perl/Proc-Daemon/metadata.xml b/dev-perl/Proc-Daemon/metadata.xml
index 5f8518feb9e3..684e9e9689ca 100644
--- a/dev-perl/Proc-Daemon/metadata.xml
+++ b/dev-perl/Proc-Daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-Daemon</remote-id>
     <remote-id type="cpan-module">Proc::Daemon</remote-id>
diff --git a/dev-perl/Proc-ProcessTable/metadata.xml b/dev-perl/Proc-ProcessTable/metadata.xml
index 32744df0d6f2..2634a79ba99a 100644
--- a/dev-perl/Proc-ProcessTable/metadata.xml
+++ b/dev-perl/Proc-ProcessTable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-ProcessTable</remote-id>
     <remote-id type="cpan-module">Proc::Killall</remote-id>
diff --git a/dev-perl/Proc-Simple/metadata.xml b/dev-perl/Proc-Simple/metadata.xml
index bba97ca325be..4fb937e44701 100644
--- a/dev-perl/Proc-Simple/metadata.xml
+++ b/dev-perl/Proc-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-Simple</remote-id>
     <remote-id type="cpan-module">Proc::Simple</remote-id>
diff --git a/dev-perl/Proc-Wait3/metadata.xml b/dev-perl/Proc-Wait3/metadata.xml
index 99768676d767..4cfc53497722 100644
--- a/dev-perl/Proc-Wait3/metadata.xml
+++ b/dev-perl/Proc-Wait3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-Wait3</remote-id>
     <remote-id type="cpan-module">Proc::Wait3</remote-id>
diff --git a/dev-perl/Proc-WaitStat/metadata.xml b/dev-perl/Proc-WaitStat/metadata.xml
index 088c05d589da..33b62e76385c 100644
--- a/dev-perl/Proc-WaitStat/metadata.xml
+++ b/dev-perl/Proc-WaitStat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Proc-WaitStat</remote-id>
     <remote-id type="cpan-module">Proc::WaitStat</remote-id>
diff --git a/dev-perl/Quota/metadata.xml b/dev-perl/Quota/metadata.xml
index fd3d3c617268..1d3cfb71e825 100644
--- a/dev-perl/Quota/metadata.xml
+++ b/dev-perl/Quota/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>c.affolter@stepping-stone.ch</email>
 		<name>Christian Affolter</name>
@@ -11,6 +10,10 @@
 		<email>dev-zero@gentoo.org</email>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 	<longdescription>The Quota module provides access to file system quotas. The quotactl system call or ioctl is used to query or set quotas on the local host, or queries are submitted via RPC to a remote host. Mount tables can be parsed with getmntent and paths can be translated to device files (or whatever the actual quotactl implementations needs as argument) of the according file system.</longdescription>
   <upstream>
     <remote-id type="cpan">Quota</remote-id>
diff --git a/dev-perl/REST-Client/metadata.xml b/dev-perl/REST-Client/metadata.xml
index 52ba8da24f41..2c23d96c197d 100644
--- a/dev-perl/REST-Client/metadata.xml
+++ b/dev-perl/REST-Client/metadata.xml
@@ -5,7 +5,10 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">REST-Client</remote-id>
     <remote-id type="cpan-module">REST::Client</remote-id>
diff --git a/dev-perl/RPC-XML/metadata.xml b/dev-perl/RPC-XML/metadata.xml
index bdb6e6df34e1..25b8713f5898 100644
--- a/dev-perl/RPC-XML/metadata.xml
+++ b/dev-perl/RPC-XML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">RPC-XML</remote-id>
     <remote-id type="cpan-module">Apache::RPC::Server</remote-id>
diff --git a/dev-perl/RRD-Simple/metadata.xml b/dev-perl/RRD-Simple/metadata.xml
index c0c2f26251f9..15e4e7c21cde 100644
--- a/dev-perl/RRD-Simple/metadata.xml
+++ b/dev-perl/RRD-Simple/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">RRD-Simple</remote-id>
     <remote-id type="cpan-module">RRD::Simple</remote-id>
diff --git a/dev-perl/RTF-Writer/metadata.xml b/dev-perl/RTF-Writer/metadata.xml
index 09b19fa9743f..e07dba876da4 100644
--- a/dev-perl/RTF-Writer/metadata.xml
+++ b/dev-perl/RTF-Writer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">RTF-Writer</remote-id>
     <remote-id type="cpan-module">RTF::Writer</remote-id>
diff --git a/dev-perl/RadiusPerl/metadata.xml b/dev-perl/RadiusPerl/metadata.xml
index a5e667e78563..f83c1d3270bc 100644
--- a/dev-perl/RadiusPerl/metadata.xml
+++ b/dev-perl/RadiusPerl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">RadiusPerl</remote-id>
     <remote-id type="cpan-module">Authen::Radius</remote-id>
diff --git a/dev-perl/Rcs/metadata.xml b/dev-perl/Rcs/metadata.xml
index 99eaf3d004d5..d3660ee622b0 100644
--- a/dev-perl/Rcs/metadata.xml
+++ b/dev-perl/Rcs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Rcs</remote-id>
     <remote-id type="cpan-module">Rcs</remote-id>
diff --git a/dev-perl/Readonly-XS/metadata.xml b/dev-perl/Readonly-XS/metadata.xml
index 73249c213242..8db06e0a7600 100644
--- a/dev-perl/Readonly-XS/metadata.xml
+++ b/dev-perl/Readonly-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Readonly-XS</remote-id>
     <remote-id type="cpan-module">Readonly::XS</remote-id>
diff --git a/dev-perl/Readonly/metadata.xml b/dev-perl/Readonly/metadata.xml
index 6cf12c0d0a24..f593264399d6 100644
--- a/dev-perl/Readonly/metadata.xml
+++ b/dev-perl/Readonly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Readonly</remote-id>
     <remote-id type="cpan-module">Readonly</remote-id>
diff --git a/dev-perl/Redis/metadata.xml b/dev-perl/Redis/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Redis/metadata.xml
+++ b/dev-perl/Redis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/RedisDB-Parser/metadata.xml b/dev-perl/RedisDB-Parser/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/RedisDB-Parser/metadata.xml
+++ b/dev-perl/RedisDB-Parser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/RedisDB/metadata.xml b/dev-perl/RedisDB/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/RedisDB/metadata.xml
+++ b/dev-perl/RedisDB/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Regexp-Common-net-CIDR/metadata.xml b/dev-perl/Regexp-Common-net-CIDR/metadata.xml
index 0882e288d909..e53bda386ed5 100644
--- a/dev-perl/Regexp-Common-net-CIDR/metadata.xml
+++ b/dev-perl/Regexp-Common-net-CIDR/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Regexp-Common-net-CIDR</remote-id>
     <remote-id type="cpan-module">Regexp::Common::net::CIDR</remote-id>
diff --git a/dev-perl/Regexp-IPv6/metadata.xml b/dev-perl/Regexp-IPv6/metadata.xml
index c76c3e76b2cc..fa62e7c6a9e1 100644
--- a/dev-perl/Regexp-IPv6/metadata.xml
+++ b/dev-perl/Regexp-IPv6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Regexp-IPv6</remote-id>
     <remote-id type="cpan-module">Regexp::IPv6</remote-id>
diff --git a/dev-perl/Regexp-RegGrp/metadata.xml b/dev-perl/Regexp-RegGrp/metadata.xml
index 432cc234c344..c88662b015b6 100644
--- a/dev-perl/Regexp-RegGrp/metadata.xml
+++ b/dev-perl/Regexp-RegGrp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Regexp-RegGrp</remote-id>
         <remote-id type="cpan-module">Regexp::RegGrp</remote-id>
diff --git a/dev-perl/Regexp-Shellish/metadata.xml b/dev-perl/Regexp-Shellish/metadata.xml
index e28e482372df..d77d20f30f04 100644
--- a/dev-perl/Regexp-Shellish/metadata.xml
+++ b/dev-perl/Regexp-Shellish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Regexp-Shellish</remote-id>
     <remote-id type="cpan-module">Regexp::Shellish</remote-id>
diff --git a/dev-perl/Return-Value/metadata.xml b/dev-perl/Return-Value/metadata.xml
index 1826fec2387a..490972ed6fd2 100644
--- a/dev-perl/Return-Value/metadata.xml
+++ b/dev-perl/Return-Value/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Return-Value</remote-id>
     <remote-id type="cpan-module">Return::Value</remote-id>
diff --git a/dev-perl/Role-Basic/metadata.xml b/dev-perl/Role-Basic/metadata.xml
index b85e4c423f69..fb39f4e949ef 100644
--- a/dev-perl/Role-Basic/metadata.xml
+++ b/dev-perl/Role-Basic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Role-Basix</remote-id>
         <remote-id type="cpan-module">Role::Basic</remote-id>
diff --git a/dev-perl/Role-Tiny/metadata.xml b/dev-perl/Role-Tiny/metadata.xml
index 3e397d43e175..be2601d59841 100644
--- a/dev-perl/Role-Tiny/metadata.xml
+++ b/dev-perl/Role-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Role-Tiny</remote-id>
     <remote-id type="cpan-module">Role::Tiny</remote-id>
diff --git a/dev-perl/Roman/metadata.xml b/dev-perl/Roman/metadata.xml
index 504268bd76a6..79c25ba7aa40 100644
--- a/dev-perl/Roman/metadata.xml
+++ b/dev-perl/Roman/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
@@ -10,6 +9,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Roman</remote-id>
 		<remote-id type="cpan-module">Roman</remote-id>
diff --git a/dev-perl/Router-Simple/metadata.xml b/dev-perl/Router-Simple/metadata.xml
index a907b20f612a..c68015264cda 100644
--- a/dev-perl/Router-Simple/metadata.xml
+++ b/dev-perl/Router-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Router-Simple</remote-id>
     <remote-id type="cpan-module">Router::Simple</remote-id>
diff --git a/dev-perl/SDL/metadata.xml b/dev-perl/SDL/metadata.xml
index 0450ff5895b8..a5009c8b3337 100644
--- a/dev-perl/SDL/metadata.xml
+++ b/dev-perl/SDL/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>games</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SDL</remote-id>
     <remote-id type="cpan-module">Module::Build::SDL</remote-id>
diff --git a/dev-perl/SGMLSpm/metadata.xml b/dev-perl/SGMLSpm/metadata.xml
index a15eb83580f1..75b8cb313acd 100644
--- a/dev-perl/SGMLSpm/metadata.xml
+++ b/dev-perl/SGMLSpm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SGMLSpm</remote-id>
     <remote-id type="cpan-module">SGMLS</remote-id>
diff --git a/dev-perl/SNMP_Session/metadata.xml b/dev-perl/SNMP_Session/metadata.xml
index a8c317e614dc..92096d40f41f 100644
--- a/dev-perl/SNMP_Session/metadata.xml
+++ b/dev-perl/SNMP_Session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">snmp-session</remote-id>
 		<remote-id type="github">sleinen/snmp-session</remote-id>
diff --git a/dev-perl/SOAP-Lite/metadata.xml b/dev-perl/SOAP-Lite/metadata.xml
index 816f3960ec09..651572198669 100644
--- a/dev-perl/SOAP-Lite/metadata.xml
+++ b/dev-perl/SOAP-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">SOAP-Lite</remote-id>
 		<remote-id type="cpan-module">Apache::SOAP</remote-id>
diff --git a/dev-perl/SOAP-WSDL/metadata.xml b/dev-perl/SOAP-WSDL/metadata.xml
index 5c9461f10522..3a4440fdea42 100644
--- a/dev-perl/SOAP-WSDL/metadata.xml
+++ b/dev-perl/SOAP-WSDL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SOAP-WSDL</remote-id>
     <remote-id type="cpan-module">SOAP::WSDL</remote-id>
diff --git a/dev-perl/SQL-Abstract-Limit/metadata.xml b/dev-perl/SQL-Abstract-Limit/metadata.xml
index af2b5412591c..30f5b0efbb58 100644
--- a/dev-perl/SQL-Abstract-Limit/metadata.xml
+++ b/dev-perl/SQL-Abstract-Limit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SQL-Abstract-Limit</remote-id>
     <remote-id type="cpan-module">SQL::Abstract::Limit</remote-id>
diff --git a/dev-perl/SQL-Abstract/metadata.xml b/dev-perl/SQL-Abstract/metadata.xml
index 9f8d9e1f3f00..d3d206f085c4 100644
--- a/dev-perl/SQL-Abstract/metadata.xml
+++ b/dev-perl/SQL-Abstract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 		A Perl module to create SQL statements based on perl structures.
 	</longdescription>
diff --git a/dev-perl/SQL-Statement/metadata.xml b/dev-perl/SQL-Statement/metadata.xml
index 676bab7ce3c6..5a59708c36f3 100644
--- a/dev-perl/SQL-Statement/metadata.xml
+++ b/dev-perl/SQL-Statement/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SQL-Statement</remote-id>
     <remote-id type="cpan-module">SQL::Dialects::ANSI</remote-id>
diff --git a/dev-perl/SQL-Translator/metadata.xml b/dev-perl/SQL-Translator/metadata.xml
index 7421e7f55f61..c2839b5f9005 100644
--- a/dev-perl/SQL-Translator/metadata.xml
+++ b/dev-perl/SQL-Translator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SQL-Translator</remote-id>
     <remote-id type="cpan-module">Parse::RecDescent::SQL::Translator::Parser::DB2::Grammar</remote-id>
diff --git a/dev-perl/SRU/metadata.xml b/dev-perl/SRU/metadata.xml
index ca43c6769543..3a56379e2709 100644
--- a/dev-perl/SRU/metadata.xml
+++ b/dev-perl/SRU/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SRU</remote-id>
     <remote-id type="cpan-module">Catalyst::Controller::SRU</remote-id>
diff --git a/dev-perl/SVG-Graph/metadata.xml b/dev-perl/SVG-Graph/metadata.xml
index f7bb8caa7262..61592b0202fb 100644
--- a/dev-perl/SVG-Graph/metadata.xml
+++ b/dev-perl/SVG-Graph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SVG-Graph</remote-id>
     <remote-id type="cpan-module">SVG::Graph</remote-id>
diff --git a/dev-perl/SVG/metadata.xml b/dev-perl/SVG/metadata.xml
index 681fbef8c323..22fd211b7fa7 100644
--- a/dev-perl/SVG/metadata.xml
+++ b/dev-perl/SVG/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SVG</remote-id>
     <remote-id type="cpan-module">SVG</remote-id>
diff --git a/dev-perl/SVN-Simple/metadata.xml b/dev-perl/SVN-Simple/metadata.xml
index 9693329e2f73..216bfbd2bf0d 100644
--- a/dev-perl/SVN-Simple/metadata.xml
+++ b/dev-perl/SVN-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">SVN-Simple</remote-id>
     <remote-id type="cpan-module">SVN::Simple::Edit</remote-id>
diff --git a/dev-perl/Safe-Hole/metadata.xml b/dev-perl/Safe-Hole/metadata.xml
index b5f5e7c9c17d..32a0165aaf93 100644
--- a/dev-perl/Safe-Hole/metadata.xml
+++ b/dev-perl/Safe-Hole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Safe-Hole</remote-id>
     <remote-id type="cpan-module">Safe::Hole</remote-id>
diff --git a/dev-perl/Safe-Isa/metadata.xml b/dev-perl/Safe-Isa/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Safe-Isa/metadata.xml
+++ b/dev-perl/Safe-Isa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Sane/metadata.xml b/dev-perl/Sane/metadata.xml
index 330f452f0b90..199a17a1f9ea 100644
--- a/dev-perl/Sane/metadata.xml
+++ b/dev-perl/Sane/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sane</remote-id>
     <remote-id type="cpan-module">Sane</remote-id>
diff --git a/dev-perl/Scalar-Properties/metadata.xml b/dev-perl/Scalar-Properties/metadata.xml
index 0794fa1d4078..1a86891b5226 100644
--- a/dev-perl/Scalar-Properties/metadata.xml
+++ b/dev-perl/Scalar-Properties/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Scalar-Properties</remote-id>
     <remote-id type="cpan-module">Scalar::Properties</remote-id>
diff --git a/dev-perl/Schedule-At/metadata.xml b/dev-perl/Schedule-At/metadata.xml
index a5e79b6526dc..7e57bee1d10e 100644
--- a/dev-perl/Schedule-At/metadata.xml
+++ b/dev-perl/Schedule-At/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Schedule-At</remote-id>
     <remote-id type="cpan-module">Schedule::At</remote-id>
diff --git a/dev-perl/Schedule-Cron-Events/metadata.xml b/dev-perl/Schedule-Cron-Events/metadata.xml
index 94ed5a94667e..ae829dd22700 100644
--- a/dev-perl/Schedule-Cron-Events/metadata.xml
+++ b/dev-perl/Schedule-Cron-Events/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Schedule-Cron-Events</remote-id>
     <remote-id type="cpan-module">Schedule::Cron::Events</remote-id>
diff --git a/dev-perl/Scope-Guard/metadata.xml b/dev-perl/Scope-Guard/metadata.xml
index b2bd7ec430f5..733c957c1c94 100644
--- a/dev-perl/Scope-Guard/metadata.xml
+++ b/dev-perl/Scope-Guard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Scope-Guard</remote-id>
     <remote-id type="cpan-module">Scope::Guard</remote-id>
diff --git a/dev-perl/Search-Xapian/metadata.xml b/dev-perl/Search-Xapian/metadata.xml
index f15449de371e..d2ae45fb65ad 100644
--- a/dev-perl/Search-Xapian/metadata.xml
+++ b/dev-perl/Search-Xapian/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Search-Xapian</remote-id>
 		<remote-id type="cpan-module">Search::Xapian</remote-id>
diff --git a/dev-perl/Server-Starter/metadata.xml b/dev-perl/Server-Starter/metadata.xml
index 8eb6deb5353f..51b264c45559 100644
--- a/dev-perl/Server-Starter/metadata.xml
+++ b/dev-perl/Server-Starter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Server-Starter</remote-id>
     <remote-id type="cpan-module">Server::Starter</remote-id>
diff --git a/dev-perl/Set-Crontab/metadata.xml b/dev-perl/Set-Crontab/metadata.xml
index ce4c8a70dca7..5a1a5834eaaf 100644
--- a/dev-perl/Set-Crontab/metadata.xml
+++ b/dev-perl/Set-Crontab/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Set-Crontab</remote-id>
     <remote-id type="cpan-module">Set::Crontab</remote-id>
diff --git a/dev-perl/Set-Infinite/metadata.xml b/dev-perl/Set-Infinite/metadata.xml
index 5626bbaecaba..e6a144680cd5 100644
--- a/dev-perl/Set-Infinite/metadata.xml
+++ b/dev-perl/Set-Infinite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Set-Infinite</remote-id>
     <remote-id type="cpan-module">Set::Infinite</remote-id>
diff --git a/dev-perl/Set-IntSpan/metadata.xml b/dev-perl/Set-IntSpan/metadata.xml
index 06f0a115d47f..6629b558a369 100644
--- a/dev-perl/Set-IntSpan/metadata.xml
+++ b/dev-perl/Set-IntSpan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Set-IntSpan</remote-id>
     <remote-id type="cpan-module">Set::IntSpan</remote-id>
diff --git a/dev-perl/Set-Object/metadata.xml b/dev-perl/Set-Object/metadata.xml
index 7e6ad3919b04..c84e093d4c0b 100644
--- a/dev-perl/Set-Object/metadata.xml
+++ b/dev-perl/Set-Object/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Set-Object</remote-id>
     <remote-id type="cpan-module">Set::Object</remote-id>
diff --git a/dev-perl/Shell-EnvImporter/metadata.xml b/dev-perl/Shell-EnvImporter/metadata.xml
index 27efb24cec58..b0f1674b6402 100644
--- a/dev-perl/Shell-EnvImporter/metadata.xml
+++ b/dev-perl/Shell-EnvImporter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Shell-EnvImporter</remote-id>
     <remote-id type="cpan-module">Shell::EnvImporter</remote-id>
diff --git a/dev-perl/Shell/metadata.xml b/dev-perl/Shell/metadata.xml
index 0605130c8797..9a80796a9c34 100644
--- a/dev-perl/Shell/metadata.xml
+++ b/dev-perl/Shell/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>hd_brummy@gentoo.org</email>
     <name>Joerg Bornkessel</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Shell</remote-id>
     <remote-id type="cpan-module">Shell</remote-id>
diff --git a/dev-perl/ShipIt/metadata.xml b/dev-perl/ShipIt/metadata.xml
index b401d7bf6d37..500ce7450af9 100644
--- a/dev-perl/ShipIt/metadata.xml
+++ b/dev-perl/ShipIt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ShipIt</remote-id>
     <remote-id type="cpan-module">ShipIt</remote-id>
diff --git a/dev-perl/Snowball-Norwegian/metadata.xml b/dev-perl/Snowball-Norwegian/metadata.xml
index 34456e459935..e1f7f0ce9e36 100644
--- a/dev-perl/Snowball-Norwegian/metadata.xml
+++ b/dev-perl/Snowball-Norwegian/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Snowball-Norwegian</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::Snowball::No</remote-id>
diff --git a/dev-perl/Snowball-Swedish/metadata.xml b/dev-perl/Snowball-Swedish/metadata.xml
index 690863b93594..479277b78475 100644
--- a/dev-perl/Snowball-Swedish/metadata.xml
+++ b/dev-perl/Snowball-Swedish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Snowball-Swedish</remote-id>
     <remote-id type="cpan-module">Lingua::Stem::Snowball::Se</remote-id>
diff --git a/dev-perl/Socket-GetAddrInfo/metadata.xml b/dev-perl/Socket-GetAddrInfo/metadata.xml
index 9b389a233745..0d402c3bbf01 100644
--- a/dev-perl/Socket-GetAddrInfo/metadata.xml
+++ b/dev-perl/Socket-GetAddrInfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Socket-GetAddrInfo</remote-id>
     <remote-id type="cpan-module">Socket::GetAddrInfo</remote-id>
diff --git a/dev-perl/Socket6/metadata.xml b/dev-perl/Socket6/metadata.xml
index f095070bba25..39e33340a9c3 100644
--- a/dev-perl/Socket6/metadata.xml
+++ b/dev-perl/Socket6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Socket6</remote-id>
     <remote-id type="cpan-module">Socket6</remote-id>
diff --git a/dev-perl/Sort-Key-IPv4/metadata.xml b/dev-perl/Sort-Key-IPv4/metadata.xml
index 6baea7e93ab7..39b48c8e29be 100644
--- a/dev-perl/Sort-Key-IPv4/metadata.xml
+++ b/dev-perl/Sort-Key-IPv4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sort-Key-IPv4</remote-id>
   </upstream>
diff --git a/dev-perl/Sort-Key/metadata.xml b/dev-perl/Sort-Key/metadata.xml
index f489dddc1745..53733fc076f1 100644
--- a/dev-perl/Sort-Key/metadata.xml
+++ b/dev-perl/Sort-Key/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sort-Key</remote-id>
   </upstream>
diff --git a/dev-perl/Sort-Naturally/metadata.xml b/dev-perl/Sort-Naturally/metadata.xml
index 9fdb0ec6f9b2..7281f78562ab 100644
--- a/dev-perl/Sort-Naturally/metadata.xml
+++ b/dev-perl/Sort-Naturally/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 	This module exports two functions, nsort and ncmp; they are used in
 	implementing my idea of a "natural sorting" algorithm. Under natural
diff --git a/dev-perl/Sort-Tree/metadata.xml b/dev-perl/Sort-Tree/metadata.xml
index 559724009a95..39a85dd8186c 100644
--- a/dev-perl/Sort-Tree/metadata.xml
+++ b/dev-perl/Sort-Tree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Sort::Tree implements a mechanism for sorting a list of objects into a
 		tree structure and flattening it back into a list. Among other things,
diff --git a/dev-perl/Sort-Versions/metadata.xml b/dev-perl/Sort-Versions/metadata.xml
index b1c6b4d39371..a4f0ac783b3c 100644
--- a/dev-perl/Sort-Versions/metadata.xml
+++ b/dev-perl/Sort-Versions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sort-Versions</remote-id>
     <remote-id type="cpan-module">Sort::Versions</remote-id>
diff --git a/dev-perl/Speech-Recognizer-SPX/metadata.xml b/dev-perl/Speech-Recognizer-SPX/metadata.xml
index 32a8854f77b5..32d6d90b8526 100644
--- a/dev-perl/Speech-Recognizer-SPX/metadata.xml
+++ b/dev-perl/Speech-Recognizer-SPX/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Speech-Recognizer-SPX</remote-id>
     <remote-id type="cpan-module">Audio::MFCC</remote-id>
diff --git a/dev-perl/SpeedyCGI/metadata.xml b/dev-perl/SpeedyCGI/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/SpeedyCGI/metadata.xml
+++ b/dev-perl/SpeedyCGI/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Sphinx-Config/metadata.xml b/dev-perl/Sphinx-Config/metadata.xml
index 362cc361a91b..d64103cee367 100644
--- a/dev-perl/Sphinx-Config/metadata.xml
+++ b/dev-perl/Sphinx-Config/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sphinx-Config</remote-id>
     <remote-id type="cpan-module">Sphinx::Config</remote-id>
diff --git a/dev-perl/Sphinx-Search/metadata.xml b/dev-perl/Sphinx-Search/metadata.xml
index 9454be782187..15d1254eb96b 100644
--- a/dev-perl/Sphinx-Search/metadata.xml
+++ b/dev-perl/Sphinx-Search/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sphinx-Search</remote-id>
   </upstream>
diff --git a/dev-perl/Spiffy/metadata.xml b/dev-perl/Spiffy/metadata.xml
index b5c1dc6bda1b..97c79c1f29ad 100644
--- a/dev-perl/Spiffy/metadata.xml
+++ b/dev-perl/Spiffy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Spiffy</remote-id>
     <remote-id type="cpan-module">DB</remote-id>
diff --git a/dev-perl/Spreadsheet-ParseExcel/metadata.xml b/dev-perl/Spreadsheet-ParseExcel/metadata.xml
index 45c61cf83088..f5e1fd35d172 100644
--- a/dev-perl/Spreadsheet-ParseExcel/metadata.xml
+++ b/dev-perl/Spreadsheet-ParseExcel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Spreadsheet-ParseExcel</remote-id>
     <remote-id type="cpan-module">Spreadsheet::ParseExcel</remote-id>
diff --git a/dev-perl/Spreadsheet-WriteExcel/metadata.xml b/dev-perl/Spreadsheet-WriteExcel/metadata.xml
index 27cd14a6ab20..075649145c90 100644
--- a/dev-perl/Spreadsheet-WriteExcel/metadata.xml
+++ b/dev-perl/Spreadsheet-WriteExcel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Spreadsheet-WriteExcel</remote-id>
     <remote-id type="cpan-module">Spreadsheet::WriteExcel</remote-id>
diff --git a/dev-perl/Starlet/metadata.xml b/dev-perl/Starlet/metadata.xml
index a5a54b7dd9e2..3b63c2d23bca 100644
--- a/dev-perl/Starlet/metadata.xml
+++ b/dev-perl/Starlet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Starlet</remote-id>
     <remote-id type="cpan-module">Plack::Handler::Starlet</remote-id>
diff --git a/dev-perl/Stat-lsMode/metadata.xml b/dev-perl/Stat-lsMode/metadata.xml
index ac30bf0a44cf..f1e41718a6f3 100644
--- a/dev-perl/Stat-lsMode/metadata.xml
+++ b/dev-perl/Stat-lsMode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Stat-lsMode</remote-id>
     <remote-id type="cpan-module">Stat::lsMode</remote-id>
diff --git a/dev-perl/Statistics-Descriptive-Discrete/metadata.xml b/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
index 81633accc1a2..d1c6796445ee 100644
--- a/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
+++ b/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Statistics-Descriptive-Discrete</remote-id>
     <remote-id type="cpan-module">Statistics::Descriptive::Discrete</remote-id>
diff --git a/dev-perl/Statistics-Descriptive/metadata.xml b/dev-perl/Statistics-Descriptive/metadata.xml
index f5dcf62f1ff2..ebdac9404f5d 100644
--- a/dev-perl/Statistics-Descriptive/metadata.xml
+++ b/dev-perl/Statistics-Descriptive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Statistics-Descriptive</remote-id>
     <remote-id type="cpan-module">Statistics::Descriptive</remote-id>
diff --git a/dev-perl/Statistics-Distributions/metadata.xml b/dev-perl/Statistics-Distributions/metadata.xml
index de26b9f69b83..6d595200414a 100644
--- a/dev-perl/Statistics-Distributions/metadata.xml
+++ b/dev-perl/Statistics-Distributions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Statistics-Distributions</remote-id>
     <remote-id type="cpan-module">Statistics::Distributions</remote-id>
diff --git a/dev-perl/Statistics-TTest/metadata.xml b/dev-perl/Statistics-TTest/metadata.xml
index 60b9b721d7c8..ea9817f4ec82 100644
--- a/dev-perl/Statistics-TTest/metadata.xml
+++ b/dev-perl/Statistics-TTest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Statistics-TTest</remote-id>
     <remote-id type="cpan-module">Statistics::TTest</remote-id>
diff --git a/dev-perl/Stream-Buffered/metadata.xml b/dev-perl/Stream-Buffered/metadata.xml
index 43b5be5f2fd5..6d4cf914ea78 100644
--- a/dev-perl/Stream-Buffered/metadata.xml
+++ b/dev-perl/Stream-Buffered/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Stream-Buffered</remote-id>
 		<remote-id type="cpan-module">Stream::Buffered</remote-id>
diff --git a/dev-perl/String-Approx/metadata.xml b/dev-perl/String-Approx/metadata.xml
index e6f90ed73d43..70c99237d95b 100644
--- a/dev-perl/String-Approx/metadata.xml
+++ b/dev-perl/String-Approx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-Approx</remote-id>
     <remote-id type="cpan-module">String::Approx</remote-id>
diff --git a/dev-perl/String-Ediff/metadata.xml b/dev-perl/String-Ediff/metadata.xml
index 804e47a98962..a0ce033c7e3d 100644
--- a/dev-perl/String-Ediff/metadata.xml
+++ b/dev-perl/String-Ediff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-Ediff</remote-id>
     <remote-id type="cpan-module">String::Ediff</remote-id>
diff --git a/dev-perl/String-Escape/metadata.xml b/dev-perl/String-Escape/metadata.xml
index 7acd0f0c5491..95fb277dd232 100644
--- a/dev-perl/String-Escape/metadata.xml
+++ b/dev-perl/String-Escape/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>mb@cattlegrid.info</email>
         <name>Michele Beltrame</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">String-Escape</remote-id>
         <remote-id type="cpan-module">String::Escape</remote-id>
diff --git a/dev-perl/String-Format/metadata.xml b/dev-perl/String-Format/metadata.xml
index b86f28181311..3886803c52a5 100644
--- a/dev-perl/String-Format/metadata.xml
+++ b/dev-perl/String-Format/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-Format</remote-id>
     <remote-id type="cpan-module">String::Format</remote-id>
diff --git a/dev-perl/String-RewritePrefix/metadata.xml b/dev-perl/String-RewritePrefix/metadata.xml
index 541a62c10eed..aa93a9f6fb61 100644
--- a/dev-perl/String-RewritePrefix/metadata.xml
+++ b/dev-perl/String-RewritePrefix/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-RewritePrefix</remote-id>
     <remote-id type="cpan-module">String::RewritePrefix</remote-id>
diff --git a/dev-perl/String-ShellQuote/metadata.xml b/dev-perl/String-ShellQuote/metadata.xml
index 0d66ad7350d4..60b8256bfb93 100644
--- a/dev-perl/String-ShellQuote/metadata.xml
+++ b/dev-perl/String-ShellQuote/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-ShellQuote</remote-id>
     <remote-id type="cpan-module">String::ShellQuote</remote-id>
diff --git a/dev-perl/String-Tokenizer/metadata.xml b/dev-perl/String-Tokenizer/metadata.xml
index a104c2acd6cd..d1200d505e77 100644
--- a/dev-perl/String-Tokenizer/metadata.xml
+++ b/dev-perl/String-Tokenizer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-Tokenizer</remote-id>
     <remote-id type="cpan-module">String::Tokenizer</remote-id>
diff --git a/dev-perl/Sub-Exporter-ForMethods/metadata.xml b/dev-perl/Sub-Exporter-ForMethods/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Sub-Exporter-ForMethods/metadata.xml
+++ b/dev-perl/Sub-Exporter-ForMethods/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Exporter-Progressive/metadata.xml b/dev-perl/Sub-Exporter-Progressive/metadata.xml
index 805ee6e15cd4..c2905d14ca02 100644
--- a/dev-perl/Sub-Exporter-Progressive/metadata.xml
+++ b/dev-perl/Sub-Exporter-Progressive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Sub-Exporter-Progressive</remote-id>
 		<remote-id type="cpan-module">Sub::Exporter::Progressive</remote-id>
diff --git a/dev-perl/Sub-Exporter/metadata.xml b/dev-perl/Sub-Exporter/metadata.xml
index 4dee1fc36b68..c27efb6a1cb6 100644
--- a/dev-perl/Sub-Exporter/metadata.xml
+++ b/dev-perl/Sub-Exporter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Exporter</remote-id>
     <remote-id type="cpan-module">Sub::Exporter</remote-id>
diff --git a/dev-perl/Sub-Identify/metadata.xml b/dev-perl/Sub-Identify/metadata.xml
index 6c9f0de2ef86..1e545c950e35 100644
--- a/dev-perl/Sub-Identify/metadata.xml
+++ b/dev-perl/Sub-Identify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Identify</remote-id>
     <remote-id type="cpan-module">Sub::Identify</remote-id>
diff --git a/dev-perl/Sub-Install/metadata.xml b/dev-perl/Sub-Install/metadata.xml
index d8e3ab58564d..e46683efe801 100644
--- a/dev-perl/Sub-Install/metadata.xml
+++ b/dev-perl/Sub-Install/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Install</remote-id>
     <remote-id type="cpan-module">Sub::Install</remote-id>
diff --git a/dev-perl/Sub-Name/metadata.xml b/dev-perl/Sub-Name/metadata.xml
index 994a4e8c772f..38b196b90045 100644
--- a/dev-perl/Sub-Name/metadata.xml
+++ b/dev-perl/Sub-Name/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Name</remote-id>
     <remote-id type="cpan-module">Sub::Name</remote-id>
diff --git a/dev-perl/Sub-Override/metadata.xml b/dev-perl/Sub-Override/metadata.xml
index 841bfc0cd604..328577e46a9c 100644
--- a/dev-perl/Sub-Override/metadata.xml
+++ b/dev-perl/Sub-Override/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Override</remote-id>
     <remote-id type="cpan-module">Sub::Override</remote-id>
diff --git a/dev-perl/Sub-Uplevel/metadata.xml b/dev-perl/Sub-Uplevel/metadata.xml
index 8a147f22f57b..aa147be40378 100644
--- a/dev-perl/Sub-Uplevel/metadata.xml
+++ b/dev-perl/Sub-Uplevel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sub-Uplevel</remote-id>
     <remote-id type="cpan-module">Sub::Uplevel</remote-id>
diff --git a/dev-perl/Switch/metadata.xml b/dev-perl/Switch/metadata.xml
index 43572bee0b13..e09ae6349228 100644
--- a/dev-perl/Switch/metadata.xml
+++ b/dev-perl/Switch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Switch</remote-id>
 		<remote-id type="cpan-module">Switch</remote-id>
diff --git a/dev-perl/Symbol-Global-Name/metadata.xml b/dev-perl/Symbol-Global-Name/metadata.xml
index f384c1215695..0677a5d0f992 100644
--- a/dev-perl/Symbol-Global-Name/metadata.xml
+++ b/dev-perl/Symbol-Global-Name/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Symbol-Global-Name</remote-id>
         <remote-id type="cpan-module">Symbol::Global::Name</remote-id>
diff --git a/dev-perl/Symbol-Util/metadata.xml b/dev-perl/Symbol-Util/metadata.xml
index b4961a45f573..41fed14edad5 100644
--- a/dev-perl/Symbol-Util/metadata.xml
+++ b/dev-perl/Symbol-Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Symbol-Util</remote-id>
     <remote-id type="cpan-module">Symbol::Util</remote-id>
diff --git a/dev-perl/Syntax-Highlight-Engine-Simple-Perl/metadata.xml b/dev-perl/Syntax-Highlight-Engine-Simple-Perl/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Syntax-Highlight-Engine-Simple-Perl/metadata.xml
+++ b/dev-perl/Syntax-Highlight-Engine-Simple-Perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Syntax-Highlight-Engine-Simple/metadata.xml b/dev-perl/Syntax-Highlight-Engine-Simple/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Syntax-Highlight-Engine-Simple/metadata.xml
+++ b/dev-perl/Syntax-Highlight-Engine-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Syntax-Keyword-Junction/metadata.xml b/dev-perl/Syntax-Keyword-Junction/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Syntax-Keyword-Junction/metadata.xml
+++ b/dev-perl/Syntax-Keyword-Junction/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Sys-CPU/metadata.xml b/dev-perl/Sys-CPU/metadata.xml
index 0ad314ea9797..512117a32803 100644
--- a/dev-perl/Sys-CPU/metadata.xml
+++ b/dev-perl/Sys-CPU/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sys-CPU</remote-id>
     <remote-id type="cpan-module">Sys::CPU</remote-id>
diff --git a/dev-perl/Sys-Hostname-Long/metadata.xml b/dev-perl/Sys-Hostname-Long/metadata.xml
index fd63fd94519e..5c910dda0868 100644
--- a/dev-perl/Sys-Hostname-Long/metadata.xml
+++ b/dev-perl/Sys-Hostname-Long/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sys-Hostname-Long</remote-id>
     <remote-id type="cpan-module">Sys::Hostname::Long</remote-id>
diff --git a/dev-perl/Sys-MemInfo/metadata.xml b/dev-perl/Sys-MemInfo/metadata.xml
index 94c4a6d2a788..70a120f49b6f 100644
--- a/dev-perl/Sys-MemInfo/metadata.xml
+++ b/dev-perl/Sys-MemInfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sys-MemInfo</remote-id>
     <remote-id type="cpan-module">Sys::MemInfo</remote-id>
diff --git a/dev-perl/Sys-Mmap/metadata.xml b/dev-perl/Sys-Mmap/metadata.xml
index dca2f83b2212..797a3936ea7e 100644
--- a/dev-perl/Sys-Mmap/metadata.xml
+++ b/dev-perl/Sys-Mmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Sys-Mmap</remote-id>
                 <remote-id type="cpan-module">Sys::Mmap</remote-id>
diff --git a/dev-perl/Sys-SigAction/metadata.xml b/dev-perl/Sys-SigAction/metadata.xml
index 989e5f485d37..aa3c729d37a5 100644
--- a/dev-perl/Sys-SigAction/metadata.xml
+++ b/dev-perl/Sys-SigAction/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sys-SigAction</remote-id>
     <remote-id type="cpan-module">Sys::SigAction</remote-id>
diff --git a/dev-perl/Sys-Statistics-Linux/metadata.xml b/dev-perl/Sys-Statistics-Linux/metadata.xml
index 562cb6edac0d..a68e04e34d9b 100644
--- a/dev-perl/Sys-Statistics-Linux/metadata.xml
+++ b/dev-perl/Sys-Statistics-Linux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Sys-Statistics-Linux</remote-id>
     <remote-id type="cpan-module">Sys::Statistics::Linux</remote-id>
diff --git a/dev-perl/Sys-Syscall/metadata.xml b/dev-perl/Sys-Syscall/metadata.xml
index f0bed06ce716..7a07b565cc91 100644
--- a/dev-perl/Sys-Syscall/metadata.xml
+++ b/dev-perl/Sys-Syscall/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>Access system calls that Perl doesn't normally provide access to.</longdescription>
   <upstream>
     <remote-id type="cpan">Sys-Syscall</remote-id>
diff --git a/dev-perl/Sys-Virt/metadata.xml b/dev-perl/Sys-Virt/metadata.xml
index 042982179c9d..0ccb8c88a73b 100644
--- a/dev-perl/Sys-Virt/metadata.xml
+++ b/dev-perl/Sys-Virt/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -11,6 +9,14 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+	</maintainer>
+	<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 	<remote-id type="cpan">Sys-Virt</remote-id>
 	<remote-id type="cpan-module">Sys::Virt</remote-id>
diff --git a/dev-perl/Sysadm-Install/metadata.xml b/dev-perl/Sysadm-Install/metadata.xml
index 4890a99d9c5a..39c832706dc2 100644
--- a/dev-perl/Sysadm-Install/metadata.xml
+++ b/dev-perl/Sysadm-Install/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <use>
     <flag name="hammer">Enable hammer() funtion to run a command in the shell and simulate a user
 			hammering the ENTER key to accept defaults on prompts</flag>
diff --git a/dev-perl/TAP-Parser-SourceHandler-pgTAP/metadata.xml b/dev-perl/TAP-Parser-SourceHandler-pgTAP/metadata.xml
index c9030d153227..b50a338b458c 100644
--- a/dev-perl/TAP-Parser-SourceHandler-pgTAP/metadata.xml
+++ b/dev-perl/TAP-Parser-SourceHandler-pgTAP/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>titanofold@gentoo.org</email>
         <name>Aaron W. Swenson</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">TAP-Parser-SourceHandler-pgTAP</remote-id>
         <remote-id type="cpan-module">TAP::Parser::SourceHandler::pgTAP</remote-id>
diff --git a/dev-perl/Taint-Runtime/metadata.xml b/dev-perl/Taint-Runtime/metadata.xml
index a04e38df375c..eafcf3d3a31a 100644
--- a/dev-perl/Taint-Runtime/metadata.xml
+++ b/dev-perl/Taint-Runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Taint-Runtime</remote-id>
     <remote-id type="cpan-module">Taint::Runtime</remote-id>
diff --git a/dev-perl/Task-Weaken/metadata.xml b/dev-perl/Task-Weaken/metadata.xml
index b54c77e52f73..c394897ea2d1 100644
--- a/dev-perl/Task-Weaken/metadata.xml
+++ b/dev-perl/Task-Weaken/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Task-Weaken</remote-id>
     <remote-id type="cpan-module">Task::Weaken</remote-id>
diff --git a/dev-perl/Template-DBI/metadata.xml b/dev-perl/Template-DBI/metadata.xml
index e81f80a9c9df..56368b9878ba 100644
--- a/dev-perl/Template-DBI/metadata.xml
+++ b/dev-perl/Template-DBI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-DBI</remote-id>
     <remote-id type="cpan-module">Template::Plugin::DBI</remote-id>
diff --git a/dev-perl/Template-GD/metadata.xml b/dev-perl/Template-GD/metadata.xml
index aae91c520572..215602a4b39e 100644
--- a/dev-perl/Template-GD/metadata.xml
+++ b/dev-perl/Template-GD/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-GD</remote-id>
     <remote-id type="cpan-module">Template::Plugin::GD</remote-id>
diff --git a/dev-perl/Template-Plugin-Cycle/metadata.xml b/dev-perl/Template-Plugin-Cycle/metadata.xml
index 035c37e0ef6e..5b3dbc5e8b1b 100644
--- a/dev-perl/Template-Plugin-Cycle/metadata.xml
+++ b/dev-perl/Template-Plugin-Cycle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-Plugin-Cycle</remote-id>
   </upstream>
diff --git a/dev-perl/Template-Plugin-Latex/metadata.xml b/dev-perl/Template-Plugin-Latex/metadata.xml
index b93a14a2b765..aa3048a1a22d 100644
--- a/dev-perl/Template-Plugin-Latex/metadata.xml
+++ b/dev-perl/Template-Plugin-Latex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-Latex</remote-id>
   </upstream>
diff --git a/dev-perl/Template-Tiny/metadata.xml b/dev-perl/Template-Tiny/metadata.xml
index 62b1cdf5d641..ff0f82d3bf5a 100644
--- a/dev-perl/Template-Tiny/metadata.xml
+++ b/dev-perl/Template-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-Tiny</remote-id>
     <remote-id type="cpan-module">Template::Tiny</remote-id>
diff --git a/dev-perl/Template-Toolkit/metadata.xml b/dev-perl/Template-Toolkit/metadata.xml
index c5ae6767f06d..158b3974c426 100644
--- a/dev-perl/Template-Toolkit/metadata.xml
+++ b/dev-perl/Template-Toolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-Toolkit</remote-id>
     <remote-id type="cpan-module">Template</remote-id>
diff --git a/dev-perl/Template-XML/metadata.xml b/dev-perl/Template-XML/metadata.xml
index 34ea84e6e2e5..58a2d6af70da 100644
--- a/dev-perl/Template-XML/metadata.xml
+++ b/dev-perl/Template-XML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Template-XML</remote-id>
     <remote-id type="cpan-module">Template::Plugin::XML</remote-id>
diff --git a/dev-perl/Term-ANSIScreen/metadata.xml b/dev-perl/Term-ANSIScreen/metadata.xml
index 73c06cc4d1c4..1473b5876ad8 100644
--- a/dev-perl/Term-ANSIScreen/metadata.xml
+++ b/dev-perl/Term-ANSIScreen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ANSIScreen</remote-id>
     <remote-id type="cpan-module">Term::ANSIScreen</remote-id>
diff --git a/dev-perl/Term-Encoding/metadata.xml b/dev-perl/Term-Encoding/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/Term-Encoding/metadata.xml
+++ b/dev-perl/Term-Encoding/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar-Quiet/metadata.xml b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/Term-ProgressBar-Quiet/metadata.xml
+++ b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar-Simple/metadata.xml b/dev-perl/Term-ProgressBar-Simple/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/Term-ProgressBar-Simple/metadata.xml
+++ b/dev-perl/Term-ProgressBar-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar/metadata.xml b/dev-perl/Term-ProgressBar/metadata.xml
index 6559a9940733..063c07b8d009 100644
--- a/dev-perl/Term-ProgressBar/metadata.xml
+++ b/dev-perl/Term-ProgressBar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ProgressBar</remote-id>
     <remote-id type="cpan-module">Term::ProgressBar</remote-id>
diff --git a/dev-perl/Term-ReadLine-Gnu/metadata.xml b/dev-perl/Term-ReadLine-Gnu/metadata.xml
index 5672a68a0aff..58a89c4f1928 100644
--- a/dev-perl/Term-ReadLine-Gnu/metadata.xml
+++ b/dev-perl/Term-ReadLine-Gnu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ReadLine-Gnu</remote-id>
     <remote-id type="cpan-module">Term::ReadLine::Gnu</remote-id>
diff --git a/dev-perl/Term-ReadLine-Perl/metadata.xml b/dev-perl/Term-ReadLine-Perl/metadata.xml
index eb237d76ae9e..115b80fc64c1 100644
--- a/dev-perl/Term-ReadLine-Perl/metadata.xml
+++ b/dev-perl/Term-ReadLine-Perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ReadLine-Perl</remote-id>
     <remote-id type="cpan-module">Term::ReadLine::Compa</remote-id>
diff --git a/dev-perl/Term-ReadLine-TTYtter/metadata.xml b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
index 57741a6fd639..eae239787bc5 100644
--- a/dev-perl/Term-ReadLine-TTYtter/metadata.xml
+++ b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>gentoo@nephros.org</email>
 <name>Peter Gantner</name>
 </maintainer>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Term-ReadPassword/metadata.xml b/dev-perl/Term-ReadPassword/metadata.xml
index 784fc0baf5d2..cbb951c07055 100644
--- a/dev-perl/Term-ReadPassword/metadata.xml
+++ b/dev-perl/Term-ReadPassword/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ReadPassword</remote-id>
     <remote-id type="cpan-module">Term::ReadPassword</remote-id>
diff --git a/dev-perl/Term-Screen/metadata.xml b/dev-perl/Term-Screen/metadata.xml
index e57b8e6db601..9bbd9c1399c6 100644
--- a/dev-perl/Term-Screen/metadata.xml
+++ b/dev-perl/Term-Screen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-Screen</remote-id>
     <remote-id type="cpan-module">Term::Screen</remote-id>
diff --git a/dev-perl/Term-ScreenColor/metadata.xml b/dev-perl/Term-ScreenColor/metadata.xml
index ed5dffbe3097..a7c7925f5fe4 100644
--- a/dev-perl/Term-ScreenColor/metadata.xml
+++ b/dev-perl/Term-ScreenColor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ScreenColor</remote-id>
     <remote-id type="cpan-module">Term::Screen::Fixes</remote-id>
diff --git a/dev-perl/Term-Shell/metadata.xml b/dev-perl/Term-Shell/metadata.xml
index 0d8b15e9e06c..930e29c560aa 100644
--- a/dev-perl/Term-Shell/metadata.xml
+++ b/dev-perl/Term-Shell/metadata.xml
@@ -5,8 +5,14 @@
 	<email>azamat.hackimov@gmail.com</email>
 	<name>Azamat Hackimov</name>
 </maintainer>
-<herd>perl</herd>
-<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 <remote-id type="cpan">Term-Shell</remote-id>
 <remote-id type="cpan-module">Term::Shell</remote-id>
diff --git a/dev-perl/Term-ShellUI/metadata.xml b/dev-perl/Term-ShellUI/metadata.xml
index b27a8fd42948..9f48cfdb494a 100644
--- a/dev-perl/Term-ShellUI/metadata.xml
+++ b/dev-perl/Term-ShellUI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Term-ShellUI</remote-id>
 		<remote-id type="cpan-module">Term::ShellUI</remote-id>
diff --git a/dev-perl/TermReadKey/metadata.xml b/dev-perl/TermReadKey/metadata.xml
index a3712a726f07..6052b33d07cf 100644
--- a/dev-perl/TermReadKey/metadata.xml
+++ b/dev-perl/TermReadKey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">TermReadKey</remote-id>
     <remote-id type="cpan-module">Term::ReadKey</remote-id>
diff --git a/dev-perl/Test-Assert/metadata.xml b/dev-perl/Test-Assert/metadata.xml
index 2cdaaf87567b..11e9448f274e 100644
--- a/dev-perl/Test-Assert/metadata.xml
+++ b/dev-perl/Test-Assert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Assert</remote-id>
     <remote-id type="cpan-module">Exception::Assertion</remote-id>
diff --git a/dev-perl/Test-Base/metadata.xml b/dev-perl/Test-Base/metadata.xml
index 288416380a19..083996a4695c 100644
--- a/dev-perl/Test-Base/metadata.xml
+++ b/dev-perl/Test-Base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Base</remote-id>
     <remote-id type="cpan-module">Module::Install::TestBase</remote-id>
diff --git a/dev-perl/Test-CPAN-Meta/metadata.xml b/dev-perl/Test-CPAN-Meta/metadata.xml
index e9362f01af87..b0d20835f037 100644
--- a/dev-perl/Test-CPAN-Meta/metadata.xml
+++ b/dev-perl/Test-CPAN-Meta/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-CPAN-Meta</remote-id>
     <remote-id type="cpan-module">Test::CPAN::Meta</remote-id>
diff --git a/dev-perl/Test-CheckDeps/metadata.xml b/dev-perl/Test-CheckDeps/metadata.xml
index 172ddd9c6c0a..1a104ba99654 100644
--- a/dev-perl/Test-CheckDeps/metadata.xml
+++ b/dev-perl/Test-CheckDeps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Test-CheckDeps</remote-id>
 		<remote-id type="cpan-module">Test::CheckDeps</remote-id>
diff --git a/dev-perl/Test-Class/metadata.xml b/dev-perl/Test-Class/metadata.xml
index 4c1c2edb56e3..fe216fa90d0c 100644
--- a/dev-perl/Test-Class/metadata.xml
+++ b/dev-perl/Test-Class/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Class</remote-id>
     <remote-id type="cpan-module">Test::Class</remote-id>
diff --git a/dev-perl/Test-ClassAPI/metadata.xml b/dev-perl/Test-ClassAPI/metadata.xml
index 3f63627fb1a7..d03905b68110 100644
--- a/dev-perl/Test-ClassAPI/metadata.xml
+++ b/dev-perl/Test-ClassAPI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-ClassAPI</remote-id>
     <remote-id type="cpan-module">Test::ClassAPI</remote-id>
diff --git a/dev-perl/Test-CleanNamespaces/metadata.xml b/dev-perl/Test-CleanNamespaces/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Test-CleanNamespaces/metadata.xml
+++ b/dev-perl/Test-CleanNamespaces/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-Command-Simple/metadata.xml b/dev-perl/Test-Command-Simple/metadata.xml
index 95117907fe55..3e29f9069ab2 100644
--- a/dev-perl/Test-Command-Simple/metadata.xml
+++ b/dev-perl/Test-Command-Simple/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Test-Command-Simple</remote-id>
 		<remote-id type="cpan-module">Test::Command::Simple </remote-id>
diff --git a/dev-perl/Test-Command/metadata.xml b/dev-perl/Test-Command/metadata.xml
index 456a0062a494..42fee739545c 100644
--- a/dev-perl/Test-Command/metadata.xml
+++ b/dev-perl/Test-Command/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Command</remote-id>
     <remote-id type="cpan-module">Test::Command</remote-id>
diff --git a/dev-perl/Test-Deep/metadata.xml b/dev-perl/Test-Deep/metadata.xml
index cffd7024fb7b..14ed090a6871 100644
--- a/dev-perl/Test-Deep/metadata.xml
+++ b/dev-perl/Test-Deep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Deep</remote-id>
     <remote-id type="cpan-module">Test::Deep</remote-id>
diff --git a/dev-perl/Test-Dependencies/metadata.xml b/dev-perl/Test-Dependencies/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Test-Dependencies/metadata.xml
+++ b/dev-perl/Test-Dependencies/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-Differences/metadata.xml b/dev-perl/Test-Differences/metadata.xml
index b556128e1b69..63f021562903 100644
--- a/dev-perl/Test-Differences/metadata.xml
+++ b/dev-perl/Test-Differences/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Differences</remote-id>
     <remote-id type="cpan-module">Test::Differences</remote-id>
diff --git a/dev-perl/Test-DistManifest/metadata.xml b/dev-perl/Test-DistManifest/metadata.xml
index dda5d126aa72..368d05017000 100644
--- a/dev-perl/Test-DistManifest/metadata.xml
+++ b/dev-perl/Test-DistManifest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Test-DistManifest</remote-id>
 		<remote-id type="cpan-module">Test::DistManifest</remote-id>
diff --git a/dev-perl/Test-Distribution/metadata.xml b/dev-perl/Test-Distribution/metadata.xml
index 907601fa0304..007d087c8228 100644
--- a/dev-perl/Test-Distribution/metadata.xml
+++ b/dev-perl/Test-Distribution/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Distribution</remote-id>
     <remote-id type="cpan-module">Test::Distribution</remote-id>
diff --git a/dev-perl/Test-EOL/metadata.xml b/dev-perl/Test-EOL/metadata.xml
index e723e1cab4ce..c941f45e1072 100644
--- a/dev-perl/Test-EOL/metadata.xml
+++ b/dev-perl/Test-EOL/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-EOL</remote-id>
     <remote-id type="cpan-module">Test::EOL</remote-id>
diff --git a/dev-perl/Test-Exception/metadata.xml b/dev-perl/Test-Exception/metadata.xml
index 14adf3bbfea5..789c52f24c95 100644
--- a/dev-perl/Test-Exception/metadata.xml
+++ b/dev-perl/Test-Exception/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Exception</remote-id>
     <remote-id type="cpan-module">Test::Exception</remote-id>
diff --git a/dev-perl/Test-FailWarnings/metadata.xml b/dev-perl/Test-FailWarnings/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Test-FailWarnings/metadata.xml
+++ b/dev-perl/Test-FailWarnings/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-Fatal/metadata.xml b/dev-perl/Test-Fatal/metadata.xml
index 99676ad063a1..8129abbcc4b1 100644
--- a/dev-perl/Test-Fatal/metadata.xml
+++ b/dev-perl/Test-Fatal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Fatal</remote-id>
     <remote-id type="cpan-module">Test::Fatal</remote-id>
diff --git a/dev-perl/Test-File-ShareDir/metadata.xml b/dev-perl/Test-File-ShareDir/metadata.xml
index 31a47ebe63da..2699eba83c0d 100644
--- a/dev-perl/Test-File-ShareDir/metadata.xml
+++ b/dev-perl/Test-File-ShareDir/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
   <maintainer>
 	  <email>kentnl@cpan.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-File-ShareDir</remote-id>
     <remote-id type="cpan-module">Test::File::ShareDir</remote-id>
diff --git a/dev-perl/Test-Inline/metadata.xml b/dev-perl/Test-Inline/metadata.xml
index b185372436ea..e529bc04ce6e 100644
--- a/dev-perl/Test-Inline/metadata.xml
+++ b/dev-perl/Test-Inline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Inline</remote-id>
     <remote-id type="cpan-module">Test::Inline</remote-id>
diff --git a/dev-perl/Test-Inter/metadata.xml b/dev-perl/Test-Inter/metadata.xml
index b2f7cab1d7cd..dfd054690299 100644
--- a/dev-perl/Test-Inter/metadata.xml
+++ b/dev-perl/Test-Inter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Inter</remote-id>
     <remote-id type="cpan-module">Test::Inter</remote-id>
diff --git a/dev-perl/Test-LeakTrace/metadata.xml b/dev-perl/Test-LeakTrace/metadata.xml
index 098913f886ec..d8fb62c2af43 100644
--- a/dev-perl/Test-LeakTrace/metadata.xml
+++ b/dev-perl/Test-LeakTrace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Test-LeakTrace</remote-id>
         <remote-id type="cpan-module">Test::LeakTrace</remote-id>
diff --git a/dev-perl/Test-LongString/metadata.xml b/dev-perl/Test-LongString/metadata.xml
index acca10fbdbe6..dcfb519fa831 100644
--- a/dev-perl/Test-LongString/metadata.xml
+++ b/dev-perl/Test-LongString/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-LongString</remote-id>
     <remote-id type="cpan-module">Test::LongString</remote-id>
diff --git a/dev-perl/Test-Manifest/metadata.xml b/dev-perl/Test-Manifest/metadata.xml
index 880d5d5bf94a..bad9bbeded5a 100644
--- a/dev-perl/Test-Manifest/metadata.xml
+++ b/dev-perl/Test-Manifest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Manifest</remote-id>
     <remote-id type="cpan-module">Test::Manifest</remote-id>
diff --git a/dev-perl/Test-Memory-Cycle/metadata.xml b/dev-perl/Test-Memory-Cycle/metadata.xml
index 19fd231f4c35..921de3fe616c 100644
--- a/dev-perl/Test-Memory-Cycle/metadata.xml
+++ b/dev-perl/Test-Memory-Cycle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Memory-Cycle</remote-id>
     <remote-id type="cpan-module">Test::Memory::Cycle</remote-id>
diff --git a/dev-perl/Test-Mock-LWP-Dispatch/metadata.xml b/dev-perl/Test-Mock-LWP-Dispatch/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Test-Mock-LWP-Dispatch/metadata.xml
+++ b/dev-perl/Test-Mock-LWP-Dispatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-MockModule/metadata.xml b/dev-perl/Test-MockModule/metadata.xml
index 4425a536f5b4..fd91830e9c3b 100644
--- a/dev-perl/Test-MockModule/metadata.xml
+++ b/dev-perl/Test-MockModule/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-MockModule</remote-id>
     <remote-id type="cpan-module">Test::MockModule</remote-id>
diff --git a/dev-perl/Test-MockObject/metadata.xml b/dev-perl/Test-MockObject/metadata.xml
index 5725b78e07e6..8209fc0fc2f6 100644
--- a/dev-perl/Test-MockObject/metadata.xml
+++ b/dev-perl/Test-MockObject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-MockObject</remote-id>
     <remote-id type="cpan-module">Test::MockObject</remote-id>
diff --git a/dev-perl/Test-MockTime/metadata.xml b/dev-perl/Test-MockTime/metadata.xml
index 6ad93aa3d4b2..6ce3ed9c5888 100644
--- a/dev-perl/Test-MockTime/metadata.xml
+++ b/dev-perl/Test-MockTime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-MockTime</remote-id>
     <remote-id type="cpan-module">Test::MockTime</remote-id>
diff --git a/dev-perl/Test-Most/metadata.xml b/dev-perl/Test-Most/metadata.xml
index cac37eef5481..d0dba0826e05 100644
--- a/dev-perl/Test-Most/metadata.xml
+++ b/dev-perl/Test-Most/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Most</remote-id>
     <remote-id type="cpan-module">Test::Most</remote-id>
diff --git a/dev-perl/Test-NoTabs/metadata.xml b/dev-perl/Test-NoTabs/metadata.xml
index 3aa5eab33209..ff4b630a8fd5 100644
--- a/dev-perl/Test-NoTabs/metadata.xml
+++ b/dev-perl/Test-NoTabs/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-NoTabs</remote-id>
     <remote-id type="cpan-module">Test::NoTabs</remote-id>
diff --git a/dev-perl/Test-NoWarnings/metadata.xml b/dev-perl/Test-NoWarnings/metadata.xml
index 19789f3fd881..e9e79816c1fe 100644
--- a/dev-perl/Test-NoWarnings/metadata.xml
+++ b/dev-perl/Test-NoWarnings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-NoWarnings</remote-id>
     <remote-id type="cpan-module">Test::NoWarnings</remote-id>
diff --git a/dev-perl/Test-Number-Delta/metadata.xml b/dev-perl/Test-Number-Delta/metadata.xml
index 5442e26c3c53..9a746e5eb886 100644
--- a/dev-perl/Test-Number-Delta/metadata.xml
+++ b/dev-perl/Test-Number-Delta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Number-Delta</remote-id>
     <remote-id type="cpan-module">Test::Number::Delta</remote-id>
diff --git a/dev-perl/Test-Object/metadata.xml b/dev-perl/Test-Object/metadata.xml
index 9a8b0e256c55..3fb3566a49b1 100644
--- a/dev-perl/Test-Object/metadata.xml
+++ b/dev-perl/Test-Object/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Object</remote-id>
     <remote-id type="cpan-module">Test::Object</remote-id>
diff --git a/dev-perl/Test-Output/metadata.xml b/dev-perl/Test-Output/metadata.xml
index 722d01f20a69..adbc3cdbf2df 100644
--- a/dev-perl/Test-Output/metadata.xml
+++ b/dev-perl/Test-Output/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Output</remote-id>
     <remote-id type="cpan-module">Test::Output</remote-id>
diff --git a/dev-perl/Test-Perl-Critic/metadata.xml b/dev-perl/Test-Perl-Critic/metadata.xml
index 20b373e48833..08166b284768 100644
--- a/dev-perl/Test-Perl-Critic/metadata.xml
+++ b/dev-perl/Test-Perl-Critic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Perl-Critic</remote-id>
     <remote-id type="cpan-module">Test::Perl::Critic</remote-id>
diff --git a/dev-perl/Test-Pod-Coverage/metadata.xml b/dev-perl/Test-Pod-Coverage/metadata.xml
index aea8469eafe7..d5dbc1006389 100644
--- a/dev-perl/Test-Pod-Coverage/metadata.xml
+++ b/dev-perl/Test-Pod-Coverage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Pod-Coverage</remote-id>
     <remote-id type="cpan-module">Test::Pod::Coverage</remote-id>
diff --git a/dev-perl/Test-Pod/metadata.xml b/dev-perl/Test-Pod/metadata.xml
index 6793e22aff2b..c5853e0211d6 100644
--- a/dev-perl/Test-Pod/metadata.xml
+++ b/dev-perl/Test-Pod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Pod</remote-id>
     <remote-id type="cpan-module">Test::Pod</remote-id>
diff --git a/dev-perl/Test-Portability-Files/metadata.xml b/dev-perl/Test-Portability-Files/metadata.xml
index 3ad768f67ab7..f7e1419f8a33 100644
--- a/dev-perl/Test-Portability-Files/metadata.xml
+++ b/dev-perl/Test-Portability-Files/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Portability-Files</remote-id>
     <remote-id type="cpan-module">Test::Portability::Files</remote-id>
diff --git a/dev-perl/Test-Requires/metadata.xml b/dev-perl/Test-Requires/metadata.xml
index 0b6be79e51ad..ae7981c3da11 100644
--- a/dev-perl/Test-Requires/metadata.xml
+++ b/dev-perl/Test-Requires/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Requires</remote-id>
     <remote-id type="cpan-module">Test::Requires</remote-id>
diff --git a/dev-perl/Test-Script/metadata.xml b/dev-perl/Test-Script/metadata.xml
index 5821cdef85e2..cb10ca6ec58f 100644
--- a/dev-perl/Test-Script/metadata.xml
+++ b/dev-perl/Test-Script/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Script</remote-id>
     <remote-id type="cpan-module">Test::Script</remote-id>
diff --git a/dev-perl/Test-SharedFork/metadata.xml b/dev-perl/Test-SharedFork/metadata.xml
index a98b3722d639..e4b99a7e9d30 100644
--- a/dev-perl/Test-SharedFork/metadata.xml
+++ b/dev-perl/Test-SharedFork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-SharedFork</remote-id>
     <remote-id type="cpan-module">Test::SharedFork</remote-id>
diff --git a/dev-perl/Test-Spec/metadata.xml b/dev-perl/Test-Spec/metadata.xml
index 0e912d9f62dd..984e80e195d5 100644
--- a/dev-perl/Test-Spec/metadata.xml
+++ b/dev-perl/Test-Spec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Test-Spec</remote-id>
                 <remote-id type="cpan-module">Test::Spec</remote-id>
diff --git a/dev-perl/Test-SubCalls/metadata.xml b/dev-perl/Test-SubCalls/metadata.xml
index cc4596ba5b57..788b43823b73 100644
--- a/dev-perl/Test-SubCalls/metadata.xml
+++ b/dev-perl/Test-SubCalls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-SubCalls</remote-id>
     <remote-id type="cpan-module">Test::SubCalls</remote-id>
diff --git a/dev-perl/Test-TCP/metadata.xml b/dev-perl/Test-TCP/metadata.xml
index 099985227ac2..e6a4af5fe23e 100644
--- a/dev-perl/Test-TCP/metadata.xml
+++ b/dev-perl/Test-TCP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-TCP</remote-id>
     <remote-id type="cpan-module">Net::EmptyPort</remote-id>
diff --git a/dev-perl/Test-Taint/metadata.xml b/dev-perl/Test-Taint/metadata.xml
index 54f74736292c..5c92d6710a34 100644
--- a/dev-perl/Test-Taint/metadata.xml
+++ b/dev-perl/Test-Taint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Taint</remote-id>
     <remote-id type="cpan-module">Test::Taint</remote-id>
diff --git a/dev-perl/Test-Tester/metadata.xml b/dev-perl/Test-Tester/metadata.xml
index ca3c00848979..7133f0c59e00 100644
--- a/dev-perl/Test-Tester/metadata.xml
+++ b/dev-perl/Test-Tester/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Tester</remote-id>
     <remote-id type="cpan-module">Test::Tester</remote-id>
diff --git a/dev-perl/Test-Time/metadata.xml b/dev-perl/Test-Time/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Test-Time/metadata.xml
+++ b/dev-perl/Test-Time/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-Trap/metadata.xml b/dev-perl/Test-Trap/metadata.xml
index 7601313b4a98..496837a22682 100644
--- a/dev-perl/Test-Trap/metadata.xml
+++ b/dev-perl/Test-Trap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Trap</remote-id>
     <remote-id type="cpan-module">Test::Trap</remote-id>
diff --git a/dev-perl/Test-Unit-Lite/metadata.xml b/dev-perl/Test-Unit-Lite/metadata.xml
index f4f0bde05bb2..832623840a92 100644
--- a/dev-perl/Test-Unit-Lite/metadata.xml
+++ b/dev-perl/Test-Unit-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Unit-Lite</remote-id>
     <remote-id type="cpan-module">Test::Unit::Debug</remote-id>
diff --git a/dev-perl/Test-UseAllModules/metadata.xml b/dev-perl/Test-UseAllModules/metadata.xml
index eaf5791c33c2..4dd4986c5f82 100644
--- a/dev-perl/Test-UseAllModules/metadata.xml
+++ b/dev-perl/Test-UseAllModules/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
     <maintainer>
         <email>kentfredric@gmail.com</email>
         <name>Kent Fredric</name>
     </maintainer>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Test-UseAllModules</remote-id>
         <remote-id type="cpan-module">Test::UseAllModules</remote-id>
diff --git a/dev-perl/Test-WWW-Mechanize/metadata.xml b/dev-perl/Test-WWW-Mechanize/metadata.xml
index 4689d7d1eba6..456929bae257 100644
--- a/dev-perl/Test-WWW-Mechanize/metadata.xml
+++ b/dev-perl/Test-WWW-Mechanize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-WWW-Mechanize</remote-id>
     <remote-id type="cpan-module">Test::WWW::Mechanize</remote-id>
diff --git a/dev-perl/Test-Warn/metadata.xml b/dev-perl/Test-Warn/metadata.xml
index 0d6baa3c4d68..230423e75430 100644
--- a/dev-perl/Test-Warn/metadata.xml
+++ b/dev-perl/Test-Warn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Warn</remote-id>
     <remote-id type="cpan-module">Test::Warn</remote-id>
diff --git a/dev-perl/Test-Warnings/metadata.xml b/dev-perl/Test-Warnings/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/Test-Warnings/metadata.xml
+++ b/dev-perl/Test-Warnings/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Test-Without-Module/metadata.xml b/dev-perl/Test-Without-Module/metadata.xml
index 55054505062e..4d20fccfce36 100644
--- a/dev-perl/Test-Without-Module/metadata.xml
+++ b/dev-perl/Test-Without-Module/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Test-Without-Module</remote-id>
 		<remote-id type="cpan-module">Test::Without::Module</remote-id>
diff --git a/dev-perl/Test-YAML/metadata.xml b/dev-perl/Test-YAML/metadata.xml
index 9e1dc7552712..4a3b9514251c 100644
--- a/dev-perl/Test-YAML/metadata.xml
+++ b/dev-perl/Test-YAML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">YAML</remote-id>
     <remote-id type="cpan-module">Test::YAML</remote-id>
diff --git a/dev-perl/Test-use-ok/metadata.xml b/dev-perl/Test-use-ok/metadata.xml
index 3319ceea0d2a..d59de127372c 100644
--- a/dev-perl/Test-use-ok/metadata.xml
+++ b/dev-perl/Test-use-ok/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test-use-ok</remote-id>
     <remote-id type="cpan-module">Test::use::ok</remote-id>
diff --git a/dev-perl/Text-Aligner/metadata.xml b/dev-perl/Text-Aligner/metadata.xml
index 259efa56ab35..8cc67e3d84f5 100644
--- a/dev-perl/Text-Aligner/metadata.xml
+++ b/dev-perl/Text-Aligner/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Aligner</remote-id>
     <remote-id type="cpan-module">Text::Aligner</remote-id>
diff --git a/dev-perl/Text-Aspell/metadata.xml b/dev-perl/Text-Aspell/metadata.xml
index c69696be5500..2846619bed20 100644
--- a/dev-perl/Text-Aspell/metadata.xml
+++ b/dev-perl/Text-Aspell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Aspell</remote-id>
     <remote-id type="cpan-module">Text::Aspell</remote-id>
diff --git a/dev-perl/Text-Autoformat/metadata.xml b/dev-perl/Text-Autoformat/metadata.xml
index 95db1020808d..b67476abd2e4 100644
--- a/dev-perl/Text-Autoformat/metadata.xml
+++ b/dev-perl/Text-Autoformat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Autoformat</remote-id>
     <remote-id type="cpan-module">Hang</remote-id>
diff --git a/dev-perl/Text-BibTeX/metadata.xml b/dev-perl/Text-BibTeX/metadata.xml
index 645ffd4e1722..6f973ffe3c6e 100644
--- a/dev-perl/Text-BibTeX/metadata.xml
+++ b/dev-perl/Text-BibTeX/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-BibTeX</remote-id>
     <remote-id type="cpan-module">Text::BibTeX</remote-id>
diff --git a/dev-perl/Text-CSV-Simple/metadata.xml b/dev-perl/Text-CSV-Simple/metadata.xml
index 6cf57851ea15..ecc4bf7d06bd 100644
--- a/dev-perl/Text-CSV-Simple/metadata.xml
+++ b/dev-perl/Text-CSV-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-CSV-Simple</remote-id>
     <remote-id type="cpan-module">Text::CSV::Simple</remote-id>
diff --git a/dev-perl/Text-CSV/metadata.xml b/dev-perl/Text-CSV/metadata.xml
index 340fb34a1b0a..c0d2ca98c198 100644
--- a/dev-perl/Text-CSV/metadata.xml
+++ b/dev-perl/Text-CSV/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-CSV</remote-id>
     <remote-id type="cpan-module">Text::CSV</remote-id>
diff --git a/dev-perl/Text-CSV_XS/metadata.xml b/dev-perl/Text-CSV_XS/metadata.xml
index 13ecc18e2eea..60fe7ec7432e 100644
--- a/dev-perl/Text-CSV_XS/metadata.xml
+++ b/dev-perl/Text-CSV_XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-CSV_XS</remote-id>
     <remote-id type="cpan-module">Text::CSV_XS</remote-id>
diff --git a/dev-perl/Text-CharWidth/metadata.xml b/dev-perl/Text-CharWidth/metadata.xml
index e7e33d1b4d3f..ed1235d3a507 100644
--- a/dev-perl/Text-CharWidth/metadata.xml
+++ b/dev-perl/Text-CharWidth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-CharWidth</remote-id>
     <remote-id type="cpan-module">Text::CharWidth</remote-id>
diff --git a/dev-perl/Text-Diff/metadata.xml b/dev-perl/Text-Diff/metadata.xml
index 48f596581f41..961bf1fc1515 100644
--- a/dev-perl/Text-Diff/metadata.xml
+++ b/dev-perl/Text-Diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Diff</remote-id>
     <remote-id type="cpan-module">Text::Diff</remote-id>
diff --git a/dev-perl/Text-FindIndent/metadata.xml b/dev-perl/Text-FindIndent/metadata.xml
index 57143809b113..df0cdd972962 100644
--- a/dev-perl/Text-FindIndent/metadata.xml
+++ b/dev-perl/Text-FindIndent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-FindIndent</remote-id>
     <remote-id type="cpan-module">Text::FindIndent</remote-id>
diff --git a/dev-perl/Text-Format/metadata.xml b/dev-perl/Text-Format/metadata.xml
index 73d605cf9d04..b2a92513d85a 100644
--- a/dev-perl/Text-Format/metadata.xml
+++ b/dev-perl/Text-Format/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
@@ -10,6 +9,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Text-Format</remote-id>
 		<remote-id type="cpan-module">Text::Format</remote-id>
diff --git a/dev-perl/Text-German/metadata.xml b/dev-perl/Text-German/metadata.xml
index 5badd95d228d..b19ce3b7a249 100644
--- a/dev-perl/Text-German/metadata.xml
+++ b/dev-perl/Text-German/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-German</remote-id>
     <remote-id type="cpan-module">Text::German</remote-id>
diff --git a/dev-perl/Text-Glob/metadata.xml b/dev-perl/Text-Glob/metadata.xml
index 5059cbb1aa3a..f8090fbc6bd3 100644
--- a/dev-perl/Text-Glob/metadata.xml
+++ b/dev-perl/Text-Glob/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Glob</remote-id>
     <remote-id type="cpan-module">Text::Glob</remote-id>
diff --git a/dev-perl/Text-Iconv/metadata.xml b/dev-perl/Text-Iconv/metadata.xml
index 7b09daeadff4..2da89a21f62b 100644
--- a/dev-perl/Text-Iconv/metadata.xml
+++ b/dev-perl/Text-Iconv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Iconv</remote-id>
     <remote-id type="cpan-module">Text::Iconv</remote-id>
diff --git a/dev-perl/Text-Kakasi/metadata.xml b/dev-perl/Text-Kakasi/metadata.xml
index d63d8df610a2..85bee7808465 100644
--- a/dev-perl/Text-Kakasi/metadata.xml
+++ b/dev-perl/Text-Kakasi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Kakasi</remote-id>
     <remote-id type="cpan-module">Text::Kakasi</remote-id>
diff --git a/dev-perl/Text-Levenshtein/metadata.xml b/dev-perl/Text-Levenshtein/metadata.xml
index aa56fdfce785..9c657aac3dd4 100644
--- a/dev-perl/Text-Levenshtein/metadata.xml
+++ b/dev-perl/Text-Levenshtein/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Levenshtein</remote-id>
     <remote-id type="cpan-module">Text::Levenshtein</remote-id>
diff --git a/dev-perl/Text-LevenshteinXS/metadata.xml b/dev-perl/Text-LevenshteinXS/metadata.xml
index 9534c90ee148..6a1166f5d741 100644
--- a/dev-perl/Text-LevenshteinXS/metadata.xml
+++ b/dev-perl/Text-LevenshteinXS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-LevenshteinXS</remote-id>
     <remote-id type="cpan-module">Text::LevenshteinXS</remote-id>
diff --git a/dev-perl/Text-Markdown/metadata.xml b/dev-perl/Text-Markdown/metadata.xml
index 2d97bdf96a56..da1fa7f9a984 100644
--- a/dev-perl/Text-Markdown/metadata.xml
+++ b/dev-perl/Text-Markdown/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Markdown</remote-id>
     <remote-id type="cpan-module">Text::Markdown</remote-id>
diff --git a/dev-perl/Text-Netstring/metadata.xml b/dev-perl/Text-Netstring/metadata.xml
index 212bf945b889..3832ad827792 100644
--- a/dev-perl/Text-Netstring/metadata.xml
+++ b/dev-perl/Text-Netstring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Netstring</remote-id>
     <remote-id type="cpan-module">Text::Netstring</remote-id>
diff --git a/dev-perl/Text-Password-Pronounceable/metadata.xml b/dev-perl/Text-Password-Pronounceable/metadata.xml
index 6f0ef1258fe3..69b79b37495c 100644
--- a/dev-perl/Text-Password-Pronounceable/metadata.xml
+++ b/dev-perl/Text-Password-Pronounceable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Password-Pronounceable</remote-id>
     <remote-id type="cpan-module">Text::Password::Pronounceable</remote-id>
diff --git a/dev-perl/Text-Patch/metadata.xml b/dev-perl/Text-Patch/metadata.xml
index af62dd76817f..78985c727aa8 100644
--- a/dev-perl/Text-Patch/metadata.xml
+++ b/dev-perl/Text-Patch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Patch</remote-id>
     <remote-id type="cpan-module">Text::Patch</remote-id>
diff --git a/dev-perl/Text-Quoted/metadata.xml b/dev-perl/Text-Quoted/metadata.xml
index c7d8a93833f1..6ebde18eaac7 100644
--- a/dev-perl/Text-Quoted/metadata.xml
+++ b/dev-perl/Text-Quoted/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Quoted</remote-id>
     <remote-id type="cpan-module">Text::Quoted</remote-id>
diff --git a/dev-perl/Text-Reform/metadata.xml b/dev-perl/Text-Reform/metadata.xml
index e01a2546e01e..c5f218460101 100644
--- a/dev-perl/Text-Reform/metadata.xml
+++ b/dev-perl/Text-Reform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Reform</remote-id>
     <remote-id type="cpan-module">Text::Reform</remote-id>
diff --git a/dev-perl/Text-Roman/metadata.xml b/dev-perl/Text-Roman/metadata.xml
index 6b01ed9e5c0c..1a5ae29f551f 100644
--- a/dev-perl/Text-Roman/metadata.xml
+++ b/dev-perl/Text-Roman/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Roman</remote-id>
     <remote-id type="cpan-module">Text::Roman</remote-id>
diff --git a/dev-perl/Text-Shellwords/metadata.xml b/dev-perl/Text-Shellwords/metadata.xml
index 771cbf32330d..3bc9e57ba96b 100644
--- a/dev-perl/Text-Shellwords/metadata.xml
+++ b/dev-perl/Text-Shellwords/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Shellwords</remote-id>
     <remote-id type="cpan-module">Text::Shellwords</remote-id>
diff --git a/dev-perl/Text-Table/metadata.xml b/dev-perl/Text-Table/metadata.xml
index 4a148feabd79..0ecfe63883f6 100644
--- a/dev-perl/Text-Table/metadata.xml
+++ b/dev-perl/Text-Table/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Table</remote-id>
     <remote-id type="cpan-module">Text::Table</remote-id>
diff --git a/dev-perl/Text-Unaccent/metadata.xml b/dev-perl/Text-Unaccent/metadata.xml
index c66773654bd6..615d5b4d4ec0 100644
--- a/dev-perl/Text-Unaccent/metadata.xml
+++ b/dev-perl/Text-Unaccent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Unaccent</remote-id>
     <remote-id type="cpan-module">Text::Unaccent</remote-id>
diff --git a/dev-perl/Text-Unidecode/metadata.xml b/dev-perl/Text-Unidecode/metadata.xml
index c9be3adbd932..dfea0b9e786b 100644
--- a/dev-perl/Text-Unidecode/metadata.xml
+++ b/dev-perl/Text-Unidecode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Unidecode</remote-id>
     <remote-id type="cpan-module">Text::Unidecode</remote-id>
diff --git a/dev-perl/Text-VimColor/metadata.xml b/dev-perl/Text-VimColor/metadata.xml
index 332964089596..1d965cad0178 100644
--- a/dev-perl/Text-VimColor/metadata.xml
+++ b/dev-perl/Text-VimColor/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-VimColor</remote-id>
     <remote-id type="cpan-module">Text::VimColor</remote-id>
diff --git a/dev-perl/Text-WikiFormat/metadata.xml b/dev-perl/Text-WikiFormat/metadata.xml
index 46d5f135fa69..98f474c8842d 100644
--- a/dev-perl/Text-WikiFormat/metadata.xml
+++ b/dev-perl/Text-WikiFormat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-WikiFormat</remote-id>
     <remote-id type="cpan-module">Text::WikiFormat</remote-id>
diff --git a/dev-perl/Text-WrapI18N/metadata.xml b/dev-perl/Text-WrapI18N/metadata.xml
index 4ed8c96a6c82..c4eb65cbe5ea 100644
--- a/dev-perl/Text-WrapI18N/metadata.xml
+++ b/dev-perl/Text-WrapI18N/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-WrapI18N</remote-id>
     <remote-id type="cpan-module">Text::WrapI18N</remote-id>
diff --git a/dev-perl/Text-vFile-asData/metadata.xml b/dev-perl/Text-vFile-asData/metadata.xml
index 6be698052fbc..4e9613f57d9b 100644
--- a/dev-perl/Text-vFile-asData/metadata.xml
+++ b/dev-perl/Text-vFile-asData/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-vFile-asData</remote-id>
     <remote-id type="cpan-module">Text::vFile::asData</remote-id>
diff --git a/dev-perl/TheSchwartz/metadata.xml b/dev-perl/TheSchwartz/metadata.xml
index 2156b722459c..f1160b302c67 100644
--- a/dev-perl/TheSchwartz/metadata.xml
+++ b/dev-perl/TheSchwartz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">TheSchwartz</remote-id>
     <remote-id type="cpan-module">TheSchwartz</remote-id>
diff --git a/dev-perl/Throwable/metadata.xml b/dev-perl/Throwable/metadata.xml
index f5223fffb11b..5294553858d0 100644
--- a/dev-perl/Throwable/metadata.xml
+++ b/dev-perl/Throwable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Throwable</remote-id>
     <remote-id type="cpan-module">StackTrace::Auto</remote-id>
diff --git a/dev-perl/Tie-Array-Sorted/metadata.xml b/dev-perl/Tie-Array-Sorted/metadata.xml
index 746f34cc9a85..acbe8b496142 100644
--- a/dev-perl/Tie-Array-Sorted/metadata.xml
+++ b/dev-perl/Tie-Array-Sorted/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Array-Sorted</remote-id>
     <remote-id type="cpan-module">Tie::Array::Sorted</remote-id>
diff --git a/dev-perl/Tie-CPHash/metadata.xml b/dev-perl/Tie-CPHash/metadata.xml
index b2b42f55b4fd..07d2539620fa 100644
--- a/dev-perl/Tie-CPHash/metadata.xml
+++ b/dev-perl/Tie-CPHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Tie-CPHash</remote-id>
                 <remote-id type="cpan-module">Tie::CPHash</remote-id>
diff --git a/dev-perl/Tie-Cache-LRU-Expires/metadata.xml b/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
index 9b85634db765..07cc3b2f784f 100644
--- a/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
+++ b/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Cache-LRU-Expires</remote-id>
     <remote-id type="cpan-module">Tie::Cache::LRU::Expires</remote-id>
diff --git a/dev-perl/Tie-Cache-LRU/metadata.xml b/dev-perl/Tie-Cache-LRU/metadata.xml
index 810c1b640ce2..c5e7cae36267 100644
--- a/dev-perl/Tie-Cache-LRU/metadata.xml
+++ b/dev-perl/Tie-Cache-LRU/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Cache-LRU</remote-id>
     <remote-id type="cpan-module">Tie::Cache::LRU</remote-id>
diff --git a/dev-perl/Tie-Cache/metadata.xml b/dev-perl/Tie-Cache/metadata.xml
index daf27a54044a..b482c119672d 100644
--- a/dev-perl/Tie-Cache/metadata.xml
+++ b/dev-perl/Tie-Cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Cache</remote-id>
     <remote-id type="cpan-module">Tie::Cache</remote-id>
diff --git a/dev-perl/Tie-Cycle/metadata.xml b/dev-perl/Tie-Cycle/metadata.xml
index 80be9b2492ae..be631060189d 100644
--- a/dev-perl/Tie-Cycle/metadata.xml
+++ b/dev-perl/Tie-Cycle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Tie-Cycle</remote-id>
 		<remote-id type="cpan-module">Tie::Cycle</remote-id>
diff --git a/dev-perl/Tie-Hash-Method/metadata.xml b/dev-perl/Tie-Hash-Method/metadata.xml
index fe23d75c7c15..cdf16f1cf7dd 100644
--- a/dev-perl/Tie-Hash-Method/metadata.xml
+++ b/dev-perl/Tie-Hash-Method/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>kentfredric@gmail.com</email>
 		<name>Kent Fredric</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Tie-Hash-Method</remote-id>
 		<remote-id type="cpan-module">Tie::Hash::Method</remote-id>
diff --git a/dev-perl/Tie-IxHash/metadata.xml b/dev-perl/Tie-IxHash/metadata.xml
index 8ff0da1d0a41..0c02234c8848 100644
--- a/dev-perl/Tie-IxHash/metadata.xml
+++ b/dev-perl/Tie-IxHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-IxHash</remote-id>
     <remote-id type="cpan-module">Tie::IxHash</remote-id>
diff --git a/dev-perl/Tie-LLHash/metadata.xml b/dev-perl/Tie-LLHash/metadata.xml
index 910b62153b86..3e9d1740d9ab 100644
--- a/dev-perl/Tie-LLHash/metadata.xml
+++ b/dev-perl/Tie-LLHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-LLHash</remote-id>
     <remote-id type="cpan-module">Tie::LLHash</remote-id>
diff --git a/dev-perl/Tie-ShadowHash/metadata.xml b/dev-perl/Tie-ShadowHash/metadata.xml
index 039e37cd8332..cc506aaca255 100644
--- a/dev-perl/Tie-ShadowHash/metadata.xml
+++ b/dev-perl/Tie-ShadowHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-ShadowHash</remote-id>
     <remote-id type="cpan-module">Tie::ShadowHash</remote-id>
diff --git a/dev-perl/Tie-Simple/metadata.xml b/dev-perl/Tie-Simple/metadata.xml
index ac580875533e..14ae7261249b 100644
--- a/dev-perl/Tie-Simple/metadata.xml
+++ b/dev-perl/Tie-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Simple</remote-id>
     <remote-id type="cpan-module">Tie::Simple</remote-id>
diff --git a/dev-perl/Tie-StrictHash/metadata.xml b/dev-perl/Tie-StrictHash/metadata.xml
index 8ed1ae96b5cb..5157259b34b3 100644
--- a/dev-perl/Tie-StrictHash/metadata.xml
+++ b/dev-perl/Tie-StrictHash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-StrictHash</remote-id>
     <remote-id type="cpan-module">Tie::StrictHash</remote-id>
diff --git a/dev-perl/Tie-Sub/metadata.xml b/dev-perl/Tie-Sub/metadata.xml
index 3e1f9348b949..94546db910c9 100644
--- a/dev-perl/Tie-Sub/metadata.xml
+++ b/dev-perl/Tie-Sub/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>kentfredric@gmail.com</email>
     <name>Kent Fredric</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Sub</remote-id>
     <remote-id type="cpan-module">Tie::Sub</remote-id>
diff --git a/dev-perl/Tie-ToObject/metadata.xml b/dev-perl/Tie-ToObject/metadata.xml
index 54a857dfc90c..c57b945bab0e 100644
--- a/dev-perl/Tie-ToObject/metadata.xml
+++ b/dev-perl/Tie-ToObject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-ToObject</remote-id>
     <remote-id type="cpan-module">Tie::ToObject</remote-id>
diff --git a/dev-perl/Time-Duration-Parse/metadata.xml b/dev-perl/Time-Duration-Parse/metadata.xml
index 15b36f866e93..6e6b63763c94 100644
--- a/dev-perl/Time-Duration-Parse/metadata.xml
+++ b/dev-perl/Time-Duration-Parse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Duration-Parse</remote-id>
     <remote-id type="cpan-module">Time::Duration::Parse</remote-id>
diff --git a/dev-perl/Time-Duration/metadata.xml b/dev-perl/Time-Duration/metadata.xml
index 3227eacf79ce..36cbb0991aab 100644
--- a/dev-perl/Time-Duration/metadata.xml
+++ b/dev-perl/Time-Duration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Duration</remote-id>
     <remote-id type="cpan-module">Time::Duration</remote-id>
diff --git a/dev-perl/Time-Format/metadata.xml b/dev-perl/Time-Format/metadata.xml
index d68274e71b48..5a6a2047f305 100644
--- a/dev-perl/Time-Format/metadata.xml
+++ b/dev-perl/Time-Format/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Time-Format</remote-id>
                 <remote-id type="cpan-module">Time::Format</remote-id>
diff --git a/dev-perl/Time-Out/metadata.xml b/dev-perl/Time-Out/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Time-Out/metadata.xml
+++ b/dev-perl/Time-Out/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Time-Piece-MySQL/metadata.xml b/dev-perl/Time-Piece-MySQL/metadata.xml
index 5d475a8b3421..a34cea0050a4 100644
--- a/dev-perl/Time-Piece-MySQL/metadata.xml
+++ b/dev-perl/Time-Piece-MySQL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Piece-MySQL</remote-id>
     <remote-id type="cpan-module">Time::Piece</remote-id>
diff --git a/dev-perl/Time-Stopwatch/metadata.xml b/dev-perl/Time-Stopwatch/metadata.xml
index 705a375d3a90..7870257b63c0 100644
--- a/dev-perl/Time-Stopwatch/metadata.xml
+++ b/dev-perl/Time-Stopwatch/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Stopwatch</remote-id>
     <remote-id type="cpan-module">Time::Stopwatch</remote-id>
diff --git a/dev-perl/Time-TAI64/metadata.xml b/dev-perl/Time-TAI64/metadata.xml
index 8b90330495fb..a03a25b31024 100644
--- a/dev-perl/Time-TAI64/metadata.xml
+++ b/dev-perl/Time-TAI64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-TAI64</remote-id>
     <remote-id type="cpan-module">Time::TAI64</remote-id>
diff --git a/dev-perl/Time-modules/metadata.xml b/dev-perl/Time-modules/metadata.xml
index 283954addcf0..418fa65ab4e8 100644
--- a/dev-perl/Time-modules/metadata.xml
+++ b/dev-perl/Time-modules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-modules</remote-id>
     <remote-id type="cpan-module">Time::CTime</remote-id>
diff --git a/dev-perl/TimeDate/metadata.xml b/dev-perl/TimeDate/metadata.xml
index b7c85deba535..265e4c4f55da 100644
--- a/dev-perl/TimeDate/metadata.xml
+++ b/dev-perl/TimeDate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">TimeDate</remote-id>
     <remote-id type="cpan-module">Date::Format</remote-id>
diff --git a/dev-perl/Tk-CursorControl/metadata.xml b/dev-perl/Tk-CursorControl/metadata.xml
index 365369fe1868..b1853d3266cd 100644
--- a/dev-perl/Tk-CursorControl/metadata.xml
+++ b/dev-perl/Tk-CursorControl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tk-CursorControl</remote-id>
     <remote-id type="cpan-module">Tk::CursorControl</remote-id>
diff --git a/dev-perl/Tk-JPEG-Lite/metadata.xml b/dev-perl/Tk-JPEG-Lite/metadata.xml
index 945db46d9b70..ecd64def3820 100644
--- a/dev-perl/Tk-JPEG-Lite/metadata.xml
+++ b/dev-perl/Tk-JPEG-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tk-JPEG-Lite</remote-id>
     <remote-id type="cpan-module">Tk::JPEG::Lite</remote-id>
diff --git a/dev-perl/Tk-TableMatrix/metadata.xml b/dev-perl/Tk-TableMatrix/metadata.xml
index 8ad76deef2c1..06f52fae2788 100644
--- a/dev-perl/Tk-TableMatrix/metadata.xml
+++ b/dev-perl/Tk-TableMatrix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tk-TableMatrix</remote-id>
     <remote-id type="cpan-module">Tk::TableMatrix</remote-id>
diff --git a/dev-perl/Tree-DAG_Node/metadata.xml b/dev-perl/Tree-DAG_Node/metadata.xml
index 49c8d281dcdf..6475471291f2 100644
--- a/dev-perl/Tree-DAG_Node/metadata.xml
+++ b/dev-perl/Tree-DAG_Node/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tree-DAG_Node</remote-id>
     <remote-id type="cpan-module">Tree::DAG_Node</remote-id>
diff --git a/dev-perl/Tree-Simple/metadata.xml b/dev-perl/Tree-Simple/metadata.xml
index 5d5de123946f..38a26c68a304 100644
--- a/dev-perl/Tree-Simple/metadata.xml
+++ b/dev-perl/Tree-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tree-Simple</remote-id>
     <remote-id type="cpan-module">Tree::Simple</remote-id>
diff --git a/dev-perl/Try-Tiny/metadata.xml b/dev-perl/Try-Tiny/metadata.xml
index 67a411aa7a69..9bd4da1f4e4f 100644
--- a/dev-perl/Try-Tiny/metadata.xml
+++ b/dev-perl/Try-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Try-Tiny</remote-id>
     <remote-id type="cpan-module">Try::Tiny</remote-id>
diff --git a/dev-perl/Type-Tiny/metadata.xml b/dev-perl/Type-Tiny/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Type-Tiny/metadata.xml
+++ b/dev-perl/Type-Tiny/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Types-Serialiser/metadata.xml b/dev-perl/Types-Serialiser/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Types-Serialiser/metadata.xml
+++ b/dev-perl/Types-Serialiser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/UNIVERSAL-can/metadata.xml b/dev-perl/UNIVERSAL-can/metadata.xml
index 153a7ac964bc..a01119d68fd6 100644
--- a/dev-perl/UNIVERSAL-can/metadata.xml
+++ b/dev-perl/UNIVERSAL-can/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-can</remote-id>
     <remote-id type="cpan-module">UNIVERSAL::can</remote-id>
diff --git a/dev-perl/UNIVERSAL-isa/metadata.xml b/dev-perl/UNIVERSAL-isa/metadata.xml
index cb3325017a20..533e1f4ac505 100644
--- a/dev-perl/UNIVERSAL-isa/metadata.xml
+++ b/dev-perl/UNIVERSAL-isa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-isa</remote-id>
     <remote-id type="cpan-module">UNIVERSAL::isa</remote-id>
diff --git a/dev-perl/UNIVERSAL-moniker/metadata.xml b/dev-perl/UNIVERSAL-moniker/metadata.xml
index 31a06e578e8a..994e9b2e5a6d 100644
--- a/dev-perl/UNIVERSAL-moniker/metadata.xml
+++ b/dev-perl/UNIVERSAL-moniker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-moniker</remote-id>
     <remote-id type="cpan-module">UNIVERSAL</remote-id>
diff --git a/dev-perl/UNIVERSAL-require/metadata.xml b/dev-perl/UNIVERSAL-require/metadata.xml
index 22aee9aaeaa7..0b0e2770217d 100644
--- a/dev-perl/UNIVERSAL-require/metadata.xml
+++ b/dev-perl/UNIVERSAL-require/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-require</remote-id>
     <remote-id type="cpan-module">UNIVERSAL</remote-id>
diff --git a/dev-perl/URI-Encode/metadata.xml b/dev-perl/URI-Encode/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/URI-Encode/metadata.xml
+++ b/dev-perl/URI-Encode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/URI-Fetch/metadata.xml b/dev-perl/URI-Fetch/metadata.xml
index f42dc7cbac91..6e166fa553ae 100644
--- a/dev-perl/URI-Fetch/metadata.xml
+++ b/dev-perl/URI-Fetch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">URI-Fetch</remote-id>
     <remote-id type="cpan-module">URI::Fetch</remote-id>
diff --git a/dev-perl/URI-Find/metadata.xml b/dev-perl/URI-Find/metadata.xml
index b357f5149633..1fc693046a75 100644
--- a/dev-perl/URI-Find/metadata.xml
+++ b/dev-perl/URI-Find/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">URI-Find</remote-id>
     <remote-id type="cpan-module">URI::Find</remote-id>
diff --git a/dev-perl/URI/metadata.xml b/dev-perl/URI/metadata.xml
index d1083f8dcce8..246109ef74bc 100644
--- a/dev-perl/URI/metadata.xml
+++ b/dev-perl/URI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">URI</remote-id>
     <remote-id type="cpan-module">URI</remote-id>
diff --git a/dev-perl/UUID-Tiny/metadata.xml b/dev-perl/UUID-Tiny/metadata.xml
index 4194b797226e..c4e2b51607d6 100644
--- a/dev-perl/UUID-Tiny/metadata.xml
+++ b/dev-perl/UUID-Tiny/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
@@ -10,6 +9,10 @@
 		<email>dev-zero@gentoo.org</email>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 	<longdescription>UUID::Tiny is a lightweight, low dependency Pure Perl module for UUID creation and testing. This module provides the creation of version 1 time based UUIDs (using random multicast MAC addresses), version 3 MD5 based UUIDs, version 4 random UUIDs, and version 5 SHA-1 based UUIDs.</longdescription>
   <upstream>
     <remote-id type="cpan">UUID-Tiny</remote-id>
diff --git a/dev-perl/UUID/metadata.xml b/dev-perl/UUID/metadata.xml
index d9007e6c75c0..956617da20bc 100644
--- a/dev-perl/UUID/metadata.xml
+++ b/dev-perl/UUID/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">UUID</remote-id>
                 <remote-id type="cpan-module">UUID</remote-id>
diff --git a/dev-perl/UltraDNS/metadata.xml b/dev-perl/UltraDNS/metadata.xml
index a2c8a606fdd7..d2791493f254 100644
--- a/dev-perl/UltraDNS/metadata.xml
+++ b/dev-perl/UltraDNS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">UltraDNS</remote-id>
     <remote-id type="cpan-module">UltraDNS</remote-id>
diff --git a/dev-perl/Unicode-EastAsianWidth/metadata.xml b/dev-perl/Unicode-EastAsianWidth/metadata.xml
index 391331998c1c..3fc107ed2da5 100644
--- a/dev-perl/Unicode-EastAsianWidth/metadata.xml
+++ b/dev-perl/Unicode-EastAsianWidth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Unicode-EastAsianWidth</remote-id>
 		<remote-id type="cpan-module">Unicode::EastAsianWidth</remote-id>
diff --git a/dev-perl/Unicode-LineBreak/metadata.xml b/dev-perl/Unicode-LineBreak/metadata.xml
index f9233927a8a3..0c8da88b82b6 100644
--- a/dev-perl/Unicode-LineBreak/metadata.xml
+++ b/dev-perl/Unicode-LineBreak/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-LineBreak</remote-id>
     <remote-id type="cpan-module">Unicode::GCString</remote-id>
diff --git a/dev-perl/Unicode-Map/metadata.xml b/dev-perl/Unicode-Map/metadata.xml
index 7bebb90e67ac..c4ca21796a48 100644
--- a/dev-perl/Unicode-Map/metadata.xml
+++ b/dev-perl/Unicode-Map/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-Map</remote-id>
     <remote-id type="cpan-module">Unicode::Map</remote-id>
diff --git a/dev-perl/Unicode-Map8/metadata.xml b/dev-perl/Unicode-Map8/metadata.xml
index 5bde22b80aba..92cfc2270a54 100644
--- a/dev-perl/Unicode-Map8/metadata.xml
+++ b/dev-perl/Unicode-Map8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-Map8</remote-id>
     <remote-id type="cpan-module">Unicode::Map8</remote-id>
diff --git a/dev-perl/Unicode-MapUTF8/metadata.xml b/dev-perl/Unicode-MapUTF8/metadata.xml
index 9bd2eebde818..894c289ca4bc 100644
--- a/dev-perl/Unicode-MapUTF8/metadata.xml
+++ b/dev-perl/Unicode-MapUTF8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-MapUTF8</remote-id>
     <remote-id type="cpan-module">Unicode::MapUTF8</remote-id>
diff --git a/dev-perl/Unicode-String/metadata.xml b/dev-perl/Unicode-String/metadata.xml
index bbf9e1cf03fc..33a0629a05ac 100644
--- a/dev-perl/Unicode-String/metadata.xml
+++ b/dev-perl/Unicode-String/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-String</remote-id>
     <remote-id type="cpan-module">Unicode::CharName</remote-id>
diff --git a/dev-perl/Unicode-Stringprep/metadata.xml b/dev-perl/Unicode-Stringprep/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/Unicode-Stringprep/metadata.xml
+++ b/dev-perl/Unicode-Stringprep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-UTF8/metadata.xml b/dev-perl/Unicode-UTF8/metadata.xml
index eed32b0c5331..25efff47763a 100644
--- a/dev-perl/Unicode-UTF8/metadata.xml
+++ b/dev-perl/Unicode-UTF8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Unicode-UTF8</remote-id>
 		<remote-id type="cpan-module">Unicode::UTF8</remote-id>
diff --git a/dev-perl/Unicode-UTF8simple/metadata.xml b/dev-perl/Unicode-UTF8simple/metadata.xml
index 712c74eb60a1..73269cf48ca4 100644
--- a/dev-perl/Unicode-UTF8simple/metadata.xml
+++ b/dev-perl/Unicode-UTF8simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unicode-UTF8simple</remote-id>
     <remote-id type="cpan-module">Unicode::UTF8simple</remote-id>
diff --git a/dev-perl/Unix-Getrusage/metadata.xml b/dev-perl/Unix-Getrusage/metadata.xml
index 5f541c59c654..827fd18881e3 100644
--- a/dev-perl/Unix-Getrusage/metadata.xml
+++ b/dev-perl/Unix-Getrusage/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
@@ -10,6 +9,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Unix-Getrusage</remote-id>
 		<remote-id type="cpan-module">Unix::Getrusage</remote-id>
diff --git a/dev-perl/Unix-Syslog/metadata.xml b/dev-perl/Unix-Syslog/metadata.xml
index a7e636b25848..e59ba3b12b36 100644
--- a/dev-perl/Unix-Syslog/metadata.xml
+++ b/dev-perl/Unix-Syslog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Unix-Syslog</remote-id>
     <remote-id type="cpan-module">Unix::Syslog</remote-id>
diff --git a/dev-perl/User-Identity/metadata.xml b/dev-perl/User-Identity/metadata.xml
index d454eef3afc6..d84b663a0b08 100644
--- a/dev-perl/User-Identity/metadata.xml
+++ b/dev-perl/User-Identity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">User-Identity</remote-id>
     <remote-id type="cpan-module">Mail::Identity</remote-id>
diff --git a/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml b/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml
+++ b/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/VM-EC2/metadata.xml b/dev-perl/VM-EC2/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/VM-EC2/metadata.xml
+++ b/dev-perl/VM-EC2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/Validate-Net/metadata.xml b/dev-perl/Validate-Net/metadata.xml
index 6f30fc3807f7..50fd64b4d2b3 100644
--- a/dev-perl/Validate-Net/metadata.xml
+++ b/dev-perl/Validate-Net/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Validate-Net</remote-id>
     <remote-id type="cpan-module">Validate::Net</remote-id>
diff --git a/dev-perl/Validate-Tiny/metadata.xml b/dev-perl/Validate-Tiny/metadata.xml
index 91d158fbb428..385617439273 100644
--- a/dev-perl/Validate-Tiny/metadata.xml
+++ b/dev-perl/Validate-Tiny/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Validate-Tiny</remote-id>
     <remote-id type="cpan-module">Validate::Tiny</remote-id>
diff --git a/dev-perl/Variable-Magic/metadata.xml b/dev-perl/Variable-Magic/metadata.xml
index a35a0bcc6c7e..09472ff35fc3 100644
--- a/dev-perl/Variable-Magic/metadata.xml
+++ b/dev-perl/Variable-Magic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Variable-Magic</remote-id>
     <remote-id type="cpan-module">Variable::Magic</remote-id>
diff --git a/dev-perl/Video-Frequencies/metadata.xml b/dev-perl/Video-Frequencies/metadata.xml
index 96f312e10fb5..1ac73fd01b92 100644
--- a/dev-perl/Video-Frequencies/metadata.xml
+++ b/dev-perl/Video-Frequencies/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<longdescription>
     Driver for ivtv based tv tuner cards, currently supports Hauppauge 
     PVR-[23]50 cards
diff --git a/dev-perl/Video-Info/metadata.xml b/dev-perl/Video-Info/metadata.xml
index 1c095269a377..8d303707353e 100644
--- a/dev-perl/Video-Info/metadata.xml
+++ b/dev-perl/Video-Info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Video-Info</remote-id>
   </upstream>
diff --git a/dev-perl/Video-ivtv/metadata.xml b/dev-perl/Video-ivtv/metadata.xml
index 96f312e10fb5..1ac73fd01b92 100644
--- a/dev-perl/Video-ivtv/metadata.xml
+++ b/dev-perl/Video-ivtv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<longdescription>
     Driver for ivtv based tv tuner cards, currently supports Hauppauge 
     PVR-[23]50 cards
diff --git a/dev-perl/WWW-Bugzilla/metadata.xml b/dev-perl/WWW-Bugzilla/metadata.xml
index db2566abd627..45e5c5ab6e6b 100644
--- a/dev-perl/WWW-Bugzilla/metadata.xml
+++ b/dev-perl/WWW-Bugzilla/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Bugzilla</remote-id>
     <remote-id type="cpan-module">WWW::Bugzilla</remote-id>
diff --git a/dev-perl/WWW-Curl/metadata.xml b/dev-perl/WWW-Curl/metadata.xml
index 2d7ff8f0e4e1..e202e8f09e9d 100644
--- a/dev-perl/WWW-Curl/metadata.xml
+++ b/dev-perl/WWW-Curl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Curl</remote-id>
     <remote-id type="cpan-module">WWW::Curl</remote-id>
diff --git a/dev-perl/WWW-Dict-Leo-Org/metadata.xml b/dev-perl/WWW-Dict-Leo-Org/metadata.xml
index b6cc9d8b1213..d8403a494052 100644
--- a/dev-perl/WWW-Dict-Leo-Org/metadata.xml
+++ b/dev-perl/WWW-Dict-Leo-Org/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Dict-Leo-Org</remote-id>
     <remote-id type="cpan-module">WWW::Dict::Leo::Org</remote-id>
diff --git a/dev-perl/WWW-Mechanize-FormFiller/metadata.xml b/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
index 69da96601d3d..ef34dade9eb9 100644
--- a/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
+++ b/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Mechanize-FormFiller</remote-id>
     <remote-id type="cpan-module">WWW::Mechanize::FormFiller</remote-id>
diff --git a/dev-perl/WWW-Mechanize/metadata.xml b/dev-perl/WWW-Mechanize/metadata.xml
index 17512f8cc2bc..ad8552c413e6 100644
--- a/dev-perl/WWW-Mechanize/metadata.xml
+++ b/dev-perl/WWW-Mechanize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Mechanize</remote-id>
     <remote-id type="cpan-module">WWW::Mechanize</remote-id>
diff --git a/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml b/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
index 1c40bf5a2770..807a22914eb5 100644
--- a/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
+++ b/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Pastebin-PastebinCom-Create</remote-id>
     <remote-id type="cpan-module">WWW::Pastebin::PastebinCom::Create</remote-id>
diff --git a/dev-perl/WWW-RobotRules/metadata.xml b/dev-perl/WWW-RobotRules/metadata.xml
index 8c8f3a8afb95..53d44a86e4b8 100644
--- a/dev-perl/WWW-RobotRules/metadata.xml
+++ b/dev-perl/WWW-RobotRules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">WWW-RobotRules</remote-id>
 		<remote-id type="cpan-module">WWW::RobotRules</remote-id>
diff --git a/dev-perl/WWW-Shorten/metadata.xml b/dev-perl/WWW-Shorten/metadata.xml
index 129acc31b424..9a1eb818f8bf 100644
--- a/dev-perl/WWW-Shorten/metadata.xml
+++ b/dev-perl/WWW-Shorten/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Shorten</remote-id>
     <remote-id type="cpan-module">WWW::Shorten</remote-id>
diff --git a/dev-perl/Want/metadata.xml b/dev-perl/Want/metadata.xml
index bed059b4f105..9730f56b536b 100644
--- a/dev-perl/Want/metadata.xml
+++ b/dev-perl/Want/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Want</remote-id>
     <remote-id type="cpan-module">Want</remote-id>
diff --git a/dev-perl/WattsUp-Daemon/metadata.xml b/dev-perl/WattsUp-Daemon/metadata.xml
index b25e9596b0a8..456fb2ffa667 100644
--- a/dev-perl/WattsUp-Daemon/metadata.xml
+++ b/dev-perl/WattsUp-Daemon/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<description>Upstream author</description>
 	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/WeakRef/metadata.xml b/dev-perl/WeakRef/metadata.xml
index 8eb19a802f80..eacc79fddfde 100644
--- a/dev-perl/WeakRef/metadata.xml
+++ b/dev-perl/WeakRef/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WeakRef</remote-id>
     <remote-id type="cpan-module">WeakRef</remote-id>
diff --git a/dev-perl/Weather-Com/metadata.xml b/dev-perl/Weather-Com/metadata.xml
index 855716ddb2fd..7ecc18082379 100644
--- a/dev-perl/Weather-Com/metadata.xml
+++ b/dev-perl/Weather-Com/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">Weather-Com</remote-id>
                 <remote-id type="cpan-module">Weather::Com</remote-id>
diff --git a/dev-perl/WebService-Linode/metadata.xml b/dev-perl/WebService-Linode/metadata.xml
index e00c64ac6196..e4da4492019a 100644
--- a/dev-perl/WebService-Linode/metadata.xml
+++ b/dev-perl/WebService-Linode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WebService-Linode</remote-id>
     <remote-id type="cpan-module">WebService::Linode</remote-id>
diff --git a/dev-perl/WebService-MusicBrainz/metadata.xml b/dev-perl/WebService-MusicBrainz/metadata.xml
index 0c2dea5683d6..1b45873406e6 100644
--- a/dev-perl/WebService-MusicBrainz/metadata.xml
+++ b/dev-perl/WebService-MusicBrainz/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
-<herd>sound</herd>
+<maintainer>
+<email>perl@gentoo.org</email>
+<name>Gentoo Perl Project</name>
+</maintainer>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
 <upstream>
 <remote-id type="cpan">WebService-MusicBrainz</remote-id>
 <remote-id type="cpan-module">WebService::MusicBrainz</remote-id>
diff --git a/dev-perl/WordNet-QueryData/metadata.xml b/dev-perl/WordNet-QueryData/metadata.xml
index 8c89c88f0bec..a9da83345d35 100644
--- a/dev-perl/WordNet-QueryData/metadata.xml
+++ b/dev-perl/WordNet-QueryData/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">WordNet-QueryData</remote-id>
     <remote-id type="cpan-module">WordNet::QueryData</remote-id>
diff --git a/dev-perl/Wx-Perl-ProcessStream/metadata.xml b/dev-perl/Wx-Perl-ProcessStream/metadata.xml
index 35424c808b1f..1fde474151a6 100644
--- a/dev-perl/Wx-Perl-ProcessStream/metadata.xml
+++ b/dev-perl/Wx-Perl-ProcessStream/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Wx-Perl-ProcessStream</remote-id>
     <remote-id type="cpan-module">Wx::Perl::ProcessStream</remote-id>
diff --git a/dev-perl/Wx-Scintilla/metadata.xml b/dev-perl/Wx-Scintilla/metadata.xml
index 3a18679c453f..6087d97290d4 100644
--- a/dev-perl/Wx-Scintilla/metadata.xml
+++ b/dev-perl/Wx-Scintilla/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Wx-Scintilla</remote-id>
     <remote-id type="cpan-module">Wx::Scintilla</remote-id>
diff --git a/dev-perl/X-Osd/metadata.xml b/dev-perl/X-Osd/metadata.xml
index 6ac0ed9ab3ad..c7840d5cb073 100644
--- a/dev-perl/X-Osd/metadata.xml
+++ b/dev-perl/X-Osd/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">X-Osd</remote-id>
     <remote-id type="cpan-module">X::Osd</remote-id>
diff --git a/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml b/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
index fb6cfb4f41b6..268ca3d61c7a 100644
--- a/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
+++ b/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">X11-FreeDesktop-DesktopEntry</remote-id>
     <remote-id type="cpan-module">X11::FreeDesktop::DesktopEntry</remote-id>
diff --git a/dev-perl/X11-Protocol/metadata.xml b/dev-perl/X11-Protocol/metadata.xml
index b3368e11c13f..2785e8ce04a8 100644
--- a/dev-perl/X11-Protocol/metadata.xml
+++ b/dev-perl/X11-Protocol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">X11-Protocol</remote-id>
     <remote-id type="cpan-module">X11::Auth</remote-id>
diff --git a/dev-perl/X500-DN/metadata.xml b/dev-perl/X500-DN/metadata.xml
index 9b37e180a659..42d797998cca 100644
--- a/dev-perl/X500-DN/metadata.xml
+++ b/dev-perl/X500-DN/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">X500-DN</remote-id>
     <remote-id type="cpan-module">X500::DN</remote-id>
diff --git a/dev-perl/XML-Atom/metadata.xml b/dev-perl/XML-Atom/metadata.xml
index 36dff68033dc..bbf9890d03f0 100644
--- a/dev-perl/XML-Atom/metadata.xml
+++ b/dev-perl/XML-Atom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Atom</remote-id>
     <remote-id type="cpan-module">LWP::UserAgent::AtomClient</remote-id>
diff --git a/dev-perl/XML-AutoWriter/metadata.xml b/dev-perl/XML-AutoWriter/metadata.xml
index a604be022bd4..dfa18f35da52 100644
--- a/dev-perl/XML-AutoWriter/metadata.xml
+++ b/dev-perl/XML-AutoWriter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-AutoWriter</remote-id>
     <remote-id type="cpan-module">XML::AutoWriter</remote-id>
diff --git a/dev-perl/XML-Catalog/metadata.xml b/dev-perl/XML-Catalog/metadata.xml
index d2b8f4a5dd52..601d62bcb697 100644
--- a/dev-perl/XML-Catalog/metadata.xml
+++ b/dev-perl/XML-Catalog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Catalog</remote-id>
     <remote-id type="cpan-module">XML::Catalog</remote-id>
diff --git a/dev-perl/XML-CompactTree-XS/metadata.xml b/dev-perl/XML-CompactTree-XS/metadata.xml
index 2432241b62cf..bdd21af6ce92 100644
--- a/dev-perl/XML-CompactTree-XS/metadata.xml
+++ b/dev-perl/XML-CompactTree-XS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-CompactTree-XS</remote-id>
     <remote-id type="cpan-module">XML::CompactTree::XS</remote-id>
diff --git a/dev-perl/XML-DOM-XPath/metadata.xml b/dev-perl/XML-DOM-XPath/metadata.xml
index 448a489c717e..a07a5fc94f0d 100644
--- a/dev-perl/XML-DOM-XPath/metadata.xml
+++ b/dev-perl/XML-DOM-XPath/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-DOM-XPath</remote-id>
     <remote-id type="cpan-module">XML::DOM::Attr</remote-id>
diff --git a/dev-perl/XML-DOM/metadata.xml b/dev-perl/XML-DOM/metadata.xml
index f9605ded5f81..f9bacf6c51fa 100644
--- a/dev-perl/XML-DOM/metadata.xml
+++ b/dev-perl/XML-DOM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-DOM</remote-id>
     <remote-id type="cpan-module">XML::DOM</remote-id>
diff --git a/dev-perl/XML-DT/metadata.xml b/dev-perl/XML-DT/metadata.xml
index 71d0ed6d0f91..815c7fdbde82 100644
--- a/dev-perl/XML-DT/metadata.xml
+++ b/dev-perl/XML-DT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-DT</remote-id>
     <remote-id type="cpan-module">XML::DT</remote-id>
diff --git a/dev-perl/XML-DTDParser/metadata.xml b/dev-perl/XML-DTDParser/metadata.xml
index 1b11dd4ac12e..3aaae846fc1e 100644
--- a/dev-perl/XML-DTDParser/metadata.xml
+++ b/dev-perl/XML-DTDParser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-DTDParser</remote-id>
     <remote-id type="cpan-module">XML::DTDParser</remote-id>
diff --git a/dev-perl/XML-Directory/metadata.xml b/dev-perl/XML-Directory/metadata.xml
index 65c74848b3e4..21b7a3946516 100644
--- a/dev-perl/XML-Directory/metadata.xml
+++ b/dev-perl/XML-Directory/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Directory</remote-id>
   </upstream>
diff --git a/dev-perl/XML-Dumper/metadata.xml b/dev-perl/XML-Dumper/metadata.xml
index 0c3c74d22337..85b271e6e55d 100644
--- a/dev-perl/XML-Dumper/metadata.xml
+++ b/dev-perl/XML-Dumper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Dumper</remote-id>
     <remote-id type="cpan-module">XML::Dumper</remote-id>
diff --git a/dev-perl/XML-Elemental/metadata.xml b/dev-perl/XML-Elemental/metadata.xml
index 5af787e06fdb..7bca209e976b 100644
--- a/dev-perl/XML-Elemental/metadata.xml
+++ b/dev-perl/XML-Elemental/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Elemental</remote-id>
     <remote-id type="cpan-module">XML::Elemental</remote-id>
diff --git a/dev-perl/XML-Encoding/metadata.xml b/dev-perl/XML-Encoding/metadata.xml
index ab888e63f395..e1f3153f1706 100644
--- a/dev-perl/XML-Encoding/metadata.xml
+++ b/dev-perl/XML-Encoding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Encoding</remote-id>
     <remote-id type="cpan-module">XML::Encoding</remote-id>
diff --git a/dev-perl/XML-Entities/metadata.xml b/dev-perl/XML-Entities/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/XML-Entities/metadata.xml
+++ b/dev-perl/XML-Entities/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/XML-Fast/metadata.xml b/dev-perl/XML-Fast/metadata.xml
index 3a77dc7c4e4e..74f81db779f8 100644
--- a/dev-perl/XML-Fast/metadata.xml
+++ b/dev-perl/XML-Fast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Fast</remote-id>
     <remote-id type="cpan-module">XML::Fast</remote-id>
diff --git a/dev-perl/XML-Feed/metadata.xml b/dev-perl/XML-Feed/metadata.xml
index 3381d692eb98..a55258ec5a07 100644
--- a/dev-perl/XML-Feed/metadata.xml
+++ b/dev-perl/XML-Feed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Feed</remote-id>
     <remote-id type="cpan-module">XML::Feed</remote-id>
diff --git a/dev-perl/XML-Filter-BufferText/metadata.xml b/dev-perl/XML-Filter-BufferText/metadata.xml
index 6d3c9b77b859..e9187d82a61e 100644
--- a/dev-perl/XML-Filter-BufferText/metadata.xml
+++ b/dev-perl/XML-Filter-BufferText/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Filter-BufferText</remote-id>
     <remote-id type="cpan-module">XML::Filter::BufferText</remote-id>
diff --git a/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml b/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
index 91141e2898dc..fef119b24042 100644
--- a/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
+++ b/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Filter-DOMFilter-LibXML</remote-id>
     <remote-id type="cpan-module">XML::Filter::DOMFilter::LibXML</remote-id>
diff --git a/dev-perl/XML-Generator/metadata.xml b/dev-perl/XML-Generator/metadata.xml
index e36e724f2060..fabfae5516ba 100644
--- a/dev-perl/XML-Generator/metadata.xml
+++ b/dev-perl/XML-Generator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Generator</remote-id>
     <remote-id type="cpan-module">XML::Generator</remote-id>
diff --git a/dev-perl/XML-Grove/metadata.xml b/dev-perl/XML-Grove/metadata.xml
index fd88ad2dc2d4..26beaf897bd0 100644
--- a/dev-perl/XML-Grove/metadata.xml
+++ b/dev-perl/XML-Grove/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Grove</remote-id>
     <remote-id type="cpan-module">XML::Grove</remote-id>
diff --git a/dev-perl/XML-Handler-YAWriter/metadata.xml b/dev-perl/XML-Handler-YAWriter/metadata.xml
index a704223da5bf..4455cd1f2006 100644
--- a/dev-perl/XML-Handler-YAWriter/metadata.xml
+++ b/dev-perl/XML-Handler-YAWriter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Handler-YAWriter</remote-id>
     <remote-id type="cpan-module">XML::Handler::YAWriter</remote-id>
diff --git a/dev-perl/XML-LibXML-Iterator/metadata.xml b/dev-perl/XML-LibXML-Iterator/metadata.xml
index 31706fdd9acd..eccedd3829b1 100644
--- a/dev-perl/XML-LibXML-Iterator/metadata.xml
+++ b/dev-perl/XML-LibXML-Iterator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-LibXML-Iterator</remote-id>
     <remote-id type="cpan-module">XML::LibXML::Iterator</remote-id>
diff --git a/dev-perl/XML-LibXML-Simple/metadata.xml b/dev-perl/XML-LibXML-Simple/metadata.xml
index e677b06e9b64..fd50ba0709c4 100644
--- a/dev-perl/XML-LibXML-Simple/metadata.xml
+++ b/dev-perl/XML-LibXML-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-LibXML-Simple</remote-id>
     <remote-id type="cpan-module">XML::LibXML::Simple</remote-id>
diff --git a/dev-perl/XML-LibXML/metadata.xml b/dev-perl/XML-LibXML/metadata.xml
index e4232c704e27..15eaa1012dfc 100644
--- a/dev-perl/XML-LibXML/metadata.xml
+++ b/dev-perl/XML-LibXML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-LibXML</remote-id>
     <remote-id type="cpan-module">XML::LibXML</remote-id>
diff --git a/dev-perl/XML-LibXSLT/metadata.xml b/dev-perl/XML-LibXSLT/metadata.xml
index c753b08f55f5..a0565c0db285 100644
--- a/dev-perl/XML-LibXSLT/metadata.xml
+++ b/dev-perl/XML-LibXSLT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-LibXSLT</remote-id>
     <remote-id type="cpan-module">Driver::BaseClass</remote-id>
diff --git a/dev-perl/XML-Mini/metadata.xml b/dev-perl/XML-Mini/metadata.xml
index 4ca41f9e143e..de945dad9150 100644
--- a/dev-perl/XML-Mini/metadata.xml
+++ b/dev-perl/XML-Mini/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Mini</remote-id>
     <remote-id type="cpan-module">XML::Mini</remote-id>
diff --git a/dev-perl/XML-NamespaceSupport/metadata.xml b/dev-perl/XML-NamespaceSupport/metadata.xml
index 1e3c5115fd46..cbc24fe9efe8 100644
--- a/dev-perl/XML-NamespaceSupport/metadata.xml
+++ b/dev-perl/XML-NamespaceSupport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-NamespaceSupport</remote-id>
     <remote-id type="cpan-module">XML::NamespaceSupport</remote-id>
diff --git a/dev-perl/XML-NodeFilter/metadata.xml b/dev-perl/XML-NodeFilter/metadata.xml
index 0df290afe025..07c7441026aa 100644
--- a/dev-perl/XML-NodeFilter/metadata.xml
+++ b/dev-perl/XML-NodeFilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-NodeFilter</remote-id>
     <remote-id type="cpan-module">XML::NodeFilter</remote-id>
diff --git a/dev-perl/XML-Parser-Lite/metadata.xml b/dev-perl/XML-Parser-Lite/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/XML-Parser-Lite/metadata.xml
+++ b/dev-perl/XML-Parser-Lite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/XML-Parser/metadata.xml b/dev-perl/XML-Parser/metadata.xml
index c867a87635c1..da0aef7294d8 100644
--- a/dev-perl/XML-Parser/metadata.xml
+++ b/dev-perl/XML-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Parser</remote-id>
     <remote-id type="cpan-module">XML::Parser</remote-id>
diff --git a/dev-perl/XML-RAI/metadata.xml b/dev-perl/XML-RAI/metadata.xml
index 61f38fb044ba..05be32a70b09 100644
--- a/dev-perl/XML-RAI/metadata.xml
+++ b/dev-perl/XML-RAI/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-RAI</remote-id>
     <remote-id type="cpan-module">XML::RAI</remote-id>
diff --git a/dev-perl/XML-RSS-Feed/metadata.xml b/dev-perl/XML-RSS-Feed/metadata.xml
index c6df7b4a746e..3c858c4daac2 100644
--- a/dev-perl/XML-RSS-Feed/metadata.xml
+++ b/dev-perl/XML-RSS-Feed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-RSS-Feed</remote-id>
     <remote-id type="cpan-module">XML::RSS::Feed</remote-id>
diff --git a/dev-perl/XML-RSS-Parser/metadata.xml b/dev-perl/XML-RSS-Parser/metadata.xml
index e84028f7b09d..aadbfe92a74b 100644
--- a/dev-perl/XML-RSS-Parser/metadata.xml
+++ b/dev-perl/XML-RSS-Parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-RSS-Parser</remote-id>
     <remote-id type="cpan-module">XML::RSS::Parser</remote-id>
diff --git a/dev-perl/XML-RSS/metadata.xml b/dev-perl/XML-RSS/metadata.xml
index a1a12d967a82..dce1e2f92f9e 100644
--- a/dev-perl/XML-RSS/metadata.xml
+++ b/dev-perl/XML-RSS/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-RSS</remote-id>
     <remote-id type="cpan-module">XML::RSS</remote-id>
diff --git a/dev-perl/XML-RegExp/metadata.xml b/dev-perl/XML-RegExp/metadata.xml
index 42d9c6f2819e..ee897c030235 100644
--- a/dev-perl/XML-RegExp/metadata.xml
+++ b/dev-perl/XML-RegExp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>
 		This package contains regular expressions for the following XML tokens:
 		BaseChar, Ideographic, Letter, Digit, Extender, CombiningChar, NameChar,
diff --git a/dev-perl/XML-SAX-Base/metadata.xml b/dev-perl/XML-SAX-Base/metadata.xml
index 2440c164abd7..99f8885bea52 100644
--- a/dev-perl/XML-SAX-Base/metadata.xml
+++ b/dev-perl/XML-SAX-Base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">XML-SAX-Base</remote-id>
 		<remote-id type="cpan-module">XML::SAX::Base</remote-id>
diff --git a/dev-perl/XML-SAX-Expat/metadata.xml b/dev-perl/XML-SAX-Expat/metadata.xml
index 521d36d4d52e..d6c3a3335caf 100644
--- a/dev-perl/XML-SAX-Expat/metadata.xml
+++ b/dev-perl/XML-SAX-Expat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-SAX-Expat</remote-id>
     <remote-id type="cpan-module">XML::SAX::Expat</remote-id>
diff --git a/dev-perl/XML-SAX-Writer/metadata.xml b/dev-perl/XML-SAX-Writer/metadata.xml
index c981f1f48a8b..c78cec28c638 100644
--- a/dev-perl/XML-SAX-Writer/metadata.xml
+++ b/dev-perl/XML-SAX-Writer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-SAX-Writer</remote-id>
     <remote-id type="cpan-module">XML::SAX::Writer</remote-id>
diff --git a/dev-perl/XML-SAX/metadata.xml b/dev-perl/XML-SAX/metadata.xml
index 1d4aefa3a393..11a570db0884 100644
--- a/dev-perl/XML-SAX/metadata.xml
+++ b/dev-perl/XML-SAX/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-SAX</remote-id>
     <remote-id type="cpan-module">XML::SAX</remote-id>
diff --git a/dev-perl/XML-Simple-DTDReader/metadata.xml b/dev-perl/XML-Simple-DTDReader/metadata.xml
index 32599e4ab4cd..b7ec21edba7d 100644
--- a/dev-perl/XML-Simple-DTDReader/metadata.xml
+++ b/dev-perl/XML-Simple-DTDReader/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Simple-DTDReader</remote-id>
     <remote-id type="cpan-module">XML::Simple::DTDReader</remote-id>
diff --git a/dev-perl/XML-Simple/metadata.xml b/dev-perl/XML-Simple/metadata.xml
index b1de76f39212..6d6ee4012448 100644
--- a/dev-perl/XML-Simple/metadata.xml
+++ b/dev-perl/XML-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Simple</remote-id>
     <remote-id type="cpan-module">XML::Simple</remote-id>
diff --git a/dev-perl/XML-SimpleObject/metadata.xml b/dev-perl/XML-SimpleObject/metadata.xml
index 745565f7bc8f..72fda0e4a5c4 100644
--- a/dev-perl/XML-SimpleObject/metadata.xml
+++ b/dev-perl/XML-SimpleObject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-SimpleObject</remote-id>
     <remote-id type="cpan-module">XML::SimpleObject</remote-id>
diff --git a/dev-perl/XML-Smart/metadata.xml b/dev-perl/XML-Smart/metadata.xml
index e16a474be0fc..58b62244f979 100644
--- a/dev-perl/XML-Smart/metadata.xml
+++ b/dev-perl/XML-Smart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">XML-Smart</remote-id>
                 <remote-id type="cpan-module">XML::Smart</remote-id>
diff --git a/dev-perl/XML-Stream/metadata.xml b/dev-perl/XML-Stream/metadata.xml
index 77dca91c5266..5fb0e676c279 100644
--- a/dev-perl/XML-Stream/metadata.xml
+++ b/dev-perl/XML-Stream/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Stream</remote-id>
     <remote-id type="cpan-module">XML::Stream</remote-id>
diff --git a/dev-perl/XML-TreePP/metadata.xml b/dev-perl/XML-TreePP/metadata.xml
index e2a03acd7a34..154969ef8064 100644
--- a/dev-perl/XML-TreePP/metadata.xml
+++ b/dev-perl/XML-TreePP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>perl</herd>
+        <maintainer>
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
         <upstream>
                 <remote-id type="cpan">XML-TreePP</remote-id>
                 <remote-id type="cpan-module">XML::TreePP</remote-id>
diff --git a/dev-perl/XML-Twig/metadata.xml b/dev-perl/XML-Twig/metadata.xml
index e9bf58bb62ca..c6c777de6426 100644
--- a/dev-perl/XML-Twig/metadata.xml
+++ b/dev-perl/XML-Twig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Twig</remote-id>
     <remote-id type="cpan-module">XML::Twig</remote-id>
diff --git a/dev-perl/XML-Validator-Schema/metadata.xml b/dev-perl/XML-Validator-Schema/metadata.xml
index 4e70ceecfa92..bd95f678b530 100644
--- a/dev-perl/XML-Validator-Schema/metadata.xml
+++ b/dev-perl/XML-Validator-Schema/metadata.xml
@@ -5,7 +5,10 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Validator-Schema</remote-id>
     <remote-id type="cpan-module">XML::Validator::Schema</remote-id>
diff --git a/dev-perl/XML-Writer/metadata.xml b/dev-perl/XML-Writer/metadata.xml
index b221467b61a8..d21453e4a58f 100644
--- a/dev-perl/XML-Writer/metadata.xml
+++ b/dev-perl/XML-Writer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Writer</remote-id>
     <remote-id type="cpan-module">XML::Writer</remote-id>
diff --git a/dev-perl/XML-XPath/metadata.xml b/dev-perl/XML-XPath/metadata.xml
index d5b7fa35f156..aeba7e91ff3d 100644
--- a/dev-perl/XML-XPath/metadata.xml
+++ b/dev-perl/XML-XPath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XPath</remote-id>
     <remote-id type="cpan-module">XML::XPath</remote-id>
diff --git a/dev-perl/XML-XPathEngine/metadata.xml b/dev-perl/XML-XPathEngine/metadata.xml
index d7e19b4a546b..eda858f7c0ac 100644
--- a/dev-perl/XML-XPathEngine/metadata.xml
+++ b/dev-perl/XML-XPathEngine/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>perl</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XPathEngine</remote-id>
     <remote-id type="cpan-module">XML::XPathEngine</remote-id>
diff --git a/dev-perl/XML-XQL/metadata.xml b/dev-perl/XML-XQL/metadata.xml
index 79cf3cda9229..a2f25b417cd4 100644
--- a/dev-perl/XML-XQL/metadata.xml
+++ b/dev-perl/XML-XQL/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XQL</remote-id>
     <remote-id type="cpan-module">XML::XQL</remote-id>
diff --git a/dev-perl/XML-XSLT/metadata.xml b/dev-perl/XML-XSLT/metadata.xml
index 9f64c8843bde..176ee21185af 100644
--- a/dev-perl/XML-XSLT/metadata.xml
+++ b/dev-perl/XML-XSLT/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XSLT</remote-id>
     <remote-id type="cpan-module">XML::XSLT</remote-id>
diff --git a/dev-perl/XML-XUpdate-LibXML/metadata.xml b/dev-perl/XML-XUpdate-LibXML/metadata.xml
index 19c7b6ae9981..ad299520c1ff 100644
--- a/dev-perl/XML-XUpdate-LibXML/metadata.xml
+++ b/dev-perl/XML-XUpdate-LibXML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XUpdate-LibXML</remote-id>
     <remote-id type="cpan-module">XML::Normalize::LibXML</remote-id>
diff --git a/dev-perl/XMLRPC-Lite/metadata.xml b/dev-perl/XMLRPC-Lite/metadata.xml
index 09e85259cb3e..3940735fa75d 100644
--- a/dev-perl/XMLRPC-Lite/metadata.xml
+++ b/dev-perl/XMLRPC-Lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">XMLRPC-Lite</remote-id>
 		<remote-id type="cpan-module">Apache::XMLRPC::Lite</remote-id>
diff --git a/dev-perl/YAML-LibYAML/metadata.xml b/dev-perl/YAML-LibYAML/metadata.xml
index 4fc739b2a30c..1a9abaeaf8fc 100644
--- a/dev-perl/YAML-LibYAML/metadata.xml
+++ b/dev-perl/YAML-LibYAML/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">YAML-LibYAML</remote-id>
         <remote-id type="cpan-module">YAML::LibYAML</remote-id>
diff --git a/dev-perl/YAML-Parser-Syck/metadata.xml b/dev-perl/YAML-Parser-Syck/metadata.xml
index bbc2b5dda452..32bfe2b8837b 100644
--- a/dev-perl/YAML-Parser-Syck/metadata.xml
+++ b/dev-perl/YAML-Parser-Syck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">YAML-Parser-Syck</remote-id>
     <remote-id type="cpan-module">YAML::Parser::Syck</remote-id>
diff --git a/dev-perl/YAML-Syck/metadata.xml b/dev-perl/YAML-Syck/metadata.xml
index f308dafa777d..b6b9ea92af7f 100644
--- a/dev-perl/YAML-Syck/metadata.xml
+++ b/dev-perl/YAML-Syck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">YAML-Syck</remote-id>
     <remote-id type="cpan-module">JSON::Syck</remote-id>
diff --git a/dev-perl/YAML-Tiny/metadata.xml b/dev-perl/YAML-Tiny/metadata.xml
index 377bdd363704..88cb106da8df 100644
--- a/dev-perl/YAML-Tiny/metadata.xml
+++ b/dev-perl/YAML-Tiny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">YAML-Tiny</remote-id>
     <remote-id type="cpan-module">YAML::Tiny</remote-id>
diff --git a/dev-perl/ZMQ-Constants/metadata.xml b/dev-perl/ZMQ-Constants/metadata.xml
index a11e9e756e01..73515b57aac8 100644
--- a/dev-perl/ZMQ-Constants/metadata.xml
+++ b/dev-perl/ZMQ-Constants/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ZMQ-Constants</remote-id>
 		<remote-id type="cpan-module">ZMQ::Constants</remote-id>
diff --git a/dev-perl/ZMQ-LibZMQ2/metadata.xml b/dev-perl/ZMQ-LibZMQ2/metadata.xml
index fc2300b8782b..f25072e60251 100644
--- a/dev-perl/ZMQ-LibZMQ2/metadata.xml
+++ b/dev-perl/ZMQ-LibZMQ2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ZMQ-LibZMQ2</remote-id>
 		<remote-id type="cpan-module">ZMQ::LibZMQ2</remote-id>
diff --git a/dev-perl/ZMQ-LibZMQ3/metadata.xml b/dev-perl/ZMQ-LibZMQ3/metadata.xml
index bf44d305494b..d1716ca51059 100644
--- a/dev-perl/ZMQ-LibZMQ3/metadata.xml
+++ b/dev-perl/ZMQ-LibZMQ3/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">ZMQ-LibZMQ2</remote-id>
 		<remote-id type="cpan-module">ZMQ::LibZMQ2</remote-id>
diff --git a/dev-perl/aliased/metadata.xml b/dev-perl/aliased/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/dev-perl/aliased/metadata.xml
+++ b/dev-perl/aliased/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/autobox/metadata.xml b/dev-perl/autobox/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/dev-perl/autobox/metadata.xml
+++ b/dev-perl/autobox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/bareword-filehandles/metadata.xml b/dev-perl/bareword-filehandles/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/bareword-filehandles/metadata.xml
+++ b/dev-perl/bareword-filehandles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/boolean/metadata.xml b/dev-perl/boolean/metadata.xml
index fdfa660b3d79..87ecde1a63be 100644
--- a/dev-perl/boolean/metadata.xml
+++ b/dev-perl/boolean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">boolean</remote-id>
     <remote-id type="cpan-module">boolean</remote-id>
diff --git a/dev-perl/cache-mmap/metadata.xml b/dev-perl/cache-mmap/metadata.xml
index cc82c955dc1f..0d1ef4db7379 100644
--- a/dev-perl/cache-mmap/metadata.xml
+++ b/dev-perl/cache-mmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Mmap</remote-id>
     <remote-id type="cpan-module">Cache::Mmap</remote-id>
diff --git a/dev-perl/capitalization/metadata.xml b/dev-perl/capitalization/metadata.xml
index 05be84f17c32..c7f25b4a78e5 100644
--- a/dev-perl/capitalization/metadata.xml
+++ b/dev-perl/capitalization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">capitalization</remote-id>
     <remote-id type="cpan-module">capitalization</remote-id>
diff --git a/dev-perl/cdk-perl/metadata.xml b/dev-perl/cdk-perl/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/cdk-perl/metadata.xml
+++ b/dev-perl/cdk-perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/class-loader/metadata.xml b/dev-perl/class-loader/metadata.xml
index d5bec093c938..f20945f9ecc4 100644
--- a/dev-perl/class-loader/metadata.xml
+++ b/dev-perl/class-loader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Loader</remote-id>
     <remote-id type="cpan-module">Class::Loader</remote-id>
diff --git a/dev-perl/common-sense/metadata.xml b/dev-perl/common-sense/metadata.xml
index 23d27293a95c..94df22a5462d 100644
--- a/dev-perl/common-sense/metadata.xml
+++ b/dev-perl/common-sense/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">common-sense</remote-id>
   </upstream>
diff --git a/dev-perl/constant-boolean/metadata.xml b/dev-perl/constant-boolean/metadata.xml
index 62116b1ce7b7..231ba100ec92 100644
--- a/dev-perl/constant-boolean/metadata.xml
+++ b/dev-perl/constant-boolean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">constant-boolean</remote-id>
     <remote-id type="cpan-module">constant::boolean</remote-id>
diff --git a/dev-perl/convert-ascii-armour/metadata.xml b/dev-perl/convert-ascii-armour/metadata.xml
index cd05aec659ef..e345bb41605a 100644
--- a/dev-perl/convert-ascii-armour/metadata.xml
+++ b/dev-perl/convert-ascii-armour/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-ASCII-Armour</remote-id>
     <remote-id type="cpan-module">Convert::ASCII::Armor</remote-id>
diff --git a/dev-perl/convert-pem/metadata.xml b/dev-perl/convert-pem/metadata.xml
index 7f6a3e39a273..c031ba0e786c 100644
--- a/dev-perl/convert-pem/metadata.xml
+++ b/dev-perl/convert-pem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-PEM</remote-id>
     <remote-id type="cpan-module">Convert::PEM</remote-id>
diff --git a/dev-perl/crypt-cbc/metadata.xml b/dev-perl/crypt-cbc/metadata.xml
index 5fa8cf896c48..1dfd2b4d65bf 100644
--- a/dev-perl/crypt-cbc/metadata.xml
+++ b/dev-perl/crypt-cbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-CBC</remote-id>
     <remote-id type="cpan-module">Crypt::CBC</remote-id>
diff --git a/dev-perl/crypt-des-ede3/metadata.xml b/dev-perl/crypt-des-ede3/metadata.xml
index be00dce52933..b252273dbf94 100644
--- a/dev-perl/crypt-des-ede3/metadata.xml
+++ b/dev-perl/crypt-des-ede3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-DES_EDE3</remote-id>
     <remote-id type="cpan-module">Crypt::DES_EDE3</remote-id>
diff --git a/dev-perl/crypt-dh/metadata.xml b/dev-perl/crypt-dh/metadata.xml
index 3522ba3d2cb3..026d4be6a019 100644
--- a/dev-perl/crypt-dh/metadata.xml
+++ b/dev-perl/crypt-dh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-DH</remote-id>
     <remote-id type="cpan-module">Crypt::DH</remote-id>
diff --git a/dev-perl/crypt-dsa/metadata.xml b/dev-perl/crypt-dsa/metadata.xml
index 57c6ee08d0db..5c446f153eb6 100644
--- a/dev-perl/crypt-dsa/metadata.xml
+++ b/dev-perl/crypt-dsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-DSA</remote-id>
     <remote-id type="cpan-module">BufferWithInt</remote-id>
diff --git a/dev-perl/crypt-idea/metadata.xml b/dev-perl/crypt-idea/metadata.xml
index 9add9d57a59f..967b006ddd6e 100644
--- a/dev-perl/crypt-idea/metadata.xml
+++ b/dev-perl/crypt-idea/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-IDEA</remote-id>
     <remote-id type="cpan-module">Crypt::IDEA</remote-id>
diff --git a/dev-perl/crypt-primes/metadata.xml b/dev-perl/crypt-primes/metadata.xml
index 92a2c3362492..ce869387984b 100644
--- a/dev-perl/crypt-primes/metadata.xml
+++ b/dev-perl/crypt-primes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Primes</remote-id>
     <remote-id type="cpan-module">Crypt::Primes</remote-id>
diff --git a/dev-perl/crypt-random/metadata.xml b/dev-perl/crypt-random/metadata.xml
index 615e3d526853..bfbbd229a172 100644
--- a/dev-perl/crypt-random/metadata.xml
+++ b/dev-perl/crypt-random/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-Random</remote-id>
     <remote-id type="cpan-module">Crypt::Random</remote-id>
diff --git a/dev-perl/crypt-rsa/metadata.xml b/dev-perl/crypt-rsa/metadata.xml
index e50f7f0b58f0..41015e0aa769 100644
--- a/dev-perl/crypt-rsa/metadata.xml
+++ b/dev-perl/crypt-rsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Crypt-RSA</remote-id>
     <remote-id type="cpan-module">Crypt::RSA</remote-id>
diff --git a/dev-perl/data-buffer/metadata.xml b/dev-perl/data-buffer/metadata.xml
index b435c019a850..dcda06acd947 100644
--- a/dev-perl/data-buffer/metadata.xml
+++ b/dev-perl/data-buffer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Buffer</remote-id>
     <remote-id type="cpan-module">Data::Buffer</remote-id>
diff --git a/dev-perl/dbix-searchbuilder/metadata.xml b/dev-perl/dbix-searchbuilder/metadata.xml
index 5110699e1afb..a8d7d7a1e15c 100644
--- a/dev-perl/dbix-searchbuilder/metadata.xml
+++ b/dev-perl/dbix-searchbuilder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-SearchBuilder</remote-id>
     <remote-id type="cpan-module">DBIx::SearchBuilder</remote-id>
diff --git a/dev-perl/digest-bubblebabble/metadata.xml b/dev-perl/digest-bubblebabble/metadata.xml
index 483fd37dba82..87d72f0cddd3 100644
--- a/dev-perl/digest-bubblebabble/metadata.xml
+++ b/dev-perl/digest-bubblebabble/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-BubbleBabble</remote-id>
     <remote-id type="cpan-module">Digest::BubbleBabble</remote-id>
diff --git a/dev-perl/digest-md2/metadata.xml b/dev-perl/digest-md2/metadata.xml
index 908c8d71e44a..481a5e0cfebb 100644
--- a/dev-perl/digest-md2/metadata.xml
+++ b/dev-perl/digest-md2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-MD2</remote-id>
     <remote-id type="cpan-module">Digest::MD2</remote-id>
diff --git a/dev-perl/encoding-warnings/metadata.xml b/dev-perl/encoding-warnings/metadata.xml
index 82fcff1d2cc2..f8c9583a9611 100644
--- a/dev-perl/encoding-warnings/metadata.xml
+++ b/dev-perl/encoding-warnings/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<herd>sci</herd>
 	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">encoding-warnings</remote-id>
 		<remote-id type="cpan-module">encoding::warnings</remote-id>
diff --git a/dev-perl/enum/metadata.xml b/dev-perl/enum/metadata.xml
index e2fea729305e..7ef3a39be7ff 100644
--- a/dev-perl/enum/metadata.xml
+++ b/dev-perl/enum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">enum</remote-id>
     <remote-id type="cpan-module">enum</remote-id>
diff --git a/dev-perl/extutils-pkgconfig/metadata.xml b/dev-perl/extutils-pkgconfig/metadata.xml
index 31ff184d4123..5e1424f71d55 100644
--- a/dev-perl/extutils-pkgconfig/metadata.xml
+++ b/dev-perl/extutils-pkgconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-PkgConfig</remote-id>
     <remote-id type="cpan-module">ExtUtils::PkgConfig</remote-id>
diff --git a/dev-perl/forks/metadata.xml b/dev-perl/forks/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/forks/metadata.xml
+++ b/dev-perl/forks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/frontier-rpc/metadata.xml b/dev-perl/frontier-rpc/metadata.xml
index db9b1215bdcd..dfa6dd3d83b9 100644
--- a/dev-perl/frontier-rpc/metadata.xml
+++ b/dev-perl/frontier-rpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Frontier-RPC</remote-id>
     <remote-id type="cpan-module">Apache::XMLRPC</remote-id>
diff --git a/dev-perl/glib-perl/metadata.xml b/dev-perl/glib-perl/metadata.xml
index 8923de66f11f..41f95a67247b 100644
--- a/dev-perl/glib-perl/metadata.xml
+++ b/dev-perl/glib-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Glib</remote-id>
     <remote-id type="cpan-module">Glib</remote-id>
diff --git a/dev-perl/gnome2-canvas/metadata.xml b/dev-perl/gnome2-canvas/metadata.xml
index be8b76eaa9c0..08450bc98dcc 100644
--- a/dev-perl/gnome2-canvas/metadata.xml
+++ b/dev-perl/gnome2-canvas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gnome2-Canvas</remote-id>
     <remote-id type="cpan-module">Gnome2::Canvas</remote-id>
diff --git a/dev-perl/gnome2-perl/metadata.xml b/dev-perl/gnome2-perl/metadata.xml
index bb4e605e8ee9..f74be4bea20b 100644
--- a/dev-perl/gnome2-perl/metadata.xml
+++ b/dev-perl/gnome2-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gnome2</remote-id>
     <remote-id type="cpan-module">Gnome2</remote-id>
diff --git a/dev-perl/gnome2-vfs-perl/metadata.xml b/dev-perl/gnome2-vfs-perl/metadata.xml
index 20381a9bad62..fb00f35cae3d 100644
--- a/dev-perl/gnome2-vfs-perl/metadata.xml
+++ b/dev-perl/gnome2-vfs-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gnome2-VFS</remote-id>
     <remote-id type="cpan-module">Gnome2::VFS</remote-id>
diff --git a/dev-perl/gnome2-wnck/metadata.xml b/dev-perl/gnome2-wnck/metadata.xml
index 3fc246b65006..fa4da598a88a 100644
--- a/dev-perl/gnome2-wnck/metadata.xml
+++ b/dev-perl/gnome2-wnck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gnome2-Wnck</remote-id>
     <remote-id type="cpan-module">Gnome2::Wnck</remote-id>
diff --git a/dev-perl/google-api-adwords-perl/metadata.xml b/dev-perl/google-api-adwords-perl/metadata.xml
index 5f765fb3b118..56a1eab11c6b 100644
--- a/dev-perl/google-api-adwords-perl/metadata.xml
+++ b/dev-perl/google-api-adwords-perl/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">googleads/googleads-perl-lib</remote-id>
   </upstream>
diff --git a/dev-perl/gtk2-ex-formfactory/metadata.xml b/dev-perl/gtk2-ex-formfactory/metadata.xml
index ab6b9b22be7e..cf6e3b783363 100644
--- a/dev-perl/gtk2-ex-formfactory/metadata.xml
+++ b/dev-perl/gtk2-ex-formfactory/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-FormFactory</remote-id>
     <remote-id type="cpan-module">Gtk2::Ex::FormFactory</remote-id>
diff --git a/dev-perl/gtk2-gladexml/metadata.xml b/dev-perl/gtk2-gladexml/metadata.xml
index 5a3a7610b3b9..2715b3006062 100644
--- a/dev-perl/gtk2-gladexml/metadata.xml
+++ b/dev-perl/gtk2-gladexml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-GladeXML</remote-id>
     <remote-id type="cpan-module">Gtk2::GladeXML</remote-id>
diff --git a/dev-perl/gtk2-perl/metadata.xml b/dev-perl/gtk2-perl/metadata.xml
index 535a9aa80266..f6f0ad1980c4 100644
--- a/dev-perl/gtk2-perl/metadata.xml
+++ b/dev-perl/gtk2-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2</remote-id>
     <remote-id type="cpan-module">Gtk2</remote-id>
diff --git a/dev-perl/gtk2-spell/metadata.xml b/dev-perl/gtk2-spell/metadata.xml
index 39fcba176405..7d33c3780211 100644
--- a/dev-perl/gtk2-spell/metadata.xml
+++ b/dev-perl/gtk2-spell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-Spell</remote-id>
     <remote-id type="cpan-module">Gtk2::Spell</remote-id>
diff --git a/dev-perl/gtk2-trayicon/metadata.xml b/dev-perl/gtk2-trayicon/metadata.xml
index b7f0849eecc8..551d4be28619 100644
--- a/dev-perl/gtk2-trayicon/metadata.xml
+++ b/dev-perl/gtk2-trayicon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-TrayIcon</remote-id>
     <remote-id type="cpan-module">Gtk2::TrayIcon</remote-id>
diff --git a/dev-perl/gtk2-traymanager/metadata.xml b/dev-perl/gtk2-traymanager/metadata.xml
index 7bb0117e6e24..6a97e9864b29 100644
--- a/dev-perl/gtk2-traymanager/metadata.xml
+++ b/dev-perl/gtk2-traymanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Gtk2-TrayManager</remote-id>
     <remote-id type="cpan-module">Gtk2::TrayManager</remote-id>
diff --git a/dev-perl/indirect/metadata.xml b/dev-perl/indirect/metadata.xml
index 5944926e922d..68bde90b3398 100644
--- a/dev-perl/indirect/metadata.xml
+++ b/dev-perl/indirect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">indirect</remote-id>
 		<remote-id type="cpan-module">indirect</remote-id>
diff --git a/dev-perl/libintl-perl/metadata.xml b/dev-perl/libintl-perl/metadata.xml
index 3c5fc2b916e5..636093af743e 100644
--- a/dev-perl/libintl-perl/metadata.xml
+++ b/dev-perl/libintl-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">libintl-perl</remote-id>
     <remote-id type="cpan-module">Locale::Messages</remote-id>
diff --git a/dev-perl/librg-utils-perl/metadata.xml b/dev-perl/librg-utils-perl/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/dev-perl/librg-utils-perl/metadata.xml
+++ b/dev-perl/librg-utils-perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/libvorbis-perl/metadata.xml b/dev-perl/libvorbis-perl/metadata.xml
index 660ecdf58354..fbbe85b7b5d2 100644
--- a/dev-perl/libvorbis-perl/metadata.xml
+++ b/dev-perl/libvorbis-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">libvorbis-perl</remote-id>
     <remote-id type="cpan-module">Ogg::Vorbis</remote-id>
diff --git a/dev-perl/libwww-perl/metadata.xml b/dev-perl/libwww-perl/metadata.xml
index b7fba106c514..1eb963e27fa0 100644
--- a/dev-perl/libwww-perl/metadata.xml
+++ b/dev-perl/libwww-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">libwww-perl</remote-id>
     <remote-id type="cpan-module">LWP</remote-id>
diff --git a/dev-perl/libxml-perl/metadata.xml b/dev-perl/libxml-perl/metadata.xml
index 63ead5b1c27a..3bc55cd6a697 100644
--- a/dev-perl/libxml-perl/metadata.xml
+++ b/dev-perl/libxml-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">libxml-perl</remote-id>
     <remote-id type="cpan-module">Data::Grove</remote-id>
diff --git a/dev-perl/local-lib/metadata.xml b/dev-perl/local-lib/metadata.xml
index feb3e1fdb666..679b4a56c29a 100644
--- a/dev-perl/local-lib/metadata.xml
+++ b/dev-perl/local-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">local-lib</remote-id>
         <remote-id type="cpan-module">lib::core::only</remote-id>
diff --git a/dev-perl/locale-maketext-fuzzy/metadata.xml b/dev-perl/locale-maketext-fuzzy/metadata.xml
index 2aa8be2a15f3..cb8c35047269 100644
--- a/dev-perl/locale-maketext-fuzzy/metadata.xml
+++ b/dev-perl/locale-maketext-fuzzy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Fuzzy</remote-id>
     <remote-id type="cpan-module">Locale::Maketext::Fuzzy</remote-id>
diff --git a/dev-perl/math-pari/metadata.xml b/dev-perl/math-pari/metadata.xml
index 853302f38c82..a34240ada842 100644
--- a/dev-perl/math-pari/metadata.xml
+++ b/dev-perl/math-pari/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Pari</remote-id>
     <remote-id type="cpan-module">Math::Pari</remote-id>
diff --git a/dev-perl/maybe/metadata.xml b/dev-perl/maybe/metadata.xml
index cdd8f07b2244..81c2ead7d313 100644
--- a/dev-perl/maybe/metadata.xml
+++ b/dev-perl/maybe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">maybe</remote-id>
     <remote-id type="cpan-module">maybe</remote-id>
diff --git a/dev-perl/mecab-perl/metadata.xml b/dev-perl/mecab-perl/metadata.xml
index 92a708bbaac3..b496e5edc8a6 100644
--- a/dev-perl/mecab-perl/metadata.xml
+++ b/dev-perl/mecab-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mecab</remote-id>
   </upstream>
diff --git a/dev-perl/mime-construct/metadata.xml b/dev-perl/mime-construct/metadata.xml
index 2c896432eb7f..8b65d7b822a1 100644
--- a/dev-perl/mime-construct/metadata.xml
+++ b/dev-perl/mime-construct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">mime-construct</remote-id>
   </upstream>
diff --git a/dev-perl/mogilefs-server/metadata.xml b/dev-perl/mogilefs-server/metadata.xml
index 1302aeac0d31..a52a042555d1 100644
--- a/dev-perl/mogilefs-server/metadata.xml
+++ b/dev-perl/mogilefs-server/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Server</remote-id>
     <remote-id type="cpan-module">Mgd</remote-id>
diff --git a/dev-perl/namespace-autoclean/metadata.xml b/dev-perl/namespace-autoclean/metadata.xml
index d2597ad3fff2..d2bc1d53ea86 100644
--- a/dev-perl/namespace-autoclean/metadata.xml
+++ b/dev-perl/namespace-autoclean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">namespace-autoclean</remote-id>
     <remote-id type="cpan-module">namespace::autoclean</remote-id>
diff --git a/dev-perl/namespace-clean/metadata.xml b/dev-perl/namespace-clean/metadata.xml
index 2f366eb02b38..77ae67440bb0 100644
--- a/dev-perl/namespace-clean/metadata.xml
+++ b/dev-perl/namespace-clean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">namespace-clean</remote-id>
     <remote-id type="cpan-module">namespace::clean</remote-id>
diff --git a/dev-perl/net-server/metadata.xml b/dev-perl/net-server/metadata.xml
index b035755cd47c..3cec251f0e40 100644
--- a/dev-perl/net-server/metadata.xml
+++ b/dev-perl/net-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Server</remote-id>
     <remote-id type="cpan-module">Net::Server</remote-id>
diff --git a/dev-perl/net-sftp/metadata.xml b/dev-perl/net-sftp/metadata.xml
index cdc1b11a1f4b..3864a078f503 100644
--- a/dev-perl/net-sftp/metadata.xml
+++ b/dev-perl/net-sftp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SFTP</remote-id>
     <remote-id type="cpan-module">Net::SFTP</remote-id>
diff --git a/dev-perl/net-ssh-perl/metadata.xml b/dev-perl/net-ssh-perl/metadata.xml
index 2622d19a95de..1dd5f81e9952 100644
--- a/dev-perl/net-ssh-perl/metadata.xml
+++ b/dev-perl/net-ssh-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SSH-Perl</remote-id>
     <remote-id type="cpan-module">Net::SSH::Perl</remote-id>
diff --git a/dev-perl/ogg-vorbis-header/metadata.xml b/dev-perl/ogg-vorbis-header/metadata.xml
index 1c1f6a19f650..3f002f280416 100644
--- a/dev-perl/ogg-vorbis-header/metadata.xml
+++ b/dev-perl/ogg-vorbis-header/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Ogg-Vorbis-Header</remote-id>
     <remote-id type="cpan-module">Ogg::Vorbis::Header</remote-id>
diff --git a/dev-perl/p5-Palm/metadata.xml b/dev-perl/p5-Palm/metadata.xml
index dd90c652ff34..40d98606fde1 100644
--- a/dev-perl/p5-Palm/metadata.xml
+++ b/dev-perl/p5-Palm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">p5-Palm</remote-id>
     <remote-id type="cpan-module">Palm</remote-id>
diff --git a/dev-perl/pcsc-perl/metadata.xml b/dev-perl/pcsc-perl/metadata.xml
index cdf5d915a49d..19c488a2b6ed 100644
--- a/dev-perl/pcsc-perl/metadata.xml
+++ b/dev-perl/pcsc-perl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<longdescription>A Perl Module for PC/SC SmartCard access (required for pcsc_scan and the gscriptor GUI).</longdescription>
 </pkgmetadata>
diff --git a/dev-perl/perl-ldap/metadata.xml b/dev-perl/perl-ldap/metadata.xml
index d6605a14a71a..6fdda7c07d97 100644
--- a/dev-perl/perl-ldap/metadata.xml
+++ b/dev-perl/perl-ldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">perl-ldap</remote-id>
     <remote-id type="cpan-module">Bundle::Net::LDAP</remote-id>
diff --git a/dev-perl/perl-mozldap/metadata.xml b/dev-perl/perl-mozldap/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/dev-perl/perl-mozldap/metadata.xml
+++ b/dev-perl/perl-mozldap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-perl/perl-tk/metadata.xml b/dev-perl/perl-tk/metadata.xml
index 38709a6646e7..3fb26888e55f 100644
--- a/dev-perl/perl-tk/metadata.xml
+++ b/dev-perl/perl-tk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tk</remote-id>
     <remote-id type="cpan-module">Tie::Watch</remote-id>
diff --git a/dev-perl/perltidy/metadata.xml b/dev-perl/perltidy/metadata.xml
index eb3a6a55f448..17cbd28c94a3 100644
--- a/dev-perl/perltidy/metadata.xml
+++ b/dev-perl/perltidy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Perl-Tidy</remote-id>
     <remote-id type="cpan-module">Perl::Tidy</remote-id>
diff --git a/dev-perl/prefork/metadata.xml b/dev-perl/prefork/metadata.xml
index 74cc7d93945d..1a8f2c625694 100644
--- a/dev-perl/prefork/metadata.xml
+++ b/dev-perl/prefork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">prefork</remote-id>
     <remote-id type="cpan-module">prefork</remote-id>
diff --git a/dev-perl/regexp-common/metadata.xml b/dev-perl/regexp-common/metadata.xml
index bc4ef93a132f..6a3a9632c4be 100644
--- a/dev-perl/regexp-common/metadata.xml
+++ b/dev-perl/regexp-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Regexp-Common</remote-id>
     <remote-id type="cpan-module">Regexp::Common</remote-id>
diff --git a/dev-perl/rename/metadata.xml b/dev-perl/rename/metadata.xml
index b8e0935db396..00debdb14d50 100644
--- a/dev-perl/rename/metadata.xml
+++ b/dev-perl/rename/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">rename</remote-id>
   </upstream>
diff --git a/dev-perl/rpm-build-perl/metadata.xml b/dev-perl/rpm-build-perl/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/rpm-build-perl/metadata.xml
+++ b/dev-perl/rpm-build-perl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/self/metadata.xml b/dev-perl/self/metadata.xml
index 44ddce179808..550b183b4b6b 100644
--- a/dev-perl/self/metadata.xml
+++ b/dev-perl/self/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">self</remote-id>
     <remote-id type="cpan-module">DB</remote-id>
diff --git a/dev-perl/set-scalar/metadata.xml b/dev-perl/set-scalar/metadata.xml
index 8a2ab454975f..2436346ff357 100644
--- a/dev-perl/set-scalar/metadata.xml
+++ b/dev-perl/set-scalar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Set-Scalar</remote-id>
     <remote-id type="cpan-module">Set::Scalar</remote-id>
diff --git a/dev-perl/strictures/metadata.xml b/dev-perl/strictures/metadata.xml
index 3887b57fecb9..099d8c92af21 100644
--- a/dev-perl/strictures/metadata.xml
+++ b/dev-perl/strictures/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">strictures</remote-id>
 		<remote-id type="cpan-module">strictures</remote-id>
diff --git a/dev-perl/string-crc32/metadata.xml b/dev-perl/string-crc32/metadata.xml
index c2250391070d..4fb29d65952d 100644
--- a/dev-perl/string-crc32/metadata.xml
+++ b/dev-perl/string-crc32/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">String-CRC32</remote-id>
     <remote-id type="cpan-module">String::CRC32</remote-id>
diff --git a/dev-perl/syntax/metadata.xml b/dev-perl/syntax/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/syntax/metadata.xml
+++ b/dev-perl/syntax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/text-template/metadata.xml b/dev-perl/text-template/metadata.xml
index 580f7783a33a..73ed2799aba7 100644
--- a/dev-perl/text-template/metadata.xml
+++ b/dev-perl/text-template/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Template</remote-id>
     <remote-id type="cpan-module">Text::Template</remote-id>
diff --git a/dev-perl/text-wrapper/metadata.xml b/dev-perl/text-wrapper/metadata.xml
index 5593d20012be..9509629e6e08 100644
--- a/dev-perl/text-wrapper/metadata.xml
+++ b/dev-perl/text-wrapper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Wrapper</remote-id>
     <remote-id type="cpan-module">Text::Wrapper</remote-id>
diff --git a/dev-perl/tie-encryptedhash/metadata.xml b/dev-perl/tie-encryptedhash/metadata.xml
index dde200155cea..816cc82c397c 100644
--- a/dev-perl/tie-encryptedhash/metadata.xml
+++ b/dev-perl/tie-encryptedhash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-EncryptedHash</remote-id>
     <remote-id type="cpan-module">Tie::EncryptedHash</remote-id>
diff --git a/dev-perl/tkispell/metadata.xml b/dev-perl/tkispell/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/dev-perl/tkispell/metadata.xml
+++ b/dev-perl/tkispell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-perl/txt2html/metadata.xml b/dev-perl/txt2html/metadata.xml
index 247817fb8a78..1408c5a44453 100644
--- a/dev-perl/txt2html/metadata.xml
+++ b/dev-perl/txt2html/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">txt2html</remote-id>
     <remote-id type="cpan-module">txt2html</remote-id>
diff --git a/dev-perl/wxperl/metadata.xml b/dev-perl/wxperl/metadata.xml
index 8f8263cb0489..60dca37494d3 100644
--- a/dev-perl/wxperl/metadata.xml
+++ b/dev-perl/wxperl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Wx</remote-id>
     <remote-id type="cpan-module">MY</remote-id>
diff --git a/dev-perl/yaml/metadata.xml b/dev-perl/yaml/metadata.xml
index 9e1dc7552712..4a3b9514251c 100644
--- a/dev-perl/yaml/metadata.xml
+++ b/dev-perl/yaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">YAML</remote-id>
     <remote-id type="cpan-module">Test::YAML</remote-id>
diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml
index ff6ef25f6521..7a5c20468c0b 100644
--- a/dev-php/File_Iterator/metadata.xml
+++ b/dev-php/File_Iterator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sebastianbergmann/php-file-iterator</remote-id>
   </upstream>
diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml
index 6624b7fa9c38..97e35eb556ef 100644
--- a/dev-php/PEAR-Archive_Tar/metadata.xml
+++ b/dev-php/PEAR-Archive_Tar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pear">Archive_Tar</remote-id>
 	</upstream>
diff --git a/dev-php/PEAR-Auth/metadata.xml b/dev-php/PEAR-Auth/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Auth/metadata.xml
+++ b/dev-php/PEAR-Auth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Auth_HTTP/metadata.xml b/dev-php/PEAR-Auth_HTTP/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Auth_HTTP/metadata.xml
+++ b/dev-php/PEAR-Auth_HTTP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Auth_SASL/metadata.xml b/dev-php/PEAR-Auth_SASL/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Auth_SASL/metadata.xml
+++ b/dev-php/PEAR-Auth_SASL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Benchmark/metadata.xml b/dev-php/PEAR-Benchmark/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Benchmark/metadata.xml
+++ b/dev-php/PEAR-Benchmark/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Cache/metadata.xml b/dev-php/PEAR-Cache/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Cache/metadata.xml
+++ b/dev-php/PEAR-Cache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Cache_Lite/metadata.xml b/dev-php/PEAR-Cache_Lite/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Cache_Lite/metadata.xml
+++ b/dev-php/PEAR-Cache_Lite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Calendar/metadata.xml b/dev-php/PEAR-Calendar/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Calendar/metadata.xml
+++ b/dev-php/PEAR-Calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Config/metadata.xml b/dev-php/PEAR-Config/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Config/metadata.xml
+++ b/dev-php/PEAR-Config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Console_Color/metadata.xml b/dev-php/PEAR-Console_Color/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Console_Color/metadata.xml
+++ b/dev-php/PEAR-Console_Color/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml
index 064d87de89c9..fb147dce10df 100644
--- a/dev-php/PEAR-Console_CommandLine/metadata.xml
+++ b/dev-php/PEAR-Console_CommandLine/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 <longdescription lang="en">
 A full featured command line options and arguments parser
 </longdescription>
diff --git a/dev-php/PEAR-Console_Getargs/metadata.xml b/dev-php/PEAR-Console_Getargs/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Console_Getargs/metadata.xml
+++ b/dev-php/PEAR-Console_Getargs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml
index bc4947bc2ac5..252bb272103d 100644
--- a/dev-php/PEAR-Console_Getopt/metadata.xml
+++ b/dev-php/PEAR-Console_Getopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pear">Console_Getopt</remote-id>
 	</upstream>
diff --git a/dev-php/PEAR-Console_Table/metadata.xml b/dev-php/PEAR-Console_Table/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Console_Table/metadata.xml
+++ b/dev-php/PEAR-Console_Table/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_Blowfish/metadata.xml b/dev-php/PEAR-Crypt_Blowfish/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Crypt_Blowfish/metadata.xml
+++ b/dev-php/PEAR-Crypt_Blowfish/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_CHAP/metadata.xml b/dev-php/PEAR-Crypt_CHAP/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Crypt_CHAP/metadata.xml
+++ b/dev-php/PEAR-Crypt_CHAP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Crypt_GPG/metadata.xml
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_HMAC/metadata.xml b/dev-php/PEAR-Crypt_HMAC/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Crypt_HMAC/metadata.xml
+++ b/dev-php/PEAR-Crypt_HMAC/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_HMAC2/metadata.xml b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Crypt_HMAC2/metadata.xml
+++ b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_RC4/metadata.xml b/dev-php/PEAR-Crypt_RC4/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Crypt_RC4/metadata.xml
+++ b/dev-php/PEAR-Crypt_RC4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-DB/metadata.xml
+++ b/dev-php/PEAR-DB/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-DB_DataObject/metadata.xml b/dev-php/PEAR-DB_DataObject/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-DB_DataObject/metadata.xml
+++ b/dev-php/PEAR-DB_DataObject/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Date/metadata.xml b/dev-php/PEAR-Date/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Date/metadata.xml
+++ b/dev-php/PEAR-Date/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File/metadata.xml b/dev-php/PEAR-File/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-File/metadata.xml
+++ b/dev-php/PEAR-File/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_Archive/metadata.xml b/dev-php/PEAR-File_Archive/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-File_Archive/metadata.xml
+++ b/dev-php/PEAR-File_Archive/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_Find/metadata.xml b/dev-php/PEAR-File_Find/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-File_Find/metadata.xml
+++ b/dev-php/PEAR-File_Find/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_Fortune/metadata.xml b/dev-php/PEAR-File_Fortune/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-File_Fortune/metadata.xml
+++ b/dev-php/PEAR-File_Fortune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_Gettext/metadata.xml b/dev-php/PEAR-File_Gettext/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-File_Gettext/metadata.xml
+++ b/dev-php/PEAR-File_Gettext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_Passwd/metadata.xml b/dev-php/PEAR-File_Passwd/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-File_Passwd/metadata.xml
+++ b/dev-php/PEAR-File_Passwd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-File_SMBPasswd/metadata.xml b/dev-php/PEAR-File_SMBPasswd/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-File_SMBPasswd/metadata.xml
+++ b/dev-php/PEAR-File_SMBPasswd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_AJAX/metadata.xml b/dev-php/PEAR-HTML_AJAX/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-HTML_AJAX/metadata.xml
+++ b/dev-php/PEAR-HTML_AJAX/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_CSS/metadata.xml b/dev-php/PEAR-HTML_CSS/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-HTML_CSS/metadata.xml
+++ b/dev-php/PEAR-HTML_CSS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Common/metadata.xml b/dev-php/PEAR-HTML_Common/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Common/metadata.xml
+++ b/dev-php/PEAR-HTML_Common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Common2/metadata.xml b/dev-php/PEAR-HTML_Common2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Common2/metadata.xml
+++ b/dev-php/PEAR-HTML_Common2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Javascript/metadata.xml b/dev-php/PEAR-HTML_Javascript/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Javascript/metadata.xml
+++ b/dev-php/PEAR-HTML_Javascript/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_QuickForm/metadata.xml b/dev-php/PEAR-HTML_QuickForm/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_QuickForm/metadata.xml
+++ b/dev-php/PEAR-HTML_QuickForm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_QuickForm2/metadata.xml b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_QuickForm2/metadata.xml
+++ b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_QuickForm_Controller/metadata.xml b/dev-php/PEAR-HTML_QuickForm_Controller/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_QuickForm_Controller/metadata.xml
+++ b/dev-php/PEAR-HTML_QuickForm_Controller/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_QuickForm_advmultiselect/metadata.xml b/dev-php/PEAR-HTML_QuickForm_advmultiselect/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_QuickForm_advmultiselect/metadata.xml
+++ b/dev-php/PEAR-HTML_QuickForm_advmultiselect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Select/metadata.xml b/dev-php/PEAR-HTML_Select/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Select/metadata.xml
+++ b/dev-php/PEAR-HTML_Select/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Table/metadata.xml b/dev-php/PEAR-HTML_Table/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Table/metadata.xml
+++ b/dev-php/PEAR-HTML_Table/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
+++ b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Template_IT/metadata.xml b/dev-php/PEAR-HTML_Template_IT/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Template_IT/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_IT/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTML_TreeMenu/metadata.xml b/dev-php/PEAR-HTML_TreeMenu/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTML_TreeMenu/metadata.xml
+++ b/dev-php/PEAR-HTML_TreeMenu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTTP/metadata.xml b/dev-php/PEAR-HTTP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTTP/metadata.xml
+++ b/dev-php/PEAR-HTTP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Client/metadata.xml b/dev-php/PEAR-HTTP_Client/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-HTTP_Client/metadata.xml
+++ b/dev-php/PEAR-HTTP_Client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Download/metadata.xml b/dev-php/PEAR-HTTP_Download/metadata.xml
index 8157544587db..c8117c5995a8 100644
--- a/dev-php/PEAR-HTTP_Download/metadata.xml
+++ b/dev-php/PEAR-HTTP_Download/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="postgres">Send postgres LOBs without buffering</flag>
 		<flag name="minimal">Do not include support for PEAR-MIME_Type</flag>
diff --git a/dev-php/PEAR-HTTP_Header/metadata.xml b/dev-php/PEAR-HTTP_Header/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-HTTP_Header/metadata.xml
+++ b/dev-php/PEAR-HTTP_Header/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Request/metadata.xml b/dev-php/PEAR-HTTP_Request/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTTP_Request/metadata.xml
+++ b/dev-php/PEAR-HTTP_Request/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Request2/metadata.xml b/dev-php/PEAR-HTTP_Request2/metadata.xml
index 112a781dfc07..ab6d72ff2a62 100644
--- a/dev-php/PEAR-HTTP_Request2/metadata.xml
+++ b/dev-php/PEAR-HTTP_Request2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">PHP5 rewrite of HTTP_Request package.
 		Provides an easy way to perform HTTP requests.
 	</longdescription>
diff --git a/dev-php/PEAR-HTTP_Session2/metadata.xml b/dev-php/PEAR-HTTP_Session2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-HTTP_Session2/metadata.xml
+++ b/dev-php/PEAR-HTTP_Session2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-I18Nv2/metadata.xml b/dev-php/PEAR-I18Nv2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-I18Nv2/metadata.xml
+++ b/dev-php/PEAR-I18Nv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Image_Color2/metadata.xml b/dev-php/PEAR-Image_Color2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Image_Color2/metadata.xml
+++ b/dev-php/PEAR-Image_Color2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Image_GraphViz/metadata.xml b/dev-php/PEAR-Image_GraphViz/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Image_GraphViz/metadata.xml
+++ b/dev-php/PEAR-Image_GraphViz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Image_IPTC/metadata.xml b/dev-php/PEAR-Image_IPTC/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Image_IPTC/metadata.xml
+++ b/dev-php/PEAR-Image_IPTC/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Image_Text/metadata.xml b/dev-php/PEAR-Image_Text/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Image_Text/metadata.xml
+++ b/dev-php/PEAR-Image_Text/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Log/metadata.xml b/dev-php/PEAR-Log/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Log/metadata.xml
+++ b/dev-php/PEAR-Log/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB/metadata.xml b/dev-php/PEAR-MDB/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-MDB/metadata.xml
+++ b/dev-php/PEAR-MDB/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2/metadata.xml b/dev-php/PEAR-MDB2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2/metadata.xml
+++ b/dev-php/PEAR-MDB2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-MIME_Type/metadata.xml b/dev-php/PEAR-MIME_Type/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-MIME_Type/metadata.xml
+++ b/dev-php/PEAR-MIME_Type/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Mail/metadata.xml b/dev-php/PEAR-Mail/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Mail/metadata.xml
+++ b/dev-php/PEAR-Mail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Mail_Mime/metadata.xml b/dev-php/PEAR-Mail_Mime/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Mail_Mime/metadata.xml
+++ b/dev-php/PEAR-Mail_Mime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Mail_mimeDecode/metadata.xml b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Mail_mimeDecode/metadata.xml
+++ b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Math_BigInteger/metadata.xml b/dev-php/PEAR-Math_BigInteger/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Math_BigInteger/metadata.xml
+++ b/dev-php/PEAR-Math_BigInteger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Math_Stats/metadata.xml b/dev-php/PEAR-Math_Stats/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Math_Stats/metadata.xml
+++ b/dev-php/PEAR-Math_Stats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_CheckIP/metadata.xml b/dev-php/PEAR-Net_CheckIP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_CheckIP/metadata.xml
+++ b/dev-php/PEAR-Net_CheckIP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_DIME/metadata.xml b/dev-php/PEAR-Net_DIME/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_DIME/metadata.xml
+++ b/dev-php/PEAR-Net_DIME/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNS/metadata.xml b/dev-php/PEAR-Net_DNS/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_DNS/metadata.xml
+++ b/dev-php/PEAR-Net_DNS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNS2/metadata.xml b/dev-php/PEAR-Net_DNS2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_DNS2/metadata.xml
+++ b/dev-php/PEAR-Net_DNS2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_DNSBL/metadata.xml
+++ b/dev-php/PEAR-Net_DNSBL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_FTP/metadata.xml b/dev-php/PEAR-Net_FTP/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Net_FTP/metadata.xml
+++ b/dev-php/PEAR-Net_FTP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_IDNA2/metadata.xml b/dev-php/PEAR-Net_IDNA2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_IDNA2/metadata.xml
+++ b/dev-php/PEAR-Net_IDNA2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_IMAP/metadata.xml b/dev-php/PEAR-Net_IMAP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_IMAP/metadata.xml
+++ b/dev-php/PEAR-Net_IMAP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_IPv4/metadata.xml b/dev-php/PEAR-Net_IPv4/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_IPv4/metadata.xml
+++ b/dev-php/PEAR-Net_IPv4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_IPv6/metadata.xml b/dev-php/PEAR-Net_IPv6/metadata.xml
index 34e99813b6ba..6cfa6ab88b88 100644
--- a/dev-php/PEAR-Net_IPv6/metadata.xml
+++ b/dev-php/PEAR-Net_IPv6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+	  <email>php-bugs@gentoo.org</email>
+	  <name>PHP</name>
+	</maintainer>
 	<upstream>
 	  <remote-id type="pear">Net_IPv6</remote-id>
 	</upstream>
diff --git a/dev-php/PEAR-Net_LDAP/metadata.xml b/dev-php/PEAR-Net_LDAP/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Net_LDAP/metadata.xml
+++ b/dev-php/PEAR-Net_LDAP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_LDAP2/metadata.xml b/dev-php/PEAR-Net_LDAP2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Net_LDAP2/metadata.xml
+++ b/dev-php/PEAR-Net_LDAP2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_LMTP/metadata.xml b/dev-php/PEAR-Net_LMTP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_LMTP/metadata.xml
+++ b/dev-php/PEAR-Net_LMTP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_POP3/metadata.xml b/dev-php/PEAR-Net_POP3/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_POP3/metadata.xml
+++ b/dev-php/PEAR-Net_POP3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_Ping/metadata.xml
+++ b/dev-php/PEAR-Net_Ping/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_SMTP/metadata.xml
+++ b/dev-php/PEAR-Net_SMTP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Server/metadata.xml b/dev-php/PEAR-Net_Server/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_Server/metadata.xml
+++ b/dev-php/PEAR-Net_Server/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Sieve/metadata.xml b/dev-php/PEAR-Net_Sieve/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_Sieve/metadata.xml
+++ b/dev-php/PEAR-Net_Sieve/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_SmartIRC/metadata.xml
+++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Socket/metadata.xml b/dev-php/PEAR-Net_Socket/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_Socket/metadata.xml
+++ b/dev-php/PEAR-Net_Socket/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Traceroute/metadata.xml b/dev-php/PEAR-Net_Traceroute/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_Traceroute/metadata.xml
+++ b/dev-php/PEAR-Net_Traceroute/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_URL/metadata.xml b/dev-php/PEAR-Net_URL/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_URL/metadata.xml
+++ b/dev-php/PEAR-Net_URL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_URL2/metadata.xml b/dev-php/PEAR-Net_URL2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_URL2/metadata.xml
+++ b/dev-php/PEAR-Net_URL2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
+++ b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Numbers_Roman/metadata.xml b/dev-php/PEAR-Numbers_Roman/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Numbers_Roman/metadata.xml
+++ b/dev-php/PEAR-Numbers_Roman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Numbers_Words/metadata.xml b/dev-php/PEAR-Numbers_Words/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Numbers_Words/metadata.xml
+++ b/dev-php/PEAR-Numbers_Words/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-OLE/metadata.xml
+++ b/dev-php/PEAR-OLE/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
index f632468bca37..6e5bfb23541c 100644
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pear">PEAR</remote-id>
 	</upstream>
diff --git a/dev-php/PEAR-PEAR_Info/metadata.xml b/dev-php/PEAR-PEAR_Info/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-PEAR_Info/metadata.xml
+++ b/dev-php/PEAR-PEAR_Info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-PHP_Beautifier/metadata.xml
+++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PHP_CodeSniffer/metadata.xml b/dev-php/PEAR-PHP_CodeSniffer/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-PHP_CodeSniffer/metadata.xml
+++ b/dev-php/PEAR-PHP_CodeSniffer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PHP_CompatInfo/metadata.xml b/dev-php/PEAR-PHP_CompatInfo/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-PHP_CompatInfo/metadata.xml
+++ b/dev-php/PEAR-PHP_CompatInfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PHP_Debug/metadata.xml b/dev-php/PEAR-PHP_Debug/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-PHP_Debug/metadata.xml
+++ b/dev-php/PEAR-PHP_Debug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PHP_Shell/metadata.xml b/dev-php/PEAR-PHP_Shell/metadata.xml
index 10c044fa49de..723df515a49e 100644
--- a/dev-php/PEAR-PHP_Shell/metadata.xml
+++ b/dev-php/PEAR-PHP_Shell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="auto-completion">Enable tab-completion</flag>
 	</use>
diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Pager/metadata.xml
+++ b/dev-php/PEAR-Pager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PhpDocumentor/metadata.xml b/dev-php/PEAR-PhpDocumentor/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-PhpDocumentor/metadata.xml
+++ b/dev-php/PEAR-PhpDocumentor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-SOAP/metadata.xml b/dev-php/PEAR-SOAP/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-SOAP/metadata.xml
+++ b/dev-php/PEAR-SOAP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_Amazon/metadata.xml b/dev-php/PEAR-Services_Amazon/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Services_Amazon/metadata.xml
+++ b/dev-php/PEAR-Services_Amazon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Services_JSON/metadata.xml
+++ b/dev-php/PEAR-Services_JSON/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_TinyURL/metadata.xml b/dev-php/PEAR-Services_TinyURL/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Services_TinyURL/metadata.xml
+++ b/dev-php/PEAR-Services_TinyURL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_W3C_HTMLValidator/metadata.xml b/dev-php/PEAR-Services_W3C_HTMLValidator/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Services_W3C_HTMLValidator/metadata.xml
+++ b/dev-php/PEAR-Services_W3C_HTMLValidator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Services_Weather/metadata.xml b/dev-php/PEAR-Services_Weather/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Services_Weather/metadata.xml
+++ b/dev-php/PEAR-Services_Weather/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Structures_DataGrid/metadata.xml b/dev-php/PEAR-Structures_DataGrid/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Structures_DataGrid/metadata.xml
+++ b/dev-php/PEAR-Structures_DataGrid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Structures_Graph/metadata.xml b/dev-php/PEAR-Structures_Graph/metadata.xml
index 43f3ca7ddc35..af51daf7e1d6 100644
--- a/dev-php/PEAR-Structures_Graph/metadata.xml
+++ b/dev-php/PEAR-Structures_Graph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pear">Structures_Graph</remote-id>
 	</upstream>
diff --git a/dev-php/PEAR-System_Command/metadata.xml b/dev-php/PEAR-System_Command/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-System_Command/metadata.xml
+++ b/dev-php/PEAR-System_Command/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Testing_Selenium/metadata.xml b/dev-php/PEAR-Testing_Selenium/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Testing_Selenium/metadata.xml
+++ b/dev-php/PEAR-Testing_Selenium/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_CAPTCHA/metadata.xml b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Text_CAPTCHA/metadata.xml
+++ b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Text_Figlet/metadata.xml
+++ b/dev-php/PEAR-Text_Figlet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_Highlighter/metadata.xml b/dev-php/PEAR-Text_Highlighter/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Text_Highlighter/metadata.xml
+++ b/dev-php/PEAR-Text_Highlighter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_Password/metadata.xml b/dev-php/PEAR-Text_Password/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Text_Password/metadata.xml
+++ b/dev-php/PEAR-Text_Password/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_Wiki/metadata.xml b/dev-php/PEAR-Text_Wiki/metadata.xml
index 594904762e2e..5eaf8058f54e 100644
--- a/dev-php/PEAR-Text_Wiki/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pear/archive</remote-id>
   </upstream>
diff --git a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Translation2/metadata.xml b/dev-php/PEAR-Translation2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Translation2/metadata.xml
+++ b/dev-php/PEAR-Translation2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Validate/metadata.xml b/dev-php/PEAR-Validate/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Validate/metadata.xml
+++ b/dev-php/PEAR-Validate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Var_Dump/metadata.xml b/dev-php/PEAR-Var_Dump/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PEAR-Var_Dump/metadata.xml
+++ b/dev-php/PEAR-Var_Dump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-VersionControl_SVN/metadata.xml b/dev-php/PEAR-VersionControl_SVN/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-VersionControl_SVN/metadata.xml
+++ b/dev-php/PEAR-VersionControl_SVN/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_Beautifier/metadata.xml b/dev-php/PEAR-XML_Beautifier/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-XML_Beautifier/metadata.xml
+++ b/dev-php/PEAR-XML_Beautifier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_Parser/metadata.xml b/dev-php/PEAR-XML_Parser/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-XML_Parser/metadata.xml
+++ b/dev-php/PEAR-XML_Parser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_RSS/metadata.xml b/dev-php/PEAR-XML_RSS/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-XML_RSS/metadata.xml
+++ b/dev-php/PEAR-XML_RSS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_Serializer/metadata.xml b/dev-php/PEAR-XML_Serializer/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PEAR-XML_Serializer/metadata.xml
+++ b/dev-php/PEAR-XML_Serializer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml
index 396e4aa3c601..69be3c93d7c2 100644
--- a/dev-php/PEAR-XML_Util/metadata.xml
+++ b/dev-php/PEAR-XML_Util/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pear">XML_Util</remote-id>
 	</upstream>
diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml
index b64044cf94d8..92f5c09772dd 100644
--- a/dev-php/PHPMailer/metadata.xml
+++ b/dev-php/PHPMailer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">PHPMailer/PHPMailer</remote-id>
   </upstream>
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PHP_CodeCoverage/metadata.xml
+++ b/dev-php/PHP_CodeCoverage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PHP_Timer/metadata.xml
+++ b/dev-php/PHP_Timer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/PHP_TokenStream/metadata.xml
+++ b/dev-php/PHP_TokenStream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/PHPonTrax/metadata.xml b/dev-php/PHPonTrax/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/PHPonTrax/metadata.xml
+++ b/dev-php/PHPonTrax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/SabreAMF/metadata.xml b/dev-php/SabreAMF/metadata.xml
index 9ecdfcfa2db5..6e7f58dc5c28 100644
--- a/dev-php/SabreAMF/metadata.xml
+++ b/dev-php/SabreAMF/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">sabreamf</remote-id>
 	</upstream>
diff --git a/dev-php/Savant2/metadata.xml b/dev-php/Savant2/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/Savant2/metadata.xml
+++ b/dev-php/Savant2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/Savant3-Plugin-Form/metadata.xml b/dev-php/Savant3-Plugin-Form/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/Savant3-Plugin-Form/metadata.xml
+++ b/dev-php/Savant3-Plugin-Form/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/Savant3/metadata.xml b/dev-php/Savant3/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/Savant3/metadata.xml
+++ b/dev-php/Savant3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/Text_Template/metadata.xml
+++ b/dev-php/Text_Template/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/YAML/metadata.xml b/dev-php/YAML/metadata.xml
index 8af06536aaf7..e6e129800b21 100644
--- a/dev-php/YAML/metadata.xml
+++ b/dev-php/YAML/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 <longdescription lang="en">
 The Symfony YAML Component
 </longdescription>
diff --git a/dev-php/ZendFramework/metadata.xml b/dev-php/ZendFramework/metadata.xml
index 7e2113556441..2e08cd990280 100644
--- a/dev-php/ZendFramework/metadata.xml
+++ b/dev-php/ZendFramework/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
 	<maintainer>
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Enables the CLI</flag>
 		<flag name="doc">Installs the documentation</flag>
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
index 47729dbb3dd7..41b361a05409 100644
--- a/dev-php/adodb/metadata.xml
+++ b/dev-php/adodb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">adodb</remote-id>
 	</upstream>
diff --git a/dev-php/agavi/metadata.xml b/dev-php/agavi/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/agavi/metadata.xml
+++ b/dev-php/agavi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index 0bb482da5813..a13d91f32222 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/cphplib/metadata.xml b/dev-php/cphplib/metadata.xml
index c8f6f920c602..bea7532461ef 100644
--- a/dev-php/cphplib/metadata.xml
+++ b/dev-php/cphplib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cphplib</remote-id>
 	</upstream>
diff --git a/dev-php/doctrine/metadata.xml b/dev-php/doctrine/metadata.xml
index ff5a7ade9110..039517ed1e1a 100644
--- a/dev-php/doctrine/metadata.xml
+++ b/dev-php/doctrine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">doctrine/doctrine2</remote-id>
   </upstream>
diff --git a/dev-php/ffmpeg-php/metadata.xml b/dev-php/ffmpeg-php/metadata.xml
index 320883b01a9a..36c10440aecb 100644
--- a/dev-php/ffmpeg-php/metadata.xml
+++ b/dev-php/ffmpeg-php/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ffmpeg-php</remote-id>
 	</upstream>
diff --git a/dev-php/igbinary/metadata.xml b/dev-php/igbinary/metadata.xml
index ed3ed4256f63..861cfcae2ece 100644
--- a/dev-php/igbinary/metadata.xml
+++ b/dev-php/igbinary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">igbinary/igbinary</remote-id>
   </upstream>
diff --git a/dev-php/jpgraph/metadata.xml b/dev-php/jpgraph/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/jpgraph/metadata.xml
+++ b/dev-php/jpgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/libchart/metadata.xml b/dev-php/libchart/metadata.xml
index 64a54cc50bcb..cd4a7b02634e 100644
--- a/dev-php/libchart/metadata.xml
+++ b/dev-php/libchart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libchart</remote-id>
 	</upstream>
diff --git a/dev-php/libvirt-php/metadata.xml b/dev-php/libvirt-php/metadata.xml
index f093bc851879..4a172cdf1aac 100644
--- a/dev-php/libvirt-php/metadata.xml
+++ b/dev-php/libvirt-php/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+<maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/magickwand/metadata.xml b/dev-php/magickwand/metadata.xml
index 5c3dc463d770..f0b22f2be0a6 100644
--- a/dev-php/magickwand/metadata.xml
+++ b/dev-php/magickwand/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <longdescription>
     This PHP5 extension provides
     access to the ImageMagick MagickWand API.
diff --git a/dev-php/ming-php/metadata.xml b/dev-php/ming-php/metadata.xml
index ce2b7b48934b..7830ae89a04b 100644
--- a/dev-php/ming-php/metadata.xml
+++ b/dev-php/ming-php/metadata.xml
@@ -5,7 +5,10 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ming</remote-id>
 	</upstream>
diff --git a/dev-php/mmslib/metadata.xml b/dev-php/mmslib/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/mmslib/metadata.xml
+++ b/dev-php/mmslib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/mockery/metadata.xml b/dev-php/mockery/metadata.xml
index 388a8fe2dad9..f35577289a6a 100644
--- a/dev-php/mockery/metadata.xml
+++ b/dev-php/mockery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">padraic/mockery</remote-id>
   </upstream>
diff --git a/dev-php/onphp/metadata.xml b/dev-php/onphp/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/onphp/metadata.xml
+++ b/dev-php/onphp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pear/metadata.xml
+++ b/dev-php/pear/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml
index 09587459fbb6..e2611d60ec7f 100644
--- a/dev-php/pecl-amqp/metadata.xml
+++ b/dev-php/pecl-amqp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml
index cf71629d0762..c9b2f034f639 100644
--- a/dev-php/pecl-apcu/metadata.xml
+++ b/dev-php/pecl-apcu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="lock_semaphore">Enable semaphore locks instead of fcntl</flag>
 		<flag name="lock_pthreadmutex">Enable pthread mutex locking</flag>
diff --git a/dev-php/pecl-apcu_bc/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-apcu_bc/metadata.xml
+++ b/dev-php/pecl-apcu_bc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-bbcode/metadata.xml b/dev-php/pecl-bbcode/metadata.xml
index 89ceacf36dc5..fa1d6df1c405 100644
--- a/dev-php/pecl-bbcode/metadata.xml
+++ b/dev-php/pecl-bbcode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 <longdescription>
 This is a quick and efficient BBCode Parsing Library.It provides various tag types,
 high speed one pass parsing, callback system, tag position restriction.
diff --git a/dev-php/pecl-cairo/metadata.xml b/dev-php/pecl-cairo/metadata.xml
index b25b5be765bd..dad72cd5dc02 100644
--- a/dev-php/pecl-cairo/metadata.xml
+++ b/dev-php/pecl-cairo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">The Cairo PHP Extension aims to provide support
 		for all officially supported font backends and surface backends, as well
 		as expose all available functionality in cairo to PHP users.
diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-crack/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-crack/metadata.xml
+++ b/dev-php/pecl-crack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-dbx/metadata.xml b/dev-php/pecl-dbx/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-dbx/metadata.xml
+++ b/dev-php/pecl-dbx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-dio/metadata.xml b/dev-php/pecl-dio/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-dio/metadata.xml
+++ b/dev-php/pecl-dio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-drizzle/metadata.xml b/dev-php/pecl-drizzle/metadata.xml
index 21b6378eedbc..1b3335586b42 100644
--- a/dev-php/pecl-drizzle/metadata.xml
+++ b/dev-php/pecl-drizzle/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pavel.stratil-jun@fenix.cz</email>
     <description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,4 +8,8 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-eio/metadata.xml b/dev-php/pecl-eio/metadata.xml
index b34d5e1b1c73..0c2428e09ee1 100644
--- a/dev-php/pecl-eio/metadata.xml
+++ b/dev-php/pecl-eio/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>rrosmanov@gmail.com</email>
 <name>Ruslan Osmanov</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
index eb88016a77f4..cf3f61c156c7 100644
--- a/dev-php/pecl-event/metadata.xml
+++ b/dev-php/pecl-event/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>rrosmanov@gmail.com</email>
 <name>Ruslan Osmanov</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 <flag name="extra">Add support of the Libevent extra API</flag>
 </use>
diff --git a/dev-php/pecl-gearman/metadata.xml b/dev-php/pecl-gearman/metadata.xml
index 21b6378eedbc..1b3335586b42 100644
--- a/dev-php/pecl-gearman/metadata.xml
+++ b/dev-php/pecl-gearman/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pavel.stratil-jun@fenix.cz</email>
     <description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,4 +8,8 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-geoip/metadata.xml
+++ b/dev-php/pecl-geoip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-gnupg/metadata.xml b/dev-php/pecl-gnupg/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-gnupg/metadata.xml
+++ b/dev-php/pecl-gnupg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-haru/metadata.xml b/dev-php/pecl-haru/metadata.xml
index c193ddc2cef9..aa614b730f2a 100644
--- a/dev-php/pecl-haru/metadata.xml
+++ b/dev-php/pecl-haru/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">These functions allow you to create PDF documents
 		using the Haru Free PDF Library.
 	</longdescription>
diff --git a/dev-php/pecl-htscanner/metadata.xml b/dev-php/pecl-htscanner/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-htscanner/metadata.xml
+++ b/dev-php/pecl-htscanner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-http/metadata.xml
+++ b/dev-php/pecl-http/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-imagick/metadata.xml
+++ b/dev-php/pecl-imagick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-libevent/metadata.xml b/dev-php/pecl-libevent/metadata.xml
index 2d2189bd4aa4..f3482cbd3749 100644
--- a/dev-php/pecl-libevent/metadata.xml
+++ b/dev-php/pecl-libevent/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-lzf/metadata.xml b/dev-php/pecl-lzf/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-lzf/metadata.xml
+++ b/dev-php/pecl-lzf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-mailparse/metadata.xml b/dev-php/pecl-mailparse/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-mailparse/metadata.xml
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-memcache/metadata.xml b/dev-php/pecl-memcache/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-memcache/metadata.xml
+++ b/dev-php/pecl-memcache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-memcached/metadata.xml b/dev-php/pecl-memcached/metadata.xml
index bd43a55951d2..300ceb3db327 100644
--- a/dev-php/pecl-memcached/metadata.xml
+++ b/dev-php/pecl-memcached/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="igbinary">Enable support for the igbinary serializer</flag>
 		<flag name="json">Enable support for json serialization</flag>
diff --git a/dev-php/pecl-mongo/metadata.xml b/dev-php/pecl-mongo/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-mongo/metadata.xml
+++ b/dev-php/pecl-mongo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-mysqlnd_ms/metadata.xml b/dev-php/pecl-mysqlnd_ms/metadata.xml
index f891503ca635..01a754ef320d 100644
--- a/dev-php/pecl-mysqlnd_ms/metadata.xml
+++ b/dev-php/pecl-mysqlnd_ms/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
   <maintainer>
     <email>olemarkus@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-mysqlnd_qc/metadata.xml b/dev-php/pecl-mysqlnd_qc/metadata.xml
index eed0321d324c..31ee63f7a17d 100644
--- a/dev-php/pecl-mysqlnd_qc/metadata.xml
+++ b/dev-php/pecl-mysqlnd_qc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
   <maintainer>
     <email>olemarkus@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <use>
     <flag name="memcached">Use <pkg>dev-libs/libmemcached</pkg> as a storage handler</flag>
     <flag name="sqlite">Use <pkg>dev-db/sqlite</pkg> as a storage handler</flag>
diff --git a/dev-php/pecl-ncurses/metadata.xml b/dev-php/pecl-ncurses/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-ncurses/metadata.xml
+++ b/dev-php/pecl-ncurses/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml
index 09587459fbb6..e2611d60ec7f 100644
--- a/dev-php/pecl-oauth/metadata.xml
+++ b/dev-php/pecl-oauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-pam/metadata.xml b/dev-php/pecl-pam/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-pam/metadata.xml
+++ b/dev-php/pecl-pam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-ps/metadata.xml b/dev-php/pecl-ps/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-ps/metadata.xml
+++ b/dev-php/pecl-ps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-radius/metadata.xml b/dev-php/pecl-radius/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-radius/metadata.xml
+++ b/dev-php/pecl-radius/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index 2af2b3612db7..c07089fb4075 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<use>
 		<flag name="igbinary">Enables igbinary serialisation support</flag>
 	</use>
diff --git a/dev-php/pecl-rrd/metadata.xml b/dev-php/pecl-rrd/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-rrd/metadata.xml
+++ b/dev-php/pecl-rrd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-sphinx/metadata.xml b/dev-php/pecl-sphinx/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-sphinx/metadata.xml
+++ b/dev-php/pecl-sphinx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-spl_types/metadata.xml b/dev-php/pecl-spl_types/metadata.xml
index 3d0c667cd0da..e2611d60ec7f 100644
--- a/dev-php/pecl-spl_types/metadata.xml
+++ b/dev-php/pecl-spl_types/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php
-	</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-ssh2/metadata.xml
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-stomp/metadata.xml b/dev-php/pecl-stomp/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-stomp/metadata.xml
+++ b/dev-php/pecl-stomp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-svn/metadata.xml b/dev-php/pecl-svn/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/dev-php/pecl-svn/metadata.xml
+++ b/dev-php/pecl-svn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-syck/metadata.xml b/dev-php/pecl-syck/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-syck/metadata.xml
+++ b/dev-php/pecl-syck/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml
index 2c8c53a11f62..22400977f365 100644
--- a/dev-php/pecl-taint/metadata.xml
+++ b/dev-php/pecl-taint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 		Extension used for detecting XSS codes(tainted string)
 	</longdescription>
diff --git a/dev-php/pecl-timezonedb/metadata.xml b/dev-php/pecl-timezonedb/metadata.xml
index e95c65c418d2..f70cb4a413ea 100644
--- a/dev-php/pecl-timezonedb/metadata.xml
+++ b/dev-php/pecl-timezonedb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription>
 	This extension is a drop-in replacement for the builtin timezone database that
 	comes with PHP. You should only install this extension in case you need to get
diff --git a/dev-php/pecl-translit/metadata.xml b/dev-php/pecl-translit/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-translit/metadata.xml
+++ b/dev-php/pecl-translit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index 400417ec107b..d04e1d2c758d 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 <longdescription lang="en">An extension to track progress of a file upload.
 See http://cvs.php.net/viewvc.cgi/pecl/uploadprogress/examples/ for a little example.  It is only known to work on Apache with mod_php, other SAPI implementations unfortunately still have issues.
 </longdescription>
diff --git a/dev-php/pecl-xdiff/metadata.xml b/dev-php/pecl-xdiff/metadata.xml
index 06ac9aab07e7..8fb07f355725 100644
--- a/dev-php/pecl-xdiff/metadata.xml
+++ b/dev-php/pecl-xdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">php/pecl-text-xdiff</remote-id>
   </upstream>
diff --git a/dev-php/pecl-xrange/metadata.xml b/dev-php/pecl-xrange/metadata.xml
index 09587459fbb6..e2611d60ec7f 100644
--- a/dev-php/pecl-xrange/metadata.xml
+++ b/dev-php/pecl-xrange/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-yaml/metadata.xml b/dev-php/pecl-yaml/metadata.xml
index 6b5e05332e85..13bacce20791 100644
--- a/dev-php/pecl-yaml/metadata.xml
+++ b/dev-php/pecl-yaml/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
 	<maintainer>
 		<email>olemarkus@gentoo.org</email>
 		<name>Ole Markus With</name>
 	</maintainer>
+<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-yaz/metadata.xml b/dev-php/pecl-yaz/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/pecl-yaz/metadata.xml
+++ b/dev-php/pecl-yaz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/phing/metadata.xml b/dev-php/phing/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/phing/metadata.xml
+++ b/dev-php/phing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/php-codebrowser/metadata.xml b/dev-php/php-codebrowser/metadata.xml
index 36a591c2d120..5d19bf76af41 100644
--- a/dev-php/php-codebrowser/metadata.xml
+++ b/dev-php/php-codebrowser/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 <longdescription lang="en">
 PHP_CodeBrowser generates a html view for code browsing with higlighted and colored errors, parsed from xml reports generated from codesniffer or phpunit.
 </longdescription>
diff --git a/dev-php/php-openid/metadata.xml b/dev-php/php-openid/metadata.xml
index 25958af0e3a2..0d141c965d34 100644
--- a/dev-php/php-openid/metadata.xml
+++ b/dev-php/php-openid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">openid/php-openid</remote-id>
   </upstream>
diff --git a/dev-php/php-redmine-api/metadata.xml b/dev-php/php-redmine-api/metadata.xml
index 217c69cfd5ed..3a56424f2175 100644
--- a/dev-php/php-redmine-api/metadata.xml
+++ b/dev-php/php-redmine-api/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kbsali/php-redmine-api</remote-id>
   </upstream>
diff --git a/dev-php/phpDocumentor/metadata.xml b/dev-php/phpDocumentor/metadata.xml
index 64ac63f2e56e..ba02b9dee1ab 100644
--- a/dev-php/phpDocumentor/metadata.xml
+++ b/dev-php/phpDocumentor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">phpDocumentor/phpDocumentor2</remote-id>
   </upstream>
diff --git a/dev-php/phpcov/metadata.xml b/dev-php/phpcov/metadata.xml
index 6321a19367e0..c7f48766d795 100644
--- a/dev-php/phpcov/metadata.xml
+++ b/dev-php/phpcov/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sebastianbergmann/phpcov</remote-id>
   </upstream>
diff --git a/dev-php/phpdepend/metadata.xml b/dev-php/phpdepend/metadata.xml
index 7f6aa6e5aed0..712634a5d769 100644
--- a/dev-php/phpdepend/metadata.xml
+++ b/dev-php/phpdepend/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 <longdescription lang="en">
 Static code analyser for PHP
 </longdescription>
diff --git a/dev-php/phpmd/metadata.xml b/dev-php/phpmd/metadata.xml
index 3b5aed4e2063..fecc5abff5c4 100644
--- a/dev-php/phpmd/metadata.xml
+++ b/dev-php/phpmd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
 <maintainer>
 <email>olemarkus@gentoo.org</email>
 <name>Ole Markus With</name>
 </maintainer>
+<maintainer>
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
 <longdescription lang="en">
 PHP mess detector
 </longdescription>
diff --git a/dev-php/phptal/metadata.xml b/dev-php/phptal/metadata.xml
index 0575d3a570dc..c9fa99e4738e 100644
--- a/dev-php/phptal/metadata.xml
+++ b/dev-php/phptal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/phpunit/metadata.xml
+++ b/dev-php/phpunit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/propel-generator/metadata.xml b/dev-php/propel-generator/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/propel-generator/metadata.xml
+++ b/dev-php/propel-generator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/propel-runtime/metadata.xml b/dev-php/propel-runtime/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/propel-runtime/metadata.xml
+++ b/dev-php/propel-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/propel/metadata.xml b/dev-php/propel/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/propel/metadata.xml
+++ b/dev-php/propel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/simpletest/metadata.xml b/dev-php/simpletest/metadata.xml
index 88b298f05ca8..c275967fd872 100644
--- a/dev-php/simpletest/metadata.xml
+++ b/dev-php/simpletest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simpletest</remote-id>
 	</upstream>
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
index 3bcc6b223fda..6b401799d505 100644
--- a/dev-php/smarty/metadata.xml
+++ b/dev-php/smarty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 		Smarty is a template engine for PHP, facilitating the separation of
 		presentation (HTML/CSS) from application logic. This implies that PHP
diff --git a/dev-php/stringparser_bbcode/metadata.xml b/dev-php/stringparser_bbcode/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/stringparser_bbcode/metadata.xml
+++ b/dev-php/stringparser_bbcode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/suhosin/metadata.xml b/dev-php/suhosin/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/suhosin/metadata.xml
+++ b/dev-php/suhosin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/tcpdf/metadata.xml b/dev-php/tcpdf/metadata.xml
index 04e7563e8098..046ecc60ac7f 100644
--- a/dev-php/tcpdf/metadata.xml
+++ b/dev-php/tcpdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcpdf</remote-id>
 	</upstream>
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index e6f4f88e838c..e6dc20b164da 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -5,5 +5,8 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
-  <herd>php</herd>
-</pkgmetadata>
+  <maintainer>
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/dev-php/xcache/metadata.xml b/dev-php/xcache/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/xcache/metadata.xml
+++ b/dev-php/xcache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/xdebug-client/metadata.xml b/dev-php/xdebug-client/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/xdebug-client/metadata.xml
+++ b/dev-php/xdebug-client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml
index fd3dbe39fa64..ae9e6163be0a 100644
--- a/dev-php/xdebug/metadata.xml
+++ b/dev-php/xdebug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml
index 82983d1b1894..37ffc19fe452 100644
--- a/dev-php/xhprof/metadata.xml
+++ b/dev-php/xhprof/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>php</herd>
+	<maintainer>
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
 	<longdescription lang="en">
 XHProf is a function-level hierarchical profiler for PHP
 	</longdescription>
diff --git a/dev-python/3to2/metadata.xml b/dev-python/3to2/metadata.xml
index d64659c2f2b8..0920a791435d 100644
--- a/dev-python/3to2/metadata.xml
+++ b/dev-python/3to2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">3to2</remote-id>
   </upstream>
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
index e0b8d2edbff3..1c4e67cd9929 100644
--- a/dev-python/Babel/metadata.xml
+++ b/dev-python/Babel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 		A collection of tools for internationalizing Python applications
 		Babel is composed of two major parts:
diff --git a/dev-python/BitVector/metadata.xml b/dev-python/BitVector/metadata.xml
index bf0f41e4651d..f8b369a522b5 100644
--- a/dev-python/BitVector/metadata.xml
+++ b/dev-python/BitVector/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 	  A pure-Python memory-efficient packed representation for bit arrays
 	</longdescription>
diff --git a/dev-python/CacheControl/metadata.xml b/dev-python/CacheControl/metadata.xml
index 45f79e735db3..276633e5dd2e 100644
--- a/dev-python/CacheControl/metadata.xml
+++ b/dev-python/CacheControl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ionrock/cachecontrol</remote-id>
     <remote-id type="pypi">CacheControl</remote-id>
diff --git a/dev-python/Coffin/metadata.xml b/dev-python/Coffin/metadata.xml
index 69bd5d0783f4..dad26705e9cf 100644
--- a/dev-python/Coffin/metadata.xml
+++ b/dev-python/Coffin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Coffin</remote-id>
     <remote-id type="github">coffin/coffin</remote-id>
diff --git a/dev-python/Flask-KVSession/metadata.xml b/dev-python/Flask-KVSession/metadata.xml
index c4f1b66a1a32..437ba73f45f8 100644
--- a/dev-python/Flask-KVSession/metadata.xml
+++ b/dev-python/Flask-KVSession/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-KVSession</remote-id>
     <remote-id type="github">mbr/flask-kvsession</remote-id>
diff --git a/dev-python/GridDataFormats/metadata.xml b/dev-python/GridDataFormats/metadata.xml
index 5ce2907e4995..e2d735891069 100644
--- a/dev-python/GridDataFormats/metadata.xml
+++ b/dev-python/GridDataFormats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">GridDataFormats</remote-id>
     <remote-id type="github">MDAnalysis/GridDataFormats</remote-id>
diff --git a/dev-python/Numdifftools/metadata.xml b/dev-python/Numdifftools/metadata.xml
index d84c9baaccd9..82dde1cffc78 100644
--- a/dev-python/Numdifftools/metadata.xml
+++ b/dev-python/Numdifftools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Numdifftools</remote-id>
     <remote-id type="github">pbrod/numdifftools</remote-id>
diff --git a/dev-python/PyContracts/metadata.xml b/dev-python/PyContracts/metadata.xml
index e0aaa2b00755..c6b3fc133ed2 100644
--- a/dev-python/PyContracts/metadata.xml
+++ b/dev-python/PyContracts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">coloredlogs</remote-id>
     <remote-id type="github">xolox/python-coloredlogs</remote-id>
diff --git a/dev-python/PyECLib/metadata.xml b/dev-python/PyECLib/metadata.xml
index c981fdb3e31f..95020412abf0 100644
--- a/dev-python/PyECLib/metadata.xml
+++ b/dev-python/PyECLib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     This library provides a simple Python interface for implementing erasure codes. To obtain the best possible performance, the underlying erasure code algorithms are written in C.
   </longdescription>
diff --git a/dev-python/PyFoam/metadata.xml b/dev-python/PyFoam/metadata.xml
index 32fce4816841..ed23aa426a33 100644
--- a/dev-python/PyFoam/metadata.xml
+++ b/dev-python/PyFoam/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
@@ -11,6 +9,14 @@
 		<email>oli.borm@web.de</email>
 		<name>Oliver Borm</name>
 	</maintainer>
+	<maintainer>
+  		<email>python@gentoo.org</email>
+  		<name>Python</name>
+	</maintainer>
+	<maintainer>
+  		<email>proxy-maint@gentoo.org</email>
+  		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
   		<flag name="extras">Enable optional dependencies</flag>
 	</use>
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index 285e151315a2..bad19637a53f 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jacquev6/PyGithub</remote-id>
   </upstream>
diff --git a/dev-python/PyPDF2/metadata.xml b/dev-python/PyPDF2/metadata.xml
index dfc8e7ea6a37..a410c6a247a4 100644
--- a/dev-python/PyPDF2/metadata.xml
+++ b/dev-python/PyPDF2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PyPDF2</remote-id>
     <remote-id type="github">mstamy2/PyPDF2</remote-id>
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 31d70a3f30fb..1485fab69af7 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="X">Build bindings for the QtGui module</flag>
 		<flag name="dbus">Build bindings for the QtDBus module</flag>
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 82e1aa1b7d4d..092a9e38e330 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="dbus">Build bindings for the QtDBus module</flag>
 		<flag name="declarative">Build bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
diff --git a/dev-python/PyQtMobility/metadata.xml b/dev-python/PyQtMobility/metadata.xml
index 7f992a02780e..5da934964379 100644
--- a/dev-python/PyQtMobility/metadata.xml
+++ b/dev-python/PyQtMobility/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="contacts">Build bindings for the QtContacts module</flag>
 		<flag name="feedback">Build bindings for the QtFeedback module</flag>
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index f320dd15bcfb..65c24d2dcdcc 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/PySocks/metadata.xml b/dev-python/PySocks/metadata.xml
index dab12833d6b0..6585c65dca49 100644
--- a/dev-python/PySocks/metadata.xml
+++ b/dev-python/PySocks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PySocks</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/RecSQL/metadata.xml b/dev-python/RecSQL/metadata.xml
index ba2081c24180..16a22c37cd16 100644
--- a/dev-python/RecSQL/metadata.xml
+++ b/dev-python/RecSQL/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">orbeckst/RecSQL</remote-id>
   </upstream>
diff --git a/dev-python/SaltTesting/metadata.xml b/dev-python/SaltTesting/metadata.xml
index 9e2d309a1252..7b23d2c20e49 100644
--- a/dev-python/SaltTesting/metadata.xml
+++ b/dev-python/SaltTesting/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">SaltTesting</remote-id>
   </upstream>
diff --git a/dev-python/WSME/metadata.xml b/dev-python/WSME/metadata.xml
index ebde72ca9945..affff4c398db 100644
--- a/dev-python/WSME/metadata.xml
+++ b/dev-python/WSME/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	Simplify the writing of REST APIs, and extend them with additional protocols.
 	</longdescription>
diff --git a/dev-python/XenAPI/metadata.xml b/dev-python/XenAPI/metadata.xml
index 0e0a1dcb0ea5..4e3e73a418e9 100644
--- a/dev-python/XenAPI/metadata.xml
+++ b/dev-python/XenAPI/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xen</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>xen@gentoo.org</email>
+    <name>Gentoo Xen Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">XenAPI</remote-id>
   </upstream>
diff --git a/dev-python/aadict/metadata.xml b/dev-python/aadict/metadata.xml
index a107c196f014..45a7e3397d2e 100644
--- a/dev-python/aadict/metadata.xml
+++ b/dev-python/aadict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">aadict</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/abstract_rendering/metadata.xml b/dev-python/abstract_rendering/metadata.xml
index 4600eb8e4c55..0b4c50533b88 100644
--- a/dev-python/abstract_rendering/metadata.xml
+++ b/dev-python/abstract_rendering/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">abstract_rendering</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/addons/metadata.xml b/dev-python/addons/metadata.xml
index 50e8fbf189c9..c07dba859cca 100644
--- a/dev-python/addons/metadata.xml
+++ b/dev-python/addons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">AddOns</remote-id>
   </upstream>
diff --git a/dev-python/adns-python/metadata.xml b/dev-python/adns-python/metadata.xml
index 10b55c2f3116..cd18a551deca 100644
--- a/dev-python/adns-python/metadata.xml
+++ b/dev-python/adns-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">adns-python</remote-id>
 	</upstream>
diff --git a/dev-python/adodb-py/metadata.xml b/dev-python/adodb-py/metadata.xml
index 3f948189258c..5a7bf3353338 100644
--- a/dev-python/adodb-py/metadata.xml
+++ b/dev-python/adodb-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Database abstraction library for Python</longdescription>
 	<longdescription lang="ja">
 Python言語用データベース抽象化ライブラリです。
diff --git a/dev-python/aioeventlet/metadata.xml b/dev-python/aioeventlet/metadata.xml
index 595605a0ea16..79f80460f597 100644
--- a/dev-python/aioeventlet/metadata.xml
+++ b/dev-python/aioeventlet/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes possible to write asyncio code in a project currently written for eventlet.
 </longdescription>
diff --git a/dev-python/alabaster/metadata.xml b/dev-python/alabaster/metadata.xml
index 1dc910e6eccb..0552b46ee6a5 100644
--- a/dev-python/alabaster/metadata.xml
+++ b/dev-python/alabaster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">alabaster</remote-id>
     <remote-id type="github">bitprophet/alabaster</remote-id>
diff --git a/dev-python/alembic/metadata.xml b/dev-python/alembic/metadata.xml
index b0ab8676db40..edea20d57608 100644
--- a/dev-python/alembic/metadata.xml
+++ b/dev-python/alembic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yac@gentoo.org</email>
     <name>Jan Matějka</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">alembic</remote-id>
     <remote-id type="bitbucket">zzzeek/alembic</remote-id>
diff --git a/dev-python/algopy/metadata.xml b/dev-python/algopy/metadata.xml
index 9daf92bd79a2..6c528336cad8 100644
--- a/dev-python/algopy/metadata.xml
+++ b/dev-python/algopy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">algopy</remote-id>
   </upstream>
diff --git a/dev-python/amodem/metadata.xml b/dev-python/amodem/metadata.xml
index 18386e75e2fe..5f8d6c7ec2e2 100644
--- a/dev-python/amodem/metadata.xml
+++ b/dev-python/amodem/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">amodem</remote-id>
     <remote-id type="github">romanz/amodem</remote-id>
diff --git a/dev-python/amqplib/metadata.xml b/dev-python/amqplib/metadata.xml
index c021a58ce6e8..d8fb3a9daaaa 100644
--- a/dev-python/amqplib/metadata.xml
+++ b/dev-python/amqplib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="extras">Install extra tools to generate initial Python mod 
 		from an AMQP XML file</flag>
diff --git a/dev-python/aniso8601/metadata.xml b/dev-python/aniso8601/metadata.xml
index 551ccb5eb0f6..f9912c5097a4 100644
--- a/dev-python/aniso8601/metadata.xml
+++ b/dev-python/aniso8601/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">aniso8601</remote-id>
     <remote-id type="bitbucket">nielsenb/aniso8601</remote-id>
diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml
index 3936c4a0cc84..b5e6b6c1eb09 100644
--- a/dev-python/ansi2html/metadata.xml
+++ b/dev-python/ansi2html/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>sping@gentoo.org</email>
     <name>Sebastian Pipping</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ansi2html</remote-id>
     <remote-id type="github">ralphbean/ansi2html</remote-id>
diff --git a/dev-python/ansicolor/metadata.xml b/dev-python/ansicolor/metadata.xml
index 3ce1c94765b3..6c635bf19a0a 100644
--- a/dev-python/ansicolor/metadata.xml
+++ b/dev-python/ansicolor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ansicolor</remote-id>
     <remote-id type="github">numerodix/ansicolor</remote-id>
diff --git a/dev-python/anyjson/metadata.xml b/dev-python/anyjson/metadata.xml
index f73b5edab803..805a89a7311b 100644
--- a/dev-python/anyjson/metadata.xml
+++ b/dev-python/anyjson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">anyjson</remote-id>
     <remote-id type="bitbucket">runeh/anyjson</remote-id>
diff --git a/dev-python/anyvc/metadata.xml b/dev-python/anyvc/metadata.xml
index 8c0318f0aa77..2878ec2367b4 100644
--- a/dev-python/anyvc/metadata.xml
+++ b/dev-python/anyvc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Add support for Bazaar</flag>
 		<flag name="mercurial">Add support for Mercurial</flag>
diff --git a/dev-python/apipkg/metadata.xml b/dev-python/apipkg/metadata.xml
index efc3b570c70c..a64053aeecfd 100644
--- a/dev-python/apipkg/metadata.xml
+++ b/dev-python/apipkg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">apipkg</remote-id>
 	</upstream>
diff --git a/dev-python/aplpy/metadata.xml b/dev-python/aplpy/metadata.xml
index 9f00245ca4e2..43627d3602e4 100644
--- a/dev-python/aplpy/metadata.xml
+++ b/dev-python/aplpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   APLpy (the Astronomical Plotting Library in Python) is a Python
   module aimed at producing publication-quality plots of astronomical
diff --git a/dev-python/appdirs/metadata.xml b/dev-python/appdirs/metadata.xml
index ffe48945f004..0198d0c4461c 100644
--- a/dev-python/appdirs/metadata.xml
+++ b/dev-python/appdirs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		A small Python module for determining appropriate platform-specific
 		dirs, e.g. a "user data dir".
diff --git a/dev-python/apptools/metadata.xml b/dev-python/apptools/metadata.xml
index 281379a77c07..72fab5262894 100644
--- a/dev-python/apptools/metadata.xml
+++ b/dev-python/apptools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Enthought Tool Suite AppTools project includes a set of
     packages that Enthought has found useful in creating a number of
diff --git a/dev-python/apse/metadata.xml b/dev-python/apse/metadata.xml
index f13a12ff9520..536e86e3891f 100644
--- a/dev-python/apse/metadata.xml
+++ b/dev-python/apse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Approximate String Matching in Python: identifies typing and spelling
 		errors, closely related vocabularies, genetic mutations (GAG ACT),
diff --git a/dev-python/apsw/metadata.xml b/dev-python/apsw/metadata.xml
index ede09cb0f62a..6a6ebf3d7d84 100644
--- a/dev-python/apsw/metadata.xml
+++ b/dev-python/apsw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
 Everything you can do from the C API to SQLite 3, you can do from Python. 
 Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
diff --git a/dev-python/aquarium/metadata.xml b/dev-python/aquarium/metadata.xml
index 8f91aaabcc97..c53ab4406955 100644
--- a/dev-python/aquarium/metadata.xml
+++ b/dev-python/aquarium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aquarium</remote-id>
 	</upstream>
diff --git a/dev-python/argcomplete/metadata.xml b/dev-python/argcomplete/metadata.xml
index 694b917b7707..c05354110f70 100644
--- a/dev-python/argcomplete/metadata.xml
+++ b/dev-python/argcomplete/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">argcomplete</remote-id>
   </upstream>
diff --git a/dev-python/argh/metadata.xml b/dev-python/argh/metadata.xml
index a9dcfbd8363b..d548735400bc 100644
--- a/dev-python/argh/metadata.xml
+++ b/dev-python/argh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">argh</remote-id>
 	</upstream>
diff --git a/dev-python/arrayterator/metadata.xml b/dev-python/arrayterator/metadata.xml
index ec2c375cc348..e6640869fbc6 100644
--- a/dev-python/arrayterator/metadata.xml
+++ b/dev-python/arrayterator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">arrayterator</remote-id>
 	</upstream>
diff --git a/dev-python/asciitable/metadata.xml b/dev-python/asciitable/metadata.xml
index 00672afe8a7c..1899d42fc755 100644
--- a/dev-python/asciitable/metadata.xml
+++ b/dev-python/asciitable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   asciitable is a Python module that can read a wide range of ASCII
   table formats used in astronomy, via a built-in extension reader
diff --git a/dev-python/asset/metadata.xml b/dev-python/asset/metadata.xml
index 002aa5cc4691..efae48da370f 100644
--- a/dev-python/asset/metadata.xml
+++ b/dev-python/asset/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">asset</remote-id>
 		<remote-id type="github">metagriffin/asset</remote-id>
diff --git a/dev-python/assets/metadata.xml b/dev-python/assets/metadata.xml
index dd0fc015b951..54edfba899ca 100644
--- a/dev-python/assets/metadata.xml
+++ b/dev-python/assets/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 	</maintainer>
@@ -10,6 +8,14 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 	The assets package does content-hash-naming (aka URL fingerprinting) so
 	you can use aggressive caching headers without risking that a client might
diff --git a/dev-python/astng/metadata.xml b/dev-python/astng/metadata.xml
index 1b13630a68a6..4b7e6375563c 100644
--- a/dev-python/astng/metadata.xml
+++ b/dev-python/astng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">The aim of this module is to provide a common base representation of
   python source code for projects such as pychecker, pyreverse,
   pylint... Well, actually the development of this library is
diff --git a/dev-python/astor/metadata.xml b/dev-python/astor/metadata.xml
index 401f35c17dd4..ae4b475c9a49 100644
--- a/dev-python/astor/metadata.xml
+++ b/dev-python/astor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">astor</remote-id>
 	</upstream>
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
index 7794b7137e79..e341c3848431 100644
--- a/dev-python/astroid/metadata.xml
+++ b/dev-python/astroid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">The aim of this module is to provide a common base representation of
   python source code for projects such as pychecker, pyreverse,
   pylint... Well, actually the development of this library is
diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
index 2069ce539f40..c61641a68da9 100644
--- a/dev-python/astropy-helpers/metadata.xml
+++ b/dev-python/astropy-helpers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
+	<maintainer>
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		astropy-helpers is a collection of build tools used by astropy
 		that may be used by other projects.
diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
index 5dab9c71475d..cd9089dfaba1 100644
--- a/dev-python/astropy/metadata.xml
+++ b/dev-python/astropy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   Astropy is a community-driven package intended to contain much of
   the core functionality and some common tools needed for performing
diff --git a/dev-python/async/metadata.xml b/dev-python/async/metadata.xml
index eb772b75db3d..2e04020c238f 100644
--- a/dev-python/async/metadata.xml
+++ b/dev-python/async/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">async</remote-id>
 	</upstream>
diff --git a/dev-python/asyncio/metadata.xml b/dev-python/asyncio/metadata.xml
index b5e4ea712dd3..0556453a3c4a 100644
--- a/dev-python/asyncio/metadata.xml
+++ b/dev-python/asyncio/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 reference implementation of PEP 3156
 </longdescription>
diff --git a/dev-python/atom/metadata.xml b/dev-python/atom/metadata.xml
index 3485f522ab47..0b73f0014198 100644
--- a/dev-python/atom/metadata.xml
+++ b/dev-python/atom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">atom</remote-id>
     <remote-id type="github">nucleic/atom</remote-id>
diff --git a/dev-python/atpy/metadata.xml b/dev-python/atpy/metadata.xml
index a370aeb05572..4abed88c723e 100644
--- a/dev-python/atpy/metadata.xml
+++ b/dev-python/atpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Astronomical Tables in Python (ATpy) is a high-level package
   providing a way to manipulate tables of astronomical data in a
diff --git a/dev-python/authres/metadata.xml b/dev-python/authres/metadata.xml
index a218f6da1581..d3b6216fabff 100644
--- a/dev-python/authres/metadata.xml
+++ b/dev-python/authres/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 	RFC 5451 Authentication-Results Headers generation and parsing for Python.
 	It also supports Authentication Results extensions:
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 2c79a022064c..242031003307 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">autobahn</remote-id>
   </upstream>
diff --git a/dev-python/autopep8/metadata.xml b/dev-python/autopep8/metadata.xml
index f93d290156ed..8846beb3969d 100644
--- a/dev-python/autopep8/metadata.xml
+++ b/dev-python/autopep8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>autopep8 formats Python code based on the output of the pep8 utility</longdescription>
   <upstream>
     <remote-id type="pypi">autopep8</remote-id>
diff --git a/dev-python/axiom/metadata.xml b/dev-python/axiom/metadata.xml
index ea8baf2e6dab..aea49d8bd637 100644
--- a/dev-python/axiom/metadata.xml
+++ b/dev-python/axiom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Axiom is an object database, or alternatively, an object-relational
 		mapper. Its primary goal is to provide an object-oriented layer with
 		what we consider to be the key aspects of OO, i.e. polymorphism and
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
index 9c1f37903127..57d419ae2ae6 100644
--- a/dev-python/babelfish/metadata.xml
+++ b/dev-python/babelfish/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>nikoli@gmx.us</email>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">babelfish</remote-id>
     <remote-id type="github">Diaoul/babelfish</remote-id>
diff --git a/dev-python/backports-abc/metadata.xml b/dev-python/backports-abc/metadata.xml
index 68b30fc749ba..4457b7f6a2d7 100644
--- a/dev-python/backports-abc/metadata.xml
+++ b/dev-python/backports-abc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cython/backports_abc</remote-id>
     <remote-id type="pypi">backports_abc</remote-id>
diff --git a/dev-python/backports-functools-lru-cache/metadata.xml b/dev-python/backports-functools-lru-cache/metadata.xml
index 1b0a4e9d2b59..6ce3c2e952ab 100644
--- a/dev-python/backports-functools-lru-cache/metadata.xml
+++ b/dev-python/backports-functools-lru-cache/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">backports.functools_lru_cache</remote-id>
 		<remote-id type="github">jaraco/backports.functools_lru_cache</remote-id>
diff --git a/dev-python/backports-lzma/metadata.xml b/dev-python/backports-lzma/metadata.xml
index 1780f771218c..e7943c450836 100644
--- a/dev-python/backports-lzma/metadata.xml
+++ b/dev-python/backports-lzma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">peterjc/backports.lzma</remote-id>
     <remote-id type="pypi">backports.lzma</remote-id>
diff --git a/dev-python/backports-shutil_get_terminal_size/metadata.xml b/dev-python/backports-shutil_get_terminal_size/metadata.xml
index b65d3ce79b33..32cde3d9e078 100644
--- a/dev-python/backports-shutil_get_terminal_size/metadata.xml
+++ b/dev-python/backports-shutil_get_terminal_size/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
 	<upstream>
 		<remote-id type="pypi">backports.shutil_get_terminal_size</remote-id>
 		<remote-id type="github">chrippa/backports.shutil_get_terminal_size</remote-id>
diff --git a/dev-python/backports-ssl-match-hostname/metadata.xml b/dev-python/backports-ssl-match-hostname/metadata.xml
index a814551856cd..f9d6f94559c2 100644
--- a/dev-python/backports-ssl-match-hostname/metadata.xml
+++ b/dev-python/backports-ssl-match-hostname/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">backports.ssl_match_hostname</remote-id>
 	</upstream>
diff --git a/dev-python/backports-unittest-mock/metadata.xml b/dev-python/backports-unittest-mock/metadata.xml
index 2a913a105d34..adfe9106b667 100644
--- a/dev-python/backports-unittest-mock/metadata.xml
+++ b/dev-python/backports-unittest-mock/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">backports.unittest_mock</remote-id>
 		<remote-id type="github">jaraco/backports.unittest_mock</remote-id>
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
index 88a161f343c8..8cc0f6042374 100644
--- a/dev-python/backports/metadata.xml
+++ b/dev-python/backports/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">brandon/backports</remote-id>
   </upstream>
diff --git a/dev-python/basemap/metadata.xml b/dev-python/basemap/metadata.xml
index 60bfb2ae700c..95dd976f4572 100644
--- a/dev-python/basemap/metadata.xml
+++ b/dev-python/basemap/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<longdescription>
   basemap is a matplotlib toolkit. It allows to plot data on map
   projections (with continental and political boundaries).
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
index 8e82ccfb2d1d..3ac50f128d58 100644
--- a/dev-python/bashate/metadata.xml
+++ b/dev-python/bashate/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	A pep8 equivalent for bash scripts
 	</longdescription>
diff --git a/dev-python/bcolz/metadata.xml b/dev-python/bcolz/metadata.xml
index 55412f5e0a7c..b61d4487d798 100644
--- a/dev-python/bcolz/metadata.xml
+++ b/dev-python/bcolz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">bcolz</remote-id>
     <remote-id type="github">Blosc/bcolz</remote-id>
diff --git a/dev-python/bcrypt/metadata.xml b/dev-python/bcrypt/metadata.xml
index 23cd94387990..b255660a7c70 100644
--- a/dev-python/bcrypt/metadata.xml
+++ b/dev-python/bcrypt/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">bcrypt</remote-id>
     <remote-id type="github">pyca/bcrypt</remote-id>
diff --git a/dev-python/beaker/metadata.xml b/dev-python/beaker/metadata.xml
index 5efee24b8f2e..38dcf1fb92e7 100644
--- a/dev-python/beaker/metadata.xml
+++ b/dev-python/beaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Beaker</remote-id>
     <remote-id type="github">bbangert/beaker</remote-id>
diff --git a/dev-python/beanstalkc/metadata.xml b/dev-python/beanstalkc/metadata.xml
index 5dc4ad459118..f7f15e836fb7 100644
--- a/dev-python/beanstalkc/metadata.xml
+++ b/dev-python/beanstalkc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">beanstalkc</remote-id>
     <remote-id type="github">earl/beanstalkc</remote-id>
diff --git a/dev-python/beautifulsoup/metadata.xml b/dev-python/beautifulsoup/metadata.xml
index 236732af0c82..7702fcf58496 100644
--- a/dev-python/beautifulsoup/metadata.xml
+++ b/dev-python/beautifulsoup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Beautiful Soup is a Python HTML/XML parser designed for quick
 		turnaround projects like screen-scraping. Two features make it
diff --git a/dev-python/bicyclerepair/metadata.xml b/dev-python/bicyclerepair/metadata.xml
index 1b45cb3d7cdc..a07682ccc891 100644
--- a/dev-python/bicyclerepair/metadata.xml
+++ b/dev-python/bicyclerepair/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bicyclerepair</remote-id>
 	</upstream>
diff --git a/dev-python/billiard/metadata.xml b/dev-python/billiard/metadata.xml
index f0333ed8cdaf..859af1c8234c 100644
--- a/dev-python/billiard/metadata.xml
+++ b/dev-python/billiard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">billiard</remote-id>
 		<remote-id type="github">celery/billiard</remote-id>
diff --git a/dev-python/biplist/metadata.xml b/dev-python/biplist/metadata.xml
index e1a3378cacbc..25ebf14de2c7 100644
--- a/dev-python/biplist/metadata.xml
+++ b/dev-python/biplist/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">biplist</remote-id>
     <remote-id type="github">wooster/biplist</remote-id>
diff --git a/dev-python/bitarray/metadata.xml b/dev-python/bitarray/metadata.xml
index 74dd28633c05..a7123550d059 100644
--- a/dev-python/bitarray/metadata.xml
+++ b/dev-python/bitarray/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 This module provides an object type which efficiently represents an array of 
 booleans. Bitarrays are sequence types and behave very much like usual lists. 
diff --git a/dev-python/bitstring/metadata.xml b/dev-python/bitstring/metadata.xml
index b748cd112f15..c9beea6e418d 100644
--- a/dev-python/bitstring/metadata.xml
+++ b/dev-python/bitstring/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>A pure Python module designed to help make
 	  the creation and analysis of binary data
 	  as simple and natural as possible</longdescription>
diff --git a/dev-python/bjoern/metadata.xml b/dev-python/bjoern/metadata.xml
index 887545589dec..84fb470d453e 100644
--- a/dev-python/bjoern/metadata.xml
+++ b/dev-python/bjoern/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">bjoern</remote-id>
     <remote-id type="github">jonashaag/bjoern</remote-id>
diff --git a/dev-python/blaze/metadata.xml b/dev-python/blaze/metadata.xml
index e2f6a14c9bde..fedce8632cd1 100644
--- a/dev-python/blaze/metadata.xml
+++ b/dev-python/blaze/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Blaze is the next-generation of NumPy. It is designed as a
   foundational set of abstractions on which to build out-of-core and
diff --git a/dev-python/bleach/metadata.xml b/dev-python/bleach/metadata.xml
index 0d1b788bc7f1..d11c635bc594 100644
--- a/dev-python/bleach/metadata.xml
+++ b/dev-python/bleach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">bleach</remote-id>
     <remote-id type="github">jsocol/bleach</remote-id>
diff --git a/dev-python/blessings/metadata.xml b/dev-python/blessings/metadata.xml
index b1571f76931f..b91dde5ee667 100644
--- a/dev-python/blessings/metadata.xml
+++ b/dev-python/blessings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">blessings</remote-id>
     <remote-id type="github">erikrose/blessings</remote-id>
diff --git a/dev-python/blinker/metadata.xml b/dev-python/blinker/metadata.xml
index 2bc8d359b50f..d1674c54f197 100644
--- a/dev-python/blinker/metadata.xml
+++ b/dev-python/blinker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">blinker</remote-id>
 	</upstream>
diff --git a/dev-python/blockcanvas/metadata.xml b/dev-python/blockcanvas/metadata.xml
index b369e5fc9be7..cd9cb29782ca 100644
--- a/dev-python/blockcanvas/metadata.xml
+++ b/dev-python/blockcanvas/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
     The Enthought Tool Suite BlockCanvas project provides a visual
     environment for creating simulation experiments, where function
diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
index 9f379bfde814..8605dfba1040 100644
--- a/dev-python/blosc/metadata.xml
+++ b/dev-python/blosc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   blosc is a high performance compressor optimized
   for binary data. It has been designed to transmit data to the
diff --git a/dev-python/blz/metadata.xml b/dev-python/blz/metadata.xml
index eaebb3b02d2a..d35b3fc1641b 100644
--- a/dev-python/blz/metadata.xml
+++ b/dev-python/blz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   BLZ is a chunked container for numerical data. Chunking allows for
   efficient enlarging/shrinking of data container. In addition, it can
diff --git a/dev-python/bokeh/metadata.xml b/dev-python/bokeh/metadata.xml
index e85a7b98e40c..36bf92fa86f4 100644
--- a/dev-python/bokeh/metadata.xml
+++ b/dev-python/bokeh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Bokeh is a Python interactive visualization library for large
   datasets that natively uses the latest web technologies. Its goal is
diff --git a/dev-python/boto/metadata.xml b/dev-python/boto/metadata.xml
index 2ecc58207366..ce007e42fd57 100644
--- a/dev-python/boto/metadata.xml
+++ b/dev-python/boto/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>vapier@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">boto</remote-id>
     <remote-id type="pypi">boto</remote-id>
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
index cb9d5a27565a..5c649c1e340d 100644
--- a/dev-python/bottle/metadata.xml
+++ b/dev-python/bottle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">bottle</remote-id>
   </upstream>
diff --git a/dev-python/bottleneck/metadata.xml b/dev-python/bottleneck/metadata.xml
index 2980dc20cf9a..b853124f0c94 100644
--- a/dev-python/bottleneck/metadata.xml
+++ b/dev-python/bottleneck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
   Bottleneck is a collection of fast NumPy array functions written in
   Cython.
diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
index cff36a4e6671..7f35c6adff78 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Syntax highlighting and autocompletion
 	  for the python interpreter
 	</longdescription>
diff --git a/dev-python/bsddb3/metadata.xml b/dev-python/bsddb3/metadata.xml
index 07d7984e12bb..042b8da7c206 100644
--- a/dev-python/bsddb3/metadata.xml
+++ b/dev-python/bsddb3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">bsddb3</remote-id>
 	</upstream>
diff --git a/dev-python/buildutils/metadata.xml b/dev-python/buildutils/metadata.xml
index cb9268c07fe6..99a03a839e7b 100644
--- a/dev-python/buildutils/metadata.xml
+++ b/dev-python/buildutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">buildutils</remote-id>
 	</upstream>
diff --git a/dev-python/buzhug/metadata.xml b/dev-python/buzhug/metadata.xml
index 826215347911..e18e7a44928a 100644
--- a/dev-python/buzhug/metadata.xml
+++ b/dev-python/buzhug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">buzhug</remote-id>
 	</upstream>
diff --git a/dev-python/bytecodeassembler/metadata.xml b/dev-python/bytecodeassembler/metadata.xml
index 940caaebe748..51b31df21c99 100644
--- a/dev-python/bytecodeassembler/metadata.xml
+++ b/dev-python/bytecodeassembler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">BytecodeAssembler</remote-id>
   </upstream>
diff --git a/dev-python/cairocffi/metadata.xml b/dev-python/cairocffi/metadata.xml
index 6fb1e3380358..e53bc46a0a6b 100644
--- a/dev-python/cairocffi/metadata.xml
+++ b/dev-python/cairocffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cairocffi</remote-id>
     <remote-id type="github">SimonSapin/cairocffi</remote-id>
diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
index a99f2d36aae1..920702393960 100644
--- a/dev-python/cangjie/metadata.xml
+++ b/dev-python/cangjie/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brendan@horan.hk</email>
     <name>Brendan Horan</name>
     <description>Proxy - Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Cangjians/pycangjie</remote-id>
   </upstream>
diff --git a/dev-python/capturer/metadata.xml b/dev-python/capturer/metadata.xml
index e0aaa2b00755..c6b3fc133ed2 100644
--- a/dev-python/capturer/metadata.xml
+++ b/dev-python/capturer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">coloredlogs</remote-id>
     <remote-id type="github">xolox/python-coloredlogs</remote-id>
diff --git a/dev-python/carbon/metadata.xml b/dev-python/carbon/metadata.xml
index 42a6c423cb5c..7a79b880e1a9 100644
--- a/dev-python/carbon/metadata.xml
+++ b/dev-python/carbon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">carbon</remote-id>
   </upstream>
diff --git a/dev-python/carrot/metadata.xml b/dev-python/carrot/metadata.xml
index 371b75d397db..525ba78e1b35 100644
--- a/dev-python/carrot/metadata.xml
+++ b/dev-python/carrot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">carrot</remote-id>
     <remote-id type="github">ask/carrot</remote-id>
diff --git a/dev-python/cassandra-driver/metadata.xml b/dev-python/cassandra-driver/metadata.xml
index 45c0df3d7c45..2c1b08fc3fa2 100644
--- a/dev-python/cassandra-driver/metadata.xml
+++ b/dev-python/cassandra-driver/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		A modern, feature-rich and highly-tunable Python
 		client library for Apache Cassandra (1.2+) and
diff --git a/dev-python/casuarius/metadata.xml b/dev-python/casuarius/metadata.xml
index 0b61e5f4edab..7e3314cd7695 100644
--- a/dev-python/casuarius/metadata.xml
+++ b/dev-python/casuarius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Casuarius is a Cython binding for Cassowary incremental constraint solver.
   The solver source code is derived from the 0.6 release of
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
index 8271309233bd..5ad5a4ecd405 100644
--- a/dev-python/catkin_pkg/metadata.xml
+++ b/dev-python/catkin_pkg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/catkin_pkg</remote-id>
 	</upstream>
diff --git a/dev-python/cddb-py/metadata.xml b/dev-python/cddb-py/metadata.xml
index bf360c3d5890..5533c2edec85 100644
--- a/dev-python/cddb-py/metadata.xml
+++ b/dev-python/cddb-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cddb-py</remote-id>
 	</upstream>
diff --git a/dev-python/celementtree/metadata.xml b/dev-python/celementtree/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/celementtree/metadata.xml
+++ b/dev-python/celementtree/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
index d04c5ae3ae4d..5bee99723afc 100644
--- a/dev-python/celery/metadata.xml
+++ b/dev-python/celery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">celery</remote-id>
 	</upstream>
diff --git a/dev-python/cement/metadata.xml b/dev-python/cement/metadata.xml
index e95d6e192d10..b31fd024bf32 100644
--- a/dev-python/cement/metadata.xml
+++ b/dev-python/cement/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cement is an advanced CLI Application Framework for Python. Its goal is to introduce a standard, and feature-full platform for both simple and complex command line applications as well as support rapid development needs without sacrificing quality.
 	</longdescription>
diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml
index f5b4e9736831..ed9000af016a 100644
--- a/dev-python/certifi/metadata.xml
+++ b/dev-python/certifi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">certifi</remote-id>
   </upstream>
diff --git a/dev-python/cffi/metadata.xml b/dev-python/cffi/metadata.xml
index 26eeef001935..1158f6524061 100644
--- a/dev-python/cffi/metadata.xml
+++ b/dev-python/cffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cffi</remote-id>
   </upstream>
diff --git a/dev-python/cfgparse/metadata.xml b/dev-python/cfgparse/metadata.xml
index 386fbf8a333d..a22ec9901517 100644
--- a/dev-python/cfgparse/metadata.xml
+++ b/dev-python/cfgparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cfgparse</remote-id>
 		<remote-id type="sourceforge">cfgparse</remote-id>
diff --git a/dev-python/cgkit/metadata.xml b/dev-python/cgkit/metadata.xml
index cb8aab5bd14b..716b6d6ca3e3 100644
--- a/dev-python/cgkit/metadata.xml
+++ b/dev-python/cgkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="3ds">Enable support for importing 3D Studio models</flag>
   </use>
diff --git a/dev-python/cgroup-utils/metadata.xml b/dev-python/cgroup-utils/metadata.xml
index 958d7badc980..e9ada1503a33 100644
--- a/dev-python/cgroup-utils/metadata.xml
+++ b/dev-python/cgroup-utils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">peo3/cgroup-utils</remote-id>
   </upstream>
diff --git a/dev-python/chaco/metadata.xml b/dev-python/chaco/metadata.xml
index a33331ab16d8..60f6c0f27a06 100644
--- a/dev-python/chaco/metadata.xml
+++ b/dev-python/chaco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <longdescription lang="en">
   Chaco is a Python plotting application toolkit and a part of
   Enthought Tool Suite. It is meant to facilitate writing plotting
diff --git a/dev-python/chameleon/metadata.xml b/dev-python/chameleon/metadata.xml
index 3469c1019df0..ae6a2dc8caff 100644
--- a/dev-python/chameleon/metadata.xml
+++ b/dev-python/chameleon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Chameleon</remote-id>
 	</upstream>
diff --git a/dev-python/characteristic/metadata.xml b/dev-python/characteristic/metadata.xml
index f4bec42be01c..b4c9a69e7344 100644
--- a/dev-python/characteristic/metadata.xml
+++ b/dev-python/characteristic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">characteristic</remote-id>
     <remote-id type="github">hynek/characteristic</remote-id>
diff --git a/dev-python/charade/metadata.xml b/dev-python/charade/metadata.xml
index eaa6dd554133..52976e90ef85 100644
--- a/dev-python/charade/metadata.xml
+++ b/dev-python/charade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">charade</remote-id>
     <remote-id type="github">sigmavirus24/charade</remote-id>
diff --git a/dev-python/chardet/metadata.xml b/dev-python/chardet/metadata.xml
index d5228ef57d2a..85afc9645d25 100644
--- a/dev-python/chardet/metadata.xml
+++ b/dev-python/chardet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">chardet</remote-id>
     <remote-id type="github">chardet/chardet</remote-id>
diff --git a/dev-python/cheetah-docs/metadata.xml b/dev-python/cheetah-docs/metadata.xml
index 6511520b2753..d553e0e50533 100644
--- a/dev-python/cheetah-docs/metadata.xml
+++ b/dev-python/cheetah-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cheetahtemplate</remote-id>
 	</upstream>
diff --git a/dev-python/cheetah/metadata.xml b/dev-python/cheetah/metadata.xml
index 311eecfcd216..4338bb838bfa 100644
--- a/dev-python/cheetah/metadata.xml
+++ b/dev-python/cheetah/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Cheetah is a Python-powered template engine and code generator. It can be used
 as a standalone utility or it can be combined with other tools. Web developers
 are its principle user group, but it has many potential uses and is also being
diff --git a/dev-python/cherrypy/metadata.xml b/dev-python/cherrypy/metadata.xml
index 937f5c4678b8..975511ab7e14 100644
--- a/dev-python/cherrypy/metadata.xml
+++ b/dev-python/cherrypy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">CherryPy</remote-id>
   </upstream>
diff --git a/dev-python/cherrytemplate/metadata.xml b/dev-python/cherrytemplate/metadata.xml
index 7d0495c6538c..7568b04a57e1 100644
--- a/dev-python/cherrytemplate/metadata.xml
+++ b/dev-python/cherrytemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cherrypy</remote-id>
 	</upstream>
diff --git a/dev-python/click/metadata.xml b/dev-python/click/metadata.xml
index 3f003a9288b3..c9d10ff82429 100644
--- a/dev-python/click/metadata.xml
+++ b/dev-python/click/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">click</remote-id>
 	</upstream>
diff --git a/dev-python/clientcookie/metadata.xml b/dev-python/clientcookie/metadata.xml
index f58b37da5161..882e7b86120b 100644
--- a/dev-python/clientcookie/metadata.xml
+++ b/dev-python/clientcookie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 ClientCookie is a Python module for handling HTTP cookies on the client
 side, useful for accessing web sites that require cookies to be set and
diff --git a/dev-python/cliff-tablib/metadata.xml b/dev-python/cliff-tablib/metadata.xml
index 0d6cfb59d5e2..d6c72318b3e7 100644
--- a/dev-python/cliff-tablib/metadata.xml
+++ b/dev-python/cliff-tablib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cliff-tablib</remote-id>
     <remote-id type="github">dreamhost/cliff-tablib</remote-id>
diff --git a/dev-python/cliff/metadata.xml b/dev-python/cliff/metadata.xml
index 6840e3251ae0..5ae284acb62e 100644
--- a/dev-python/cliff/metadata.xml
+++ b/dev-python/cliff/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Cliff is a framework for building command line programs.
 	It uses setuptools entry points to provide subcommands,
diff --git a/dev-python/cloudlib/metadata.xml b/dev-python/cloudlib/metadata.xml
index 4f932b065ce8..1ee9e59a1aba 100644
--- a/dev-python/cloudlib/metadata.xml
+++ b/dev-python/cloudlib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 Cloud middleware for in application use
 </longdescription>
diff --git a/dev-python/cmd2/metadata.xml b/dev-python/cmd2/metadata.xml
index ead6025e17bb..663a11ceae83 100644
--- a/dev-python/cmd2/metadata.xml
+++ b/dev-python/cmd2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Extra features for standard library's cmd module
   </longdescription>
diff --git a/dev-python/codetools/metadata.xml b/dev-python/codetools/metadata.xml
index 6f5804ff43a6..30b53c53ddef 100644
--- a/dev-python/codetools/metadata.xml
+++ b/dev-python/codetools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <longdescription lang="en">
   The CodeTools project from the Enthought Tool Suite 
   includes packages that simplify meta-programming
diff --git a/dev-python/colander/metadata.xml b/dev-python/colander/metadata.xml
index f96f0f02bb89..08e12718625e 100644
--- a/dev-python/colander/metadata.xml
+++ b/dev-python/colander/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">colander</remote-id>
 	</upstream>
diff --git a/dev-python/colorama/metadata.xml b/dev-python/colorama/metadata.xml
index 6d2cc60852ec..d3d7702a00d0 100644
--- a/dev-python/colorama/metadata.xml
+++ b/dev-python/colorama/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Makes ANSI escape character sequences, for producing colored terminal text
     and cursor positioning, works under MS Windows.
diff --git a/dev-python/coloredlogs/metadata.xml b/dev-python/coloredlogs/metadata.xml
index e0aaa2b00755..c6b3fc133ed2 100644
--- a/dev-python/coloredlogs/metadata.xml
+++ b/dev-python/coloredlogs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">coloredlogs</remote-id>
     <remote-id type="github">xolox/python-coloredlogs</remote-id>
diff --git a/dev-python/colorlog/metadata.xml b/dev-python/colorlog/metadata.xml
index 49df37f612e1..012fb37041f8 100644
--- a/dev-python/colorlog/metadata.xml
+++ b/dev-python/colorlog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">colorlog</remote-id>
     <remote-id type="github">borntyping/python-colorlog</remote-id>
diff --git a/dev-python/colout/metadata.xml b/dev-python/colout/metadata.xml
index 1a741a7899ac..fc2c704e134f 100644
--- a/dev-python/colout/metadata.xml
+++ b/dev-python/colout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Colout</remote-id>
 	</upstream>
diff --git a/dev-python/columnize/metadata.xml b/dev-python/columnize/metadata.xml
index 6514190e88b4..1d3d7758edcc 100644
--- a/dev-python/columnize/metadata.xml
+++ b/dev-python/columnize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pycolumnize</remote-id>
 		<remote-id type="pypi">columnize</remote-id>
diff --git a/dev-python/common/metadata.xml b/dev-python/common/metadata.xml
index 0738f77eb509..d8d2a36b72e4 100644
--- a/dev-python/common/metadata.xml
+++ b/dev-python/common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">common</remote-id>
   </upstream>
diff --git a/dev-python/compizconfig-python/metadata.xml b/dev-python/compizconfig-python/metadata.xml
index 82160b43633d..2a886423a08d 100644
--- a/dev-python/compizconfig-python/metadata.xml
+++ b/dev-python/compizconfig-python/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
 </pkgmetadata>
diff --git a/dev-python/configargparse/metadata.xml b/dev-python/configargparse/metadata.xml
index c18f7cb4f924..b6dcb257fe66 100644
--- a/dev-python/configargparse/metadata.xml
+++ b/dev-python/configargparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ConfigArgParse</remote-id>
     <remote-id type="github">zorro3/ConfigArgParse</remote-id>
diff --git a/dev-python/configclass/metadata.xml b/dev-python/configclass/metadata.xml
index fcac0317b9ec..13d6fd8df1b4 100644
--- a/dev-python/configclass/metadata.xml
+++ b/dev-python/configclass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">configclass</remote-id>
 		<remote-id type="github">schettino72/configclass</remote-id>
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
index a1a409155789..e54bdec89011 100644
--- a/dev-python/configobj/metadata.xml
+++ b/dev-python/configobj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   ConfigObj is a simple but powerful config file reader and writer: an
   ini file round tripper. Its main feature is that it is very easy to
diff --git a/dev-python/configparser/metadata.xml b/dev-python/configparser/metadata.xml
index e6628be595b3..72b7e3e2100a 100644
--- a/dev-python/configparser/metadata.xml
+++ b/dev-python/configparser/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">configparser</remote-id>
   </upstream>
diff --git a/dev-python/configshell/metadata.xml b/dev-python/configshell/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/dev-python/configshell/metadata.xml
+++ b/dev-python/configshell/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/contextlib2/metadata.xml b/dev-python/contextlib2/metadata.xml
index 54713949c687..e59b5eb67afc 100644
--- a/dev-python/contextlib2/metadata.xml
+++ b/dev-python/contextlib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">contextlib2</remote-id>
   </upstream>
diff --git a/dev-python/cookies/metadata.xml b/dev-python/cookies/metadata.xml
index 606717dc7bb3..67d57f48842d 100644
--- a/dev-python/cookies/metadata.xml
+++ b/dev-python/cookies/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cookies</remote-id>
 	</upstream>
diff --git a/dev-python/cosmolopy/metadata.xml b/dev-python/cosmolopy/metadata.xml
index c931c4e1666e..cedf4fe03889 100644
--- a/dev-python/cosmolopy/metadata.xml
+++ b/dev-python/cosmolopy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>sci-astronomy</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
 	<longdescription lang="en">CosmoloPy is a package of cosmology routines built on NumPy/SciPy.</longdescription>
 	<upstream>
 		<remote-id type="pypi">CosmoloPy</remote-id>
diff --git a/dev-python/couchdb-python/metadata.xml b/dev-python/couchdb-python/metadata.xml
index 805dbec4a0d1..47e47a549f84 100644
--- a/dev-python/couchdb-python/metadata.xml
+++ b/dev-python/couchdb-python/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">CouchDB</remote-id>
     <remote-id type="github">djc/couchdb-python</remote-id>
diff --git a/dev-python/coverage/metadata.xml b/dev-python/coverage/metadata.xml
index 55232d3d816e..e5f11ecef372 100644
--- a/dev-python/coverage/metadata.xml
+++ b/dev-python/coverage/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Coverage.py is a Python module that measures code coverage during Python
 execution. It uses the code analysis tools and tracing hooks provided in the
 Python standard library to determine which lines are executable, and which have
diff --git a/dev-python/crcmod/metadata.xml b/dev-python/crcmod/metadata.xml
index d96d3dad153e..bab469227e9d 100644
--- a/dev-python/crcmod/metadata.xml
+++ b/dev-python/crcmod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		The software in this package is a Python module for generating objects
 		that compute the Cyclic Redundancy Check (CRC). It includes a (optional)
diff --git a/dev-python/crumbs/metadata.xml b/dev-python/crumbs/metadata.xml
index 3ec159379e27..2e2da98355b5 100644
--- a/dev-python/crumbs/metadata.xml
+++ b/dev-python/crumbs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/cryptography-vectors/metadata.xml b/dev-python/cryptography-vectors/metadata.xml
index f7fa3df91c02..f2fe170f91dc 100644
--- a/dev-python/cryptography-vectors/metadata.xml
+++ b/dev-python/cryptography-vectors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cryptography-vectors</remote-id>
   </upstream>
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index f215972e68f9..6be14c275fdb 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cryptography</remote-id>
     <remote-id type="github">pyca/cryptography</remote-id>
diff --git a/dev-python/cssselect/metadata.xml b/dev-python/cssselect/metadata.xml
index cd343cc5838f..9e0897672ca8 100644
--- a/dev-python/cssselect/metadata.xml
+++ b/dev-python/cssselect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cssselect</remote-id>
   </upstream>
diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
index 596676e6bf4e..b2bc2ef5de50 100644
--- a/dev-python/cssutils/metadata.xml
+++ b/dev-python/cssutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 A Python package to parse and build CSS Cascading Style Sheets.
 </longdescription>
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
index d704e40edecb..400c409fe1fb 100644
--- a/dev-python/ctypesgen/metadata.xml
+++ b/dev-python/ctypesgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
 	</upstream>
diff --git a/dev-python/curtsies/metadata.xml b/dev-python/curtsies/metadata.xml
index a6b436d1c12e..f8f08f690cd8 100644
--- a/dev-python/curtsies/metadata.xml
+++ b/dev-python/curtsies/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">curtsies</remote-id>
     <remote-id type="github">thomasballinger/curtsies</remote-id>
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 9202e558f39b..4e38a3ef3025 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   CVXOPT is a software for convex optimization based on
   the Python programming language. Its main purpose is to make the
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
index 277c7f1ba6a8..58858d1dfd99 100644
--- a/dev-python/cx_Freeze/metadata.xml
+++ b/dev-python/cx_Freeze/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cx-freeze</remote-id>
 	</upstream>
diff --git a/dev-python/cycler/metadata.xml b/dev-python/cycler/metadata.xml
index ea87fd33286f..b8f8db1413ec 100644
--- a/dev-python/cycler/metadata.xml
+++ b/dev-python/cycler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">matplotlib/cycler</remote-id>
 		<remote-id type="pypi">Cycler</remote-id>
diff --git a/dev-python/cython/metadata.xml b/dev-python/cython/metadata.xml
index 41e10f103ab2..696866f328ce 100644
--- a/dev-python/cython/metadata.xml
+++ b/dev-python/cython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Cython is a language that makes writing C extensions for the Python
     language as easy as Python itself. It's based on Pyrex, but supports
diff --git a/dev-python/cytoolz/metadata.xml b/dev-python/cytoolz/metadata.xml
index 99e0558beda5..0d19def51e38 100644
--- a/dev-python/cytoolz/metadata.xml
+++ b/dev-python/cytoolz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cytoolz</remote-id>
 	</upstream>
diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml
index 1dfc8bb6cd9c..f0970783019f 100644
--- a/dev-python/d2to1/metadata.xml
+++ b/dev-python/d2to1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>d2to1 (the 'd' is for 'distutils') allows using distutils2-like
 		setup.cfg files for a package's metadata with a distribute/setuptools
 		setup.py script. It works by providing a distutils2-formatted setup.cfg
diff --git a/dev-python/dap/metadata.xml b/dev-python/dap/metadata.xml
index eb4573dd0945..65ea5ae1439c 100644
--- a/dev-python/dap/metadata.xml
+++ b/dev-python/dap/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="server">Enable OpenDAP server support</flag>
 	</use>
diff --git a/dev-python/datashape/metadata.xml b/dev-python/datashape/metadata.xml
index 8731be10d26c..04953729b4dd 100644
--- a/dev-python/datashape/metadata.xml
+++ b/dev-python/datashape/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   DataShape is a language for describing data. It is an extension of
   the NumPy dtype with an emphasis on cross language support.
diff --git a/dev-python/dbus-python/metadata.xml b/dev-python/dbus-python/metadata.xml
index 1f701e5bb782..965856a1542f 100644
--- a/dev-python/dbus-python/metadata.xml
+++ b/dev-python/dbus-python/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index 691aa8f1b38a..00377e099636 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <maintainer>
 <email>robbat2@gentoo.org</email>
 <name>Robin H. Johnson</name>
 </maintainer>
+<maintainer>
+<email>python@gentoo.org</email>
+<name>Python</name>
+</maintainer>
 <longdescription lang="en">
 DBUtils is a suite of tools providing solid, persistent and pooled connections
 to a database that can be used in all kinds of multi-threaded environments
diff --git a/dev-python/ddt/metadata.xml b/dev-python/ddt/metadata.xml
index a3ec71bb61c3..e4b4b6fae4ef 100644
--- a/dev-python/ddt/metadata.xml
+++ b/dev-python/ddt/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 Data-Driven/Decorated Tests - long_description='A library to multiply test cases
 </longdescription>
diff --git a/dev-python/decorator/metadata.xml b/dev-python/decorator/metadata.xml
index 548c052254b9..a7ffe8a744fd 100644
--- a/dev-python/decorator/metadata.xml
+++ b/dev-python/decorator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">The aim of the decorator python module is to simplify the usage of
     decorators for  the average programmer and to popularize
     decorators usage giving examples of useful decorators, such as
diff --git a/dev-python/decoratortools/metadata.xml b/dev-python/decoratortools/metadata.xml
index 56f3768c3602..e7ecc3abae83 100644
--- a/dev-python/decoratortools/metadata.xml
+++ b/dev-python/decoratortools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Use class and function decorators - even in Python 2.3 - now with source debugging for generated code.</longdescription>
 	<upstream>
 		<remote-id type="pypi">DecoratorTools</remote-id>
diff --git a/dev-python/deform/metadata.xml b/dev-python/deform/metadata.xml
index 7751d9e184f7..e0b6271f9962 100644
--- a/dev-python/deform/metadata.xml
+++ b/dev-python/deform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">deform</remote-id>
     <remote-id type="github">Pylons/deform</remote-id>
diff --git a/dev-python/defusedxml/metadata.xml b/dev-python/defusedxml/metadata.xml
index 1928bfb0b228..c5ac1f16ec40 100644
--- a/dev-python/defusedxml/metadata.xml
+++ b/dev-python/defusedxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">defusedxml</remote-id>
     <remote-id type="bitbucket">tiran/defusedxml</remote-id>
diff --git a/dev-python/demjson/metadata.xml b/dev-python/demjson/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/demjson/metadata.xml
+++ b/dev-python/demjson/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/dicttoxml/metadata.xml b/dev-python/dicttoxml/metadata.xml
index c026e9d62231..544e0c3abee3 100644
--- a/dev-python/dicttoxml/metadata.xml
+++ b/dev-python/dicttoxml/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">dicttoxml</remote-id>
     <remote-id type="github">quandyfactory/dicttoxml</remote-id>
diff --git a/dev-python/diff-match-patch/metadata.xml b/dev-python/diff-match-patch/metadata.xml
index e01e20080e11..3b2c0bc5acfa 100644
--- a/dev-python/diff-match-patch/metadata.xml
+++ b/dev-python/diff-match-patch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">The Diff Match and Patch libraries offer robust algorithms to perform
 		the operations required for synchronizing plain text.
 		Diff: Compare two blocks of plain text and efficiently return a list of
diff --git a/dev-python/dingus/metadata.xml b/dev-python/dingus/metadata.xml
index c8785f62bc77..a927cf694080 100644
--- a/dev-python/dingus/metadata.xml
+++ b/dev-python/dingus/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">dingus</remote-id>
   </upstream>
diff --git a/dev-python/discogs-client/metadata.xml b/dev-python/discogs-client/metadata.xml
index b3d1da6cc08a..174c1abc8418 100644
--- a/dev-python/discogs-client/metadata.xml
+++ b/dev-python/discogs-client/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>int.teo@gmail.com</email>
     <name>Theofilos Intzoglou</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">discogs-client</remote-id>
     <remote-id type="github">discogs/discogs_client</remote-id>
diff --git a/dev-python/disqus-python/metadata.xml b/dev-python/disqus-python/metadata.xml
index 8f105141f123..22f1d43a3be2 100644
--- a/dev-python/disqus-python/metadata.xml
+++ b/dev-python/disqus-python/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>ercpe@gentoo.org</email>
     <name>Johann Schmitz</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">disqus/disqus-python</remote-id>
     <remote-id type="pypi">disqus-python</remote-id>
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
index 4c3ad315180c..4995c614cd0c 100644
--- a/dev-python/distlib/metadata.xml
+++ b/dev-python/distlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">distlib</remote-id>
 		<remote-id type="github">vsajip/distlib</remote-id>
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 6847904eb2eb..325caa36725b 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kennethreitz/dj-database-url</remote-id>
     <remote-id type="pypi">dj-database-url</remote-id>
diff --git a/dev-python/django-annoying/metadata.xml b/dev-python/django-annoying/metadata.xml
index 51ac3214141b..df5b8e8742ed 100644
--- a/dev-python/django-annoying/metadata.xml
+++ b/dev-python/django-annoying/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-annoying</remote-id>
     <remote-id type="bitbucket">offline/django-annoying</remote-id>
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
index a1cc6e29c4f7..f4b701425aa4 100644
--- a/dev-python/django-appconf/metadata.xml
+++ b/dev-python/django-appconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jezdez/django-appconf</remote-id>
     <remote-id type="pypi">django-appconf</remote-id>
diff --git a/dev-python/django-auth-ldap/metadata.xml b/dev-python/django-auth-ldap/metadata.xml
index 29b8b314b8c2..b3c17e9e36b2 100644
--- a/dev-python/django-auth-ldap/metadata.xml
+++ b/dev-python/django-auth-ldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-auth-ldap</remote-id>
     <remote-id type="bitbucket">psagers/django-auth-ldap</remote-id>
diff --git a/dev-python/django-baker/metadata.xml b/dev-python/django-baker/metadata.xml
index fe14e4270432..19e565338f9b 100644
--- a/dev-python/django-baker/metadata.xml
+++ b/dev-python/django-baker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-baker</remote-id>
     <remote-id type="github">krisfields/django-baker</remote-id>
diff --git a/dev-python/django-celery/metadata.xml b/dev-python/django-celery/metadata.xml
index 865a357b8386..8942c3ad148f 100644
--- a/dev-python/django-celery/metadata.xml
+++ b/dev-python/django-celery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-celery</remote-id>
 		<remote-id type="github">github/django-celery</remote-id>
diff --git a/dev-python/django-compressor/metadata.xml b/dev-python/django-compressor/metadata.xml
index 88fe76a763a2..017e3d87b855 100644
--- a/dev-python/django-compressor/metadata.xml
+++ b/dev-python/django-compressor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jezdez/django_compressor</remote-id>
   </upstream>
diff --git a/dev-python/django-crispy-forms/metadata.xml b/dev-python/django-crispy-forms/metadata.xml
index 5df2fb998d4b..d27ae5f42ab4 100644
--- a/dev-python/django-crispy-forms/metadata.xml
+++ b/dev-python/django-crispy-forms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-crispy-forms</remote-id>
     <remote-id type="github">maraujop/django-crispy-forms</remote-id>
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
index 0c1990a0f2ed..5adb1ec41d5a 100644
--- a/dev-python/django-debug-toolbar/metadata.xml
+++ b/dev-python/django-debug-toolbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">django-debug-toolbar/django-debug-toolbar</remote-id>
   </upstream>
diff --git a/dev-python/django-discover-runner/metadata.xml b/dev-python/django-discover-runner/metadata.xml
index 7c1cce3d2a32..3618415b451a 100644
--- a/dev-python/django-discover-runner/metadata.xml
+++ b/dev-python/django-discover-runner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-discover-runner</remote-id>
     <remote-id type="github">jezdez/django-discover-runner</remote-id>
diff --git a/dev-python/django-endless-pagination/metadata.xml b/dev-python/django-endless-pagination/metadata.xml
index 33d45f7a1539..77f836862b01 100644
--- a/dev-python/django-endless-pagination/metadata.xml
+++ b/dev-python/django-endless-pagination/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">frankban/django-endless-pagination</remote-id>
   </upstream>
diff --git a/dev-python/django-evolution/metadata.xml b/dev-python/django-evolution/metadata.xml
index 51b6135cf7f0..a13d2e02b5b9 100644
--- a/dev-python/django-evolution/metadata.xml
+++ b/dev-python/django-evolution/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django_evolution</remote-id>
   </upstream>
diff --git a/dev-python/django-formtools/metadata.xml b/dev-python/django-formtools/metadata.xml
index 0dc68cddd99f..82da6a9ed111 100644
--- a/dev-python/django-formtools/metadata.xml
+++ b/dev-python/django-formtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-formtools</remote-id>
   </upstream>
diff --git a/dev-python/django-grappelli/metadata.xml b/dev-python/django-grappelli/metadata.xml
index 4f5971d736e5..10f9163ebbfa 100644
--- a/dev-python/django-grappelli/metadata.xml
+++ b/dev-python/django-grappelli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-grappelli</remote-id>
 		<remote-id type="github">sehmaschine/django-grappelli</remote-id>
diff --git a/dev-python/django-haystack/metadata.xml b/dev-python/django-haystack/metadata.xml
index 6e9dd6c3d803..e16b35633ebf 100644
--- a/dev-python/django-haystack/metadata.xml
+++ b/dev-python/django-haystack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-haystack</remote-id>
   </upstream>
diff --git a/dev-python/django-international/metadata.xml b/dev-python/django-international/metadata.xml
index d83293204507..91bee40dc708 100644
--- a/dev-python/django-international/metadata.xml
+++ b/dev-python/django-international/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-international</remote-id>
     <remote-id type="bitbucket">monwara/django-international</remote-id>
diff --git a/dev-python/django-ldap-groups/metadata.xml b/dev-python/django-ldap-groups/metadata.xml
index 9e1c7be1d1fe..6607b4751e45 100644
--- a/dev-python/django-ldap-groups/metadata.xml
+++ b/dev-python/django-ldap-groups/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/django-ldapdb/metadata.xml b/dev-python/django-ldapdb/metadata.xml
index 185c5834bff8..9e5e7c2e4ab8 100644
--- a/dev-python/django-ldapdb/metadata.xml
+++ b/dev-python/django-ldapdb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-ldapdb</remote-id>
     <remote-id type="github">jlaine/django-ldapdb</remote-id>
diff --git a/dev-python/django-nose/metadata.xml b/dev-python/django-nose/metadata.xml
index c3eb3f767705..7a2bfc021911 100644
--- a/dev-python/django-nose/metadata.xml
+++ b/dev-python/django-nose/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-nose</remote-id>
     <remote-id type="github">jbalogh/django-nose</remote-id>
diff --git a/dev-python/django-oauth-plus/metadata.xml b/dev-python/django-oauth-plus/metadata.xml
index 81c84aa20e28..2504b02c6d49 100644
--- a/dev-python/django-oauth-plus/metadata.xml
+++ b/dev-python/django-oauth-plus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-oauth-plus</remote-id>
 	</upstream>
diff --git a/dev-python/django-openid-auth/metadata.xml b/dev-python/django-openid-auth/metadata.xml
index e314c7897b44..7fcada2502a4 100644
--- a/dev-python/django-openid-auth/metadata.xml
+++ b/dev-python/django-openid-auth/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ryanmcgrath/twython</remote-id>
 		<remote-id type="launchpad">django-openid-auth</remote-id>
diff --git a/dev-python/django-openstack-auth/metadata.xml b/dev-python/django-openstack-auth/metadata.xml
index 8147c037263e..f4faf39a2bb6 100644
--- a/dev-python/django-openstack-auth/metadata.xml
+++ b/dev-python/django-openstack-auth/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     A Django authentication backend for use with the OpenStack Keystone Identity backend.
   </longdescription>
diff --git a/dev-python/django-picklefield/metadata.xml b/dev-python/django-picklefield/metadata.xml
index 2443d3ac9a4f..fe783775b3be 100644
--- a/dev-python/django-picklefield/metadata.xml
+++ b/dev-python/django-picklefield/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-picklefield</remote-id>
     <remote-id type="github">shrubberysoft/django-picklefield</remote-id>
diff --git a/dev-python/django-pipeline/metadata.xml b/dev-python/django-pipeline/metadata.xml
index 14c10d6cf43f..84c89d719476 100644
--- a/dev-python/django-pipeline/metadata.xml
+++ b/dev-python/django-pipeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cyberdelia/django-pipeline</remote-id>
   </upstream>
diff --git a/dev-python/django-piston/metadata.xml b/dev-python/django-piston/metadata.xml
index dedfa7e1286a..5b3c83443984 100644
--- a/dev-python/django-piston/metadata.xml
+++ b/dev-python/django-piston/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-piston</remote-id>
     <remote-id type="bitbucket">jespern/django-piston</remote-id>
diff --git a/dev-python/django-recaptcha/metadata.xml b/dev-python/django-recaptcha/metadata.xml
index ea4eb75ba888..13a2cb67a892 100644
--- a/dev-python/django-recaptcha/metadata.xml
+++ b/dev-python/django-recaptcha/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-recaptcha</remote-id>
 		<remote-id type="github">preakelt/django-recaptcha</remote-id>
diff --git a/dev-python/django-registration/metadata.xml b/dev-python/django-registration/metadata.xml
index 68d74dc9d82b..47d0e8e6d24e 100644
--- a/dev-python/django-registration/metadata.xml
+++ b/dev-python/django-registration/metadata.xml
@@ -5,7 +5,10 @@
 		<email>jmbsvicetto@gentoo.org</email>
 		<name>Jorge Manuel B. S. Vicetto</name>
 	</maintainer>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-registration</remote-id>
 	</upstream>
diff --git a/dev-python/django-select2/metadata.xml b/dev-python/django-select2/metadata.xml
index 8cbb6c54a2bb..34e1313a43b1 100644
--- a/dev-python/django-select2/metadata.xml
+++ b/dev-python/django-select2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     This is a Django integration of Select2
 	The app includes Select2 driven Django Widgets and Form Fields.
diff --git a/dev-python/django-setuptest/metadata.xml b/dev-python/django-setuptest/metadata.xml
index 30e4fd3b2b6a..1221de0b9e34 100644
--- a/dev-python/django-setuptest/metadata.xml
+++ b/dev-python/django-setuptest/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">praekelt/django-setuptest</remote-id>
   </upstream>
diff --git a/dev-python/django-social-auth/metadata.xml b/dev-python/django-social-auth/metadata.xml
index 73807df74887..9c6579aad4a9 100644
--- a/dev-python/django-social-auth/metadata.xml
+++ b/dev-python/django-social-auth/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">omab/django-social-auth</remote-id>
   </upstream>
diff --git a/dev-python/django-tables2/metadata.xml b/dev-python/django-tables2/metadata.xml
index 9ae06c088628..d62b72a7a2bb 100644
--- a/dev-python/django-tables2/metadata.xml
+++ b/dev-python/django-tables2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-tables2</remote-id>
     <remote-id type="github">bradleyayers/django-tables2</remote-id>
diff --git a/dev-python/django-tagging/metadata.xml b/dev-python/django-tagging/metadata.xml
index ac081f94dc08..faf29bc317d7 100644
--- a/dev-python/django-tagging/metadata.xml
+++ b/dev-python/django-tagging/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-tagging</remote-id>
   </upstream>
diff --git a/dev-python/django-tastypie/metadata.xml b/dev-python/django-tastypie/metadata.xml
index 1d47d2cae77c..82b4edfd80f1 100644
--- a/dev-python/django-tastypie/metadata.xml
+++ b/dev-python/django-tastypie/metadata.xml
@@ -5,7 +5,10 @@
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="bip">An optional serialiser dev-python/biplist</flag>
     <flag name="digest">Library to aid in implementing HTTP Digest Authentication</flag>
diff --git a/dev-python/django-tinymce/metadata.xml b/dev-python/django-tinymce/metadata.xml
index 0432fe23ffbc..e1549a3c9821 100644
--- a/dev-python/django-tinymce/metadata.xml
+++ b/dev-python/django-tinymce/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">aljosa/django-tinymce</remote-id>
   </upstream>
diff --git a/dev-python/django-xslt/metadata.xml b/dev-python/django-xslt/metadata.xml
index 7367468525ec..28b1cb25690c 100644
--- a/dev-python/django-xslt/metadata.xml
+++ b/dev-python/django-xslt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">django-xslt</remote-id>
   </upstream>
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index 04a135c41dd6..ac547e8c720c 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Django</remote-id>
   </upstream>
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
index 1342021856b7..6bc24160f509 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 dnspython is a DNS toolkit for Python. It supports almost all of the record
 types. It can be used for queries, zone transfers, and dynamic updates. It
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index c86b904c6120..b37b67a84340 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
 	  <remote-id type="github">docker/docker-py</remote-id>
   </upstream>
diff --git a/dev-python/docopt/metadata.xml b/dev-python/docopt/metadata.xml
index 802710221075..b86f0cf9eba1 100644
--- a/dev-python/docopt/metadata.xml
+++ b/dev-python/docopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">docopt</remote-id>
     <remote-id type="github">docopt/docopt</remote-id>
diff --git a/dev-python/doctest-ignore-unicode/metadata.xml b/dev-python/doctest-ignore-unicode/metadata.xml
index fa0f6de04213..2e1c1b298eb9 100644
--- a/dev-python/doctest-ignore-unicode/metadata.xml
+++ b/dev-python/doctest-ignore-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/docutils-glep/metadata.xml b/dev-python/docutils-glep/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/docutils-glep/metadata.xml
+++ b/dev-python/docutils-glep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/docutils/metadata.xml b/dev-python/docutils/metadata.xml
index b75fdfa0d43f..b83a8f1f8c92 100644
--- a/dev-python/docutils/metadata.xml
+++ b/dev-python/docutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="glep">Install support for GLEPs</flag>
 	</use>
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
index 108d29fd0ac5..66af0d19773b 100644
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     A caching API built around the concept of a "dogpile lock", which allows
 	continued access to an expiring data value while
diff --git a/dev-python/dogpile-core/metadata.xml b/dev-python/dogpile-core/metadata.xml
index 79fa0556ac62..3fa14b91d956 100644
--- a/dev-python/dogpile-core/metadata.xml
+++ b/dev-python/dogpile-core/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     A "dogpile" lock, one which allows a single thread to generate an
 	expensive resource while other threads use the "old" value,
diff --git a/dev-python/doit-py/metadata.xml b/dev-python/doit-py/metadata.xml
index d1a0e484be61..30034c539238 100644
--- a/dev-python/doit-py/metadata.xml
+++ b/dev-python/doit-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">doit-py</remote-id>
 	</upstream>
diff --git a/dev-python/doit/metadata.xml b/dev-python/doit/metadata.xml
index ace625de2c44..7ee39d98496c 100644
--- a/dev-python/doit/metadata.xml
+++ b/dev-python/doit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">doit</remote-id>
     <remote-id type="sourceforge">python-doit</remote-id>
diff --git a/dev-python/dpkt/metadata.xml b/dev-python/dpkt/metadata.xml
index 9cde35f5398e..0194298f3404 100644
--- a/dev-python/dpkt/metadata.xml
+++ b/dev-python/dpkt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">dpkt</remote-id>
 		<remote-id type="github">kbandla/dpkt</remote-id>
diff --git a/dev-python/dreampie/metadata.xml b/dev-python/dreampie/metadata.xml
index 6328bc55808d..b5e0e4c31ed1 100644
--- a/dev-python/dreampie/metadata.xml
+++ b/dev-python/dreampie/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   pygtk-based python shell with autocompletion
 </longdescription>
diff --git a/dev-python/drpython/metadata.xml b/dev-python/drpython/metadata.xml
index f0809cae54aa..1cf2f75d20f7 100644
--- a/dev-python/drpython/metadata.xml
+++ b/dev-python/drpython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 DrPython is a highly customizable, simple, and clean  
 editing environment for developing Python  programs. It 
diff --git a/dev-python/dugong/metadata.xml b/dev-python/dugong/metadata.xml
index 31e4106d1133..f882ca6c5215 100644
--- a/dev-python/dugong/metadata.xml
+++ b/dev-python/dugong/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">dugong</remote-id>
     <remote-id type="bitbucket">nikratio/python-dugong</remote-id>
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
index ebfc99cf10b8..2d09476b9b10 100644
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grobian@gentoo.org</email>
     <name>Fabian Groffen</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">dulwich</remote-id>
     <remote-id type="github">jelmer/dulwich</remote-id>
diff --git a/dev-python/dynd-python/metadata.xml b/dev-python/dynd-python/metadata.xml
index 3de4fa343928..dbb3fcb7fb99 100644
--- a/dev-python/dynd-python/metadata.xml
+++ b/dev-python/dynd-python/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   DyND-Python, a component of the Blaze project, is the Python
   exposure of the DyND dynamic multi-dimensional array library.
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index 1a173811bf0d..9e52d1fefa77 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -14,6 +13,10 @@
     <email>maksverver@geocities.com</email>
     <name>Maks Verver</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ecdsa</remote-id>
     <remote-id type="github">warner/python-ecdsa</remote-id>
diff --git a/dev-python/editobj/metadata.xml b/dev-python/editobj/metadata.xml
index a0703461b6b8..80bf68e05865 100644
--- a/dev-python/editobj/metadata.xml
+++ b/dev-python/editobj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 EditObj can create a dialog box to edit ANY Python object. It also
 includes a Tk tree widget, an event and a multiple undo-redo
diff --git a/dev-python/egenix-mx-base/metadata.xml b/dev-python/egenix-mx-base/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/egenix-mx-base/metadata.xml
+++ b/dev-python/egenix-mx-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/egg-python/metadata.xml b/dev-python/egg-python/metadata.xml
index d9234ae60f5f..c8b4a32c1800 100644
--- a/dev-python/egg-python/metadata.xml
+++ b/dev-python/egg-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/metadata.xml b/dev-python/elasticsearch-curator/metadata.xml
index ffe20745f0fd..df7491e61d07 100644
--- a/dev-python/elasticsearch-curator/metadata.xml
+++ b/dev-python/elasticsearch-curator/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
@@ -10,6 +9,10 @@
     <name>Tomas Mozes</name>
     <description>Proxy maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">elasticsearch/curator</remote-id>
   </upstream>
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index 83ea614f4e72..a062c2b700ac 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
@@ -10,6 +9,10 @@
     <name>Tomas Mozes</name>
     <description>Proxy maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">elasticsearch/elasticsearch-py</remote-id>
   </upstream>
diff --git a/dev-python/elementtree/metadata.xml b/dev-python/elementtree/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/elementtree/metadata.xml
+++ b/dev-python/elementtree/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/elib-intl/metadata.xml b/dev-python/elib-intl/metadata.xml
index aac09801897c..3f6b865c8d2c 100644
--- a/dev-python/elib-intl/metadata.xml
+++ b/dev-python/elib-intl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>nixphoeni@gentoo.org</email>
 		<name>Joe Sapp</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		The elib.intl module provides enhanced internationalization
 		(I18N) services for your Python modules and applications.
diff --git a/dev-python/embedly/metadata.xml b/dev-python/embedly/metadata.xml
index c097ac690861..51f28ea12034 100644
--- a/dev-python/embedly/metadata.xml
+++ b/dev-python/embedly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Embedly</remote-id>
     <remote-id type="github">embedly/embedly-python</remote-id>
diff --git a/dev-python/empy/metadata.xml b/dev-python/empy/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/empy/metadata.xml
+++ b/dev-python/empy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
index aee10049a76c..31871a55c1ab 100644
--- a/dev-python/enable/metadata.xml
+++ b/dev-python/enable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Enable project from the Enthought Tool Suite provides two
     related multi-platform packages for drawing GUI objects:
diff --git a/dev-python/enaml/metadata.xml b/dev-python/enaml/metadata.xml
index f19f96398f51..2719630caa4e 100644
--- a/dev-python/enaml/metadata.xml
+++ b/dev-python/enaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Enaml is a framework for writing declarative user interfaces in
   Python. It provides a Yaml-ish/Pythonic syntax language for
diff --git a/dev-python/encore/metadata.xml b/dev-python/encore/metadata.xml
index c1fb9cafc0f3..84d1a59c24ec 100644
--- a/dev-python/encore/metadata.xml
+++ b/dev-python/encore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   This package consists of a collection of core utility packages
   useful for building Python applications. This package is intended to
diff --git a/dev-python/enum34/metadata.xml b/dev-python/enum34/metadata.xml
index ffc7ca79d5dd..f565724097de 100644
--- a/dev-python/enum34/metadata.xml
+++ b/dev-python/enum34/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/dev-python/envisage/metadata.xml b/dev-python/envisage/metadata.xml
index 9344c917f996..053db647a97d 100644
--- a/dev-python/envisage/metadata.xml
+++ b/dev-python/envisage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <longdescription lang="en">
   Envisage is a Python-based framework for building extensible
   applications, that is, applications whose functionality can be
diff --git a/dev-python/envoy/metadata.xml b/dev-python/envoy/metadata.xml
index 5b4829404b83..b2bb0af30cf2 100644
--- a/dev-python/envoy/metadata.xml
+++ b/dev-python/envoy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">envoy</remote-id>
     <remote-id type="github">kennethreitz/envoy</remote-id>
diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index b092f5067430..20d94211815b 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">enzyme</remote-id>
     <remote-id type="github">Diaoul/enzyme</remote-id>
diff --git a/dev-python/epsilon/metadata.xml b/dev-python/epsilon/metadata.xml
index 326df3b55935..3d2d2f84cac7 100644
--- a/dev-python/epsilon/metadata.xml
+++ b/dev-python/epsilon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">A small utility package that depends on tools too recent for Twisted
 		(like datetime in python2.4) but performs generic enough functions
 		that it can be used in projects that don't want to share Divmod's
diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml
index b30848a4457e..c5b04ff3508e 100644
--- a/dev-python/epydoc/metadata.xml
+++ b/dev-python/epydoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
   Epydoc is a python documentation system without output similar to javadoc. 
   Epydoc uses python doc-strings, importing modules, and introsepction in 
diff --git a/dev-python/errorhandler/metadata.xml b/dev-python/errorhandler/metadata.xml
index 917f28e01575..625f33778cc5 100644
--- a/dev-python/errorhandler/metadata.xml
+++ b/dev-python/errorhandler/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">errorhandler</remote-id>
   </upstream>
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
index 34d236c8cc53..4b6e20c5124c 100644
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et_xmlfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id>
     <remote-id type="pypi">et_xmlfile</remote-id>
diff --git a/dev-python/ets/metadata.xml b/dev-python/ets/metadata.xml
index 842e52c76104..3acd1d00cba6 100644
--- a/dev-python/ets/metadata.xml
+++ b/dev-python/ets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <longdescription lang="en">
   The Enthought Tool Suite (ETS) is a collection of Python components
   developed by Enthought and its partners to construct custom scientific
diff --git a/dev-python/etsdevtools/metadata.xml b/dev-python/etsdevtools/metadata.xml
index c89897249522..619b54a0899e 100644
--- a/dev-python/etsdevtools/metadata.xml
+++ b/dev-python/etsdevtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The ETSDevTools project from the Enthought Tool Suite includes a
     set of packages that can be used during the development of a
diff --git a/dev-python/etsproxy/metadata.xml b/dev-python/etsproxy/metadata.xml
index aead56b67231..b9f3a420c5ea 100644
--- a/dev-python/etsproxy/metadata.xml
+++ b/dev-python/etsproxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription lang="en">
   This is the ETS proxy package, it contains the proxy modules for all
   ETS projects which map the old enthought namespace imports to the
diff --git a/dev-python/eunuchs/metadata.xml b/dev-python/eunuchs/metadata.xml
index 1bf73a685396..a7df6f8b1bfc 100644
--- a/dev-python/eunuchs/metadata.xml
+++ b/dev-python/eunuchs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Eunuchs is a library of Python extensions that complement the
 		standard libraries in parts where full support for the UNIX API (or
diff --git a/dev-python/eventlet/metadata.xml b/dev-python/eventlet/metadata.xml
index fba4a2799889..34e2da730a39 100644
--- a/dev-python/eventlet/metadata.xml
+++ b/dev-python/eventlet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">eventlet</remote-id>
     <remote-id type="github">eventlet/eventlet</remote-id>
diff --git a/dev-python/execnet/metadata.xml b/dev-python/execnet/metadata.xml
index e0ad54d79cae..d3b6033a06ab 100644
--- a/dev-python/execnet/metadata.xml
+++ b/dev-python/execnet/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Interact with Python interpreters
 	  across version, platform and network barriers.</longdescription>
 	<upstream>
diff --git a/dev-python/extras/metadata.xml b/dev-python/extras/metadata.xml
index 2a25cb3f7f8f..8781f725050e 100644
--- a/dev-python/extras/metadata.xml
+++ b/dev-python/extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">extras</remote-id>
     <remote-id type="github">testing-cabal/extras</remote-id>
diff --git a/dev-python/extremes/metadata.xml b/dev-python/extremes/metadata.xml
index dbb8c8452512..81d63620926d 100644
--- a/dev-python/extremes/metadata.xml
+++ b/dev-python/extremes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Extremes</remote-id>
   </upstream>
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index 414a5eeccf59..c2e8f65d74b5 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
index d64f1992692e..76106fe47813 100644
--- a/dev-python/fabric/metadata.xml
+++ b/dev-python/fabric/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Fabric</remote-id>
 	</upstream>
diff --git a/dev-python/feedgenerator/metadata.xml b/dev-python/feedgenerator/metadata.xml
index 802d27dc6b5f..73cc9b17c615 100644
--- a/dev-python/feedgenerator/metadata.xml
+++ b/dev-python/feedgenerator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">feedgenerator</remote-id>
 	</upstream>
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index 398ed3c2f0eb..3e6255eb60a9 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
   <upstream>
     <remote-id type="google-code">feedparser</remote-id>
diff --git a/dev-python/fexpect/metadata.xml b/dev-python/fexpect/metadata.xml
index a9191e424c82..d383d5f85f65 100644
--- a/dev-python/fexpect/metadata.xml
+++ b/dev-python/fexpect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ilogue/fexpect</remote-id>
   </upstream>
diff --git a/dev-python/figleaf/metadata.xml b/dev-python/figleaf/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/figleaf/metadata.xml
+++ b/dev-python/figleaf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/fixtures/metadata.xml b/dev-python/fixtures/metadata.xml
index af43239d85e1..14737444d2dd 100644
--- a/dev-python/fixtures/metadata.xml
+++ b/dev-python/fixtures/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Fixtures defines a Python contract for reusable state / support logic,
 	primarily for unit testing. Helper and adaption logic is included to make
diff --git a/dev-python/flake8/metadata.xml b/dev-python/flake8/metadata.xml
index 6a0b5bd93656..98f1bd2dcc3b 100644
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">flake8</remote-id>
     <remote-id type="bitbucket">tarek/flake8</remote-id>
diff --git a/dev-python/flaky/metadata.xml b/dev-python/flaky/metadata.xml
index c324c42caf68..459f0824e2bd 100644
--- a/dev-python/flaky/metadata.xml
+++ b/dev-python/flaky/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">box/flaky</remote-id>
     <remote-id type="pypi">flaky</remote-id>
diff --git a/dev-python/flask-admin/metadata.xml b/dev-python/flask-admin/metadata.xml
index 1c2961df65f9..f483c4c671f9 100644
--- a/dev-python/flask-admin/metadata.xml
+++ b/dev-python/flask-admin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-Admin</remote-id>
   </upstream>
diff --git a/dev-python/flask-babel/metadata.xml b/dev-python/flask-babel/metadata.xml
index 4b2d2a83f5bc..7999c441d1b6 100644
--- a/dev-python/flask-babel/metadata.xml
+++ b/dev-python/flask-babel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Babel</remote-id>
 	</upstream>
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
index 57ead9527074..95add8d7cd57 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
@@ -10,6 +9,10 @@
     <name>W. Trevor King</name>
     <description>proxy maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-Cors</remote-id>
     <remote-id type="github">wcdolphin/flask-cors</remote-id>
diff --git a/dev-python/flask-dashed/metadata.xml b/dev-python/flask-dashed/metadata.xml
index bdd76fd9f02e..1a34cf19bf76 100644
--- a/dev-python/flask-dashed/metadata.xml
+++ b/dev-python/flask-dashed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-Dashed</remote-id>
   </upstream>
diff --git a/dev-python/flask-evolution/metadata.xml b/dev-python/flask-evolution/metadata.xml
index 5042ee1f20e4..2c60acf72488 100644
--- a/dev-python/flask-evolution/metadata.xml
+++ b/dev-python/flask-evolution/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-Evolution</remote-id>
   </upstream>
diff --git a/dev-python/flask-login/metadata.xml b/dev-python/flask-login/metadata.xml
index f5a779b38f13..db6a19c1b8c0 100644
--- a/dev-python/flask-login/metadata.xml
+++ b/dev-python/flask-login/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Login</remote-id>
 	</upstream>
diff --git a/dev-python/flask-mail/metadata.xml b/dev-python/flask-mail/metadata.xml
index 62864dbf7095..c4d4045aa3bd 100644
--- a/dev-python/flask-mail/metadata.xml
+++ b/dev-python/flask-mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Mail</remote-id>
 	</upstream>
diff --git a/dev-python/flask-migrate/metadata.xml b/dev-python/flask-migrate/metadata.xml
index d996c47be0a9..03a75f44abed 100644
--- a/dev-python/flask-migrate/metadata.xml
+++ b/dev-python/flask-migrate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Migrate</remote-id>
 	</upstream>
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
index 866f98192a34..666c6a7b3e9c 100644
--- a/dev-python/flask-mongoengine/metadata.xml
+++ b/dev-python/flask-mongoengine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">flask-mongoengine</remote-id>
   </upstream>
diff --git a/dev-python/flask-openid/metadata.xml b/dev-python/flask-openid/metadata.xml
index 1aeddf3772f4..c0174d3136c7 100644
--- a/dev-python/flask-openid/metadata.xml
+++ b/dev-python/flask-openid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-OpenID</remote-id>
 	</upstream>
diff --git a/dev-python/flask-peewee/metadata.xml b/dev-python/flask-peewee/metadata.xml
index 5703928ba3ac..73076aab30a5 100644
--- a/dev-python/flask-peewee/metadata.xml
+++ b/dev-python/flask-peewee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">flask-peewee</remote-id>
   </upstream>
diff --git a/dev-python/flask-principal/metadata.xml b/dev-python/flask-principal/metadata.xml
index ed62904727cf..47a974c0a1b0 100644
--- a/dev-python/flask-principal/metadata.xml
+++ b/dev-python/flask-principal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Principal</remote-id>
 	</upstream>
diff --git a/dev-python/flask-pymongo/metadata.xml b/dev-python/flask-pymongo/metadata.xml
index 024aa03937da..ee8c83a6593c 100644
--- a/dev-python/flask-pymongo/metadata.xml
+++ b/dev-python/flask-pymongo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>ultrabug@gentoo.org</email>
     <name>Alexys Jacob</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-PyMongo</remote-id>
     <remote-id type="github">dcrosta/flask-pymongo</remote-id>
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
index 48555571de7b..d3ba1c215411 100644
--- a/dev-python/flask-restful/metadata.xml
+++ b/dev-python/flask-restful/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">twilio/flask-restful</remote-id>
 	</upstream>
diff --git a/dev-python/flask-restless/metadata.xml b/dev-python/flask-restless/metadata.xml
index ec77a3779bc4..ac6155e525bd 100644
--- a/dev-python/flask-restless/metadata.xml
+++ b/dev-python/flask-restless/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jfinkels/flask-restless</remote-id>
   </upstream>
diff --git a/dev-python/flask-script/metadata.xml b/dev-python/flask-script/metadata.xml
index b84dae7ac329..c9c2b77b667b 100644
--- a/dev-python/flask-script/metadata.xml
+++ b/dev-python/flask-script/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Script</remote-id>
 	</upstream>
diff --git a/dev-python/flask-security/metadata.xml b/dev-python/flask-security/metadata.xml
index ca747f04c2e4..d387b5e5b6c4 100644
--- a/dev-python/flask-security/metadata.xml
+++ b/dev-python/flask-security/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Security</remote-id>
 	</upstream>
diff --git a/dev-python/flask-socketio/metadata.xml b/dev-python/flask-socketio/metadata.xml
index 809844fdb92c..4eb63abb6abb 100644
--- a/dev-python/flask-socketio/metadata.xml
+++ b/dev-python/flask-socketio/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">Flask-SocketIO</remote-id>
 		<remote-id type="github">miguelgrinberg/Flask-SocketIO</remote-id>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
index 10b93c9a3329..4d1bc2bdd4de 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
 	</upstream>
diff --git a/dev-python/flask-testing/metadata.xml b/dev-python/flask-testing/metadata.xml
index 9efb699b494e..5480a1aac852 100644
--- a/dev-python/flask-testing/metadata.xml
+++ b/dev-python/flask-testing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Testing</remote-id>
 	</upstream>
diff --git a/dev-python/flask-themes/metadata.xml b/dev-python/flask-themes/metadata.xml
index 3823ab5220d7..631f5c59051b 100644
--- a/dev-python/flask-themes/metadata.xml
+++ b/dev-python/flask-themes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Themes</remote-id>
 	</upstream>
diff --git a/dev-python/flask-uploads/metadata.xml b/dev-python/flask-uploads/metadata.xml
index bae55d55e1df..9137a7f3d109 100644
--- a/dev-python/flask-uploads/metadata.xml
+++ b/dev-python/flask-uploads/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Uploads</remote-id>
 	</upstream>
diff --git a/dev-python/flask-whooshalchemy/metadata.xml b/dev-python/flask-whooshalchemy/metadata.xml
index 193b0a1a6498..3e706c1be0d3 100644
--- a/dev-python/flask-whooshalchemy/metadata.xml
+++ b/dev-python/flask-whooshalchemy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Flask-WhooshAlchemy</remote-id>
     <remote-id type="github">gyllstromk/Flask-WhooshAlchemy</remote-id>
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
index 8ff11cb91124..075a89680edd 100644
--- a/dev-python/flask-wtf/metadata.xml
+++ b/dev-python/flask-wtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>python</herd>
+    <maintainer>
+        <email>python@gentoo.org</email>
+        <name>Python</name>
+    </maintainer>
     <upstream>
         <remote-id type="pypi">Flask-WTF</remote-id>
     </upstream>
diff --git a/dev-python/flask-xml-rpc/metadata.xml b/dev-python/flask-xml-rpc/metadata.xml
index e0e8cc3a894d..9df543c3b8df 100644
--- a/dev-python/flask-xml-rpc/metadata.xml
+++ b/dev-python/flask-xml-rpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-XML-RPC</remote-id>
 	</upstream>
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index aa4957396a26..2c1f4d2d99b3 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask</remote-id>
 		<remote-id type="github">mitsuhiko/flask</remote-id>
diff --git a/dev-python/flexx/metadata.xml b/dev-python/flexx/metadata.xml
index bf3e69f2329a..21d8dab244a8 100644
--- a/dev-python/flexx/metadata.xml
+++ b/dev-python/flexx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">flexx</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/flup/metadata.xml b/dev-python/flup/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/flup/metadata.xml
+++ b/dev-python/flup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 36fc172f9f88..0b2fa2ba8931 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fonttools</remote-id>
 		<remote-id type="github">behdad/fonttools</remote-id>
diff --git a/dev-python/foolscap/metadata.xml b/dev-python/foolscap/metadata.xml
index da2e6eb88089..1dd7f248889b 100644
--- a/dev-python/foolscap/metadata.xml
+++ b/dev-python/foolscap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 This is a ground-up rewrite of Perspective Broker, which itself is Twisted's
 native RPC/RMI protocol (Remote Procedure Call / Remote Method Invocation).
diff --git a/dev-python/formencode/metadata.xml b/dev-python/formencode/metadata.xml
index c05d7f72e27f..b61325264602 100644
--- a/dev-python/formencode/metadata.xml
+++ b/dev-python/formencode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">FormEncode</remote-id>
 	</upstream>
diff --git a/dev-python/fpconst/metadata.xml b/dev-python/fpconst/metadata.xml
index d32a30d6c410..18f7cf26a0f1 100644
--- a/dev-python/fpconst/metadata.xml
+++ b/dev-python/fpconst/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rsoap</remote-id>
 	</upstream>
diff --git a/dev-python/freezegun/metadata.xml b/dev-python/freezegun/metadata.xml
index f42b5d09f39e..f45c71eb7d7e 100644
--- a/dev-python/freezegun/metadata.xml
+++ b/dev-python/freezegun/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">freezegun</remote-id>
 		<remote-id type="github">spulec/freezegun</remote-id>
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/frozen-flask/metadata.xml
index f0f9f1aa3906..f622f3d36d04 100644
--- a/dev-python/frozen-flask/metadata.xml
+++ b/dev-python/frozen-flask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Frozen-Flask</remote-id>
     <remote-id type="github">SimonSapin/Frozen-Flask</remote-id>
diff --git a/dev-python/fudge/metadata.xml b/dev-python/fudge/metadata.xml
index c3c08bae4d1b..5bb65f586acd 100644
--- a/dev-python/fudge/metadata.xml
+++ b/dev-python/fudge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">fudge</remote-id>
 	</upstream>
diff --git a/dev-python/funcparserlib/metadata.xml b/dev-python/funcparserlib/metadata.xml
index a8d1bb227dff..275e87424a07 100644
--- a/dev-python/funcparserlib/metadata.xml
+++ b/dev-python/funcparserlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">funcparserlib</remote-id>
 	</upstream>
diff --git a/dev-python/funcsigs/metadata.xml b/dev-python/funcsigs/metadata.xml
index 93e76515ca3f..8c62d906777e 100644
--- a/dev-python/funcsigs/metadata.xml
+++ b/dev-python/funcsigs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">funcsigs</remote-id>
   </upstream>
diff --git a/dev-python/functest/metadata.xml b/dev-python/functest/metadata.xml
index 071babc1aa06..5e2a857ee1a3 100644
--- a/dev-python/functest/metadata.xml
+++ b/dev-python/functest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">functest</remote-id>
 	</upstream>
diff --git a/dev-python/functools32/metadata.xml b/dev-python/functools32/metadata.xml
index 19ce0c1ed660..13df1cfe7d02 100644
--- a/dev-python/functools32/metadata.xml
+++ b/dev-python/functools32/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">functools32</remote-id>
 		<remote-id type="github">MiCHiLU/python-functools32</remote-id>
diff --git a/dev-python/fusil/metadata.xml b/dev-python/fusil/metadata.xml
index c9788744da70..061d0be71d3a 100644
--- a/dev-python/fusil/metadata.xml
+++ b/dev-python/fusil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">fusil</remote-id>
     <remote-id type="bitbucket">haypo/fusil</remote-id>
diff --git a/dev-python/futures/metadata.xml b/dev-python/futures/metadata.xml
index ed9c72e53753..e0f18a8f22cb 100644
--- a/dev-python/futures/metadata.xml
+++ b/dev-python/futures/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">futures</remote-id>
 	</upstream>
diff --git a/dev-python/gconf-python/metadata.xml b/dev-python/gconf-python/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/gconf-python/metadata.xml
+++ b/dev-python/gconf-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gcs-oauth2-boto-plugin/metadata.xml b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
index 3ccdc0e87b22..fbb9fbce27f7 100644
--- a/dev-python/gcs-oauth2-boto-plugin/metadata.xml
+++ b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">gcs-oauth2-boto-plugin</remote-id>
   </upstream>
diff --git a/dev-python/gdata/metadata.xml b/dev-python/gdata/metadata.xml
index e0962e2b130c..15c0c652b8b1 100644
--- a/dev-python/gdata/metadata.xml
+++ b/dev-python/gdata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">gdata-python-client</remote-id>
 	</upstream>
diff --git a/dev-python/gdmodule/metadata.xml b/dev-python/gdmodule/metadata.xml
index 0651bcd4e842..53fbf9a0f4b0 100644
--- a/dev-python/gdmodule/metadata.xml
+++ b/dev-python/gdmodule/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This module is a python wrapper for the GD library.
 </longdescription>
diff --git a/dev-python/genshi/metadata.xml b/dev-python/genshi/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/genshi/metadata.xml
+++ b/dev-python/genshi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/genty/metadata.xml b/dev-python/genty/metadata.xml
index a5d383b288ab..ca36186e3eb4 100644
--- a/dev-python/genty/metadata.xml
+++ b/dev-python/genty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
 	<upstream>
 		<remote-id type="github">box/genty</remote-id>
 		<remote-id type="pypi">genty</remote-id>
diff --git a/dev-python/geoip-python/metadata.xml b/dev-python/geoip-python/metadata.xml
index 8f105d0a09d6..6b4ac37615a6 100644
--- a/dev-python/geoip-python/metadata.xml
+++ b/dev-python/geoip-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">maxmind/geoip-api-python</remote-id>
   </upstream>
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
index 54c8bb9d352d..b9684242ea21 100644
--- a/dev-python/geopy/metadata.xml
+++ b/dev-python/geopy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">geopy</remote-id>
     <remote-id type="pypi">geopy</remote-id>
diff --git a/dev-python/gevent-socketio/metadata.xml b/dev-python/gevent-socketio/metadata.xml
index 3faf5402a93d..ab426bcec707 100644
--- a/dev-python/gevent-socketio/metadata.xml
+++ b/dev-python/gevent-socketio/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>ultrabug@gentoo.org</email>
     <name>Ultrabug</name>
@@ -13,6 +11,14 @@
     <name>Lujeni</name>
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>SocketIO server based on the Gevent pywsgi server</longdescription>
   <upstream>
     <remote-id type="pypi">gevent-socketio</remote-id>
diff --git a/dev-python/gevent-websocket/metadata.xml b/dev-python/gevent-websocket/metadata.xml
index 6f1ce8d98ff4..97b9b1ff3b20 100644
--- a/dev-python/gevent-websocket/metadata.xml
+++ b/dev-python/gevent-websocket/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>ultrabug@gentoo.org</email>
   <name>Ultrabug</name>
@@ -13,6 +11,14 @@
   <name>Lujeni</name>
   <description>Proxy Maintainer. CC on bugs</description>
 </maintainer>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
   Websocket handler for the gevent pywsgi server
 </longdescription>
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index e77efaa64ace..366842669cfa 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">surfly/gevent</remote-id>
     <remote-id type="pypi">gevent</remote-id>
diff --git a/dev-python/git-python/metadata.xml b/dev-python/git-python/metadata.xml
index aee86e536893..099298f4b832 100644
--- a/dev-python/git-python/metadata.xml
+++ b/dev-python/git-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">GitPython</remote-id>
 	</upstream>
diff --git a/dev-python/gitdb/metadata.xml b/dev-python/gitdb/metadata.xml
index 9aaab6399701..10f6314ee5d5 100644
--- a/dev-python/gitdb/metadata.xml
+++ b/dev-python/gitdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">gitdb</remote-id>
     <remote-id type="github">gitpython-developers/gitdb</remote-id>
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index 827d5f6c5bea..1e8cc3fdeac4 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	A simple connector pool for python-ldap.
 	</longdescription>
diff --git a/dev-python/globre/metadata.xml b/dev-python/globre/metadata.xml
index 1e098f28896c..e4aec73ee171 100644
--- a/dev-python/globre/metadata.xml
+++ b/dev-python/globre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">globre</remote-id>
 		<remote-id type="github">metagriffin/globre</remote-id>
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index 946960966eee..3ccddb609e27 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   gmpy2 is a C-coded Python extension module that supports
   multiple-precision arithmetic. gmpy2 supports the GMP multi-precision
diff --git a/dev-python/gnome-keyring-python/metadata.xml b/dev-python/gnome-keyring-python/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-python/gnome-keyring-python/metadata.xml
+++ b/dev-python/gnome-keyring-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gnome-python-base/metadata.xml b/dev-python/gnome-python-base/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/gnome-python-base/metadata.xml
+++ b/dev-python/gnome-python-base/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gnome-python-desktop-base/metadata.xml b/dev-python/gnome-python-desktop-base/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-python/gnome-python-desktop-base/metadata.xml
+++ b/dev-python/gnome-python-desktop-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gnome-python-extras-base/metadata.xml b/dev-python/gnome-python-extras-base/metadata.xml
index 9b1bc26a9df2..a94d3d6563dd 100644
--- a/dev-python/gnome-python-extras-base/metadata.xml
+++ b/dev-python/gnome-python-extras-base/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gnome-vfs-python/metadata.xml b/dev-python/gnome-vfs-python/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/gnome-vfs-python/metadata.xml
+++ b/dev-python/gnome-vfs-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/gnuplot-py/metadata.xml b/dev-python/gnuplot-py/metadata.xml
index e9e18ed8005a..b34c39ff8eba 100644
--- a/dev-python/gnuplot-py/metadata.xml
+++ b/dev-python/gnuplot-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
   Gnuplot.py is a Python module that interfaces to gnuplot, the popular
   plotting program. It allows you to use gnuplot from within Python to
diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
index 3916d6290c35..9c15397d3b3d 100644
--- a/dev-python/google-apitools/metadata.xml
+++ b/dev-python/google-apitools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">google/apitools</remote-id>
   </upstream>
diff --git a/dev-python/google-apputils/metadata.xml b/dev-python/google-apputils/metadata.xml
index f6092835c804..639c8745fe32 100644
--- a/dev-python/google-apputils/metadata.xml
+++ b/dev-python/google-apputils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">google/google-apputils</remote-id>
     <remote-id type="pypi">google-apputils</remote-id>
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/graphcanvas/metadata.xml b/dev-python/graphcanvas/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/graphcanvas/metadata.xml
+++ b/dev-python/graphcanvas/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/graphy/metadata.xml b/dev-python/graphy/metadata.xml
index d0b46a26e2cd..1314cc8dee62 100644
--- a/dev-python/graphy/metadata.xml
+++ b/dev-python/graphy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">graphy</remote-id>
   </upstream>
diff --git a/dev-python/greenlet/metadata.xml b/dev-python/greenlet/metadata.xml
index d2eecb33f08b..0b3d919961f6 100644
--- a/dev-python/greenlet/metadata.xml
+++ b/dev-python/greenlet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">greenlet</remote-id>
   </upstream>
diff --git a/dev-python/gst-python/metadata.xml b/dev-python/gst-python/metadata.xml
index dec0396a21e7..beda1250457b 100644
--- a/dev-python/gst-python/metadata.xml
+++ b/dev-python/gst-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gstreamer</herd>
+  <maintainer>
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/gtkspell-python/metadata.xml b/dev-python/gtkspell-python/metadata.xml
index 9b1bc26a9df2..a94d3d6563dd 100644
--- a/dev-python/gtkspell-python/metadata.xml
+++ b/dev-python/gtkspell-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/guessit/metadata.xml b/dev-python/guessit/metadata.xml
index 68d666121423..3f2e2fd0712b 100644
--- a/dev-python/guessit/metadata.xml
+++ b/dev-python/guessit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">guessit</remote-id>
     <remote-id type="github">wackou/guessit</remote-id>
diff --git a/dev-python/guppy/metadata.xml b/dev-python/guppy/metadata.xml
index 7645f74a1189..0558765b9004 100644
--- a/dev-python/guppy/metadata.xml
+++ b/dev-python/guppy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Guppy-PE is a programming environment providing object and heap memory
 		sizing, profiling and analysis. It includes a prototypical
 		specification language that can be used to formally specify aspects of
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index 7309a3a9f6b0..1dd5bd2605e6 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   HDF5 for Python (h5py) is a general-purpose simple Python interface to the
   Hierarchical Data Format library, version 5. Existing Python and
diff --git a/dev-python/hachoir-core/metadata.xml b/dev-python/hachoir-core/metadata.xml
index 12b9db27479c..613bfa22fec6 100644
--- a/dev-python/hachoir-core/metadata.xml
+++ b/dev-python/hachoir-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">A tool written for hackers to cut file or any binary stream. A file is
 		splitted in a tree of fields where the smallest field can be just a bit.
 		There are various field types: integer, string, bits, padding, sub file,
diff --git a/dev-python/hachoir-parser/metadata.xml b/dev-python/hachoir-parser/metadata.xml
index 7233bee923b8..9f9d98fd559d 100644
--- a/dev-python/hachoir-parser/metadata.xml
+++ b/dev-python/hachoir-parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">a package of most common file format parsers written using hachoir-core.
 		Not all parsers are complete, some are very good and other are poor
 		(they only parse the first level of the tree for example).</longdescription>
diff --git a/dev-python/hachoir-regex/metadata.xml b/dev-python/hachoir-regex/metadata.xml
index a00819c5f2f0..357631acbca3 100644
--- a/dev-python/hachoir-regex/metadata.xml
+++ b/dev-python/hachoir-regex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">regex manipulation Python library. It's used by hachoir-subfile for fast
 		pattern matching (find file header).</longdescription>
 	<upstream>
diff --git a/dev-python/hacking/metadata.xml b/dev-python/hacking/metadata.xml
index 0c0c6ea21b6a..8aaa4bf8f0db 100644
--- a/dev-python/hacking/metadata.xml
+++ b/dev-python/hacking/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     hacking is a set of flake8 plugins that test and enforce
 	the OpenStack Style Commandments, HACKING.rst
diff --git a/dev-python/happydoc/metadata.xml b/dev-python/happydoc/metadata.xml
index cf257c2d740d..a05750a23b6b 100644
--- a/dev-python/happydoc/metadata.xml
+++ b/dev-python/happydoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">happydoc</remote-id>
 	</upstream>
diff --git a/dev-python/hcluster/metadata.xml b/dev-python/hcluster/metadata.xml
index 00af651902b7..633ac3a8bec6 100644
--- a/dev-python/hcluster/metadata.xml
+++ b/dev-python/hcluster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">This library provides Python functions for agglomerative
   clustering. Its features include
   * generating hierarchical clusters from distance matrices
diff --git a/dev-python/hcs-utils/metadata.xml b/dev-python/hcs-utils/metadata.xml
index 0030c59d4204..4c2c5fc85fc7 100644
--- a/dev-python/hcs-utils/metadata.xml
+++ b/dev-python/hcs-utils/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>fabiano.francesconi@gmail.com</email>
 		<name>Fabiano Francesconi</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
-	<herd>python</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">hcs_utils</remote-id>
 	</upstream>
diff --git a/dev-python/hgdistver/metadata.xml b/dev-python/hgdistver/metadata.xml
index 1c8d93ddaf6a..dd78e134350a 100644
--- a/dev-python/hgdistver/metadata.xml
+++ b/dev-python/hgdistver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cffi</remote-id>
     <remote-id type="bitbucket">RonnyPfannschmidt/hgdistver</remote-id>
diff --git a/dev-python/hglib/metadata.xml b/dev-python/hglib/metadata.xml
index 22215d7493b9..563cc3348394 100644
--- a/dev-python/hglib/metadata.xml
+++ b/dev-python/hglib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arne_bab@web.de</email>
 		<name>Arne Babenhauserheide</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-hglib</remote-id>
 	</upstream>
diff --git a/dev-python/hgtools/metadata.xml b/dev-python/hgtools/metadata.xml
index af2c31f7fb35..c648d7fd12ce 100644
--- a/dev-python/hgtools/metadata.xml
+++ b/dev-python/hgtools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Classes and setuptools plugin for Mercurial repositories
 	</longdescription>
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 3702b96a3b38..16582a9a5a05 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>swegener@gentoo.org</email>
     <name>Sven Wegener</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">hiredis</remote-id>
     <remote-id type="github">pietern/hiredis-py</remote-id>
diff --git a/dev-python/hp3parclient/metadata.xml b/dev-python/hp3parclient/metadata.xml
index 4680d992b392..8e25c8aa2aea 100644
--- a/dev-python/hp3parclient/metadata.xml
+++ b/dev-python/hp3parclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">hp3parclient</remote-id>
   </upstream>
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
index 09fad04531fd..993be7abbcf6 100644
--- a/dev-python/html2text/metadata.xml
+++ b/dev-python/html2text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Alir3z4/html2text</remote-id>
   </upstream>
diff --git a/dev-python/html5lib/metadata.xml b/dev-python/html5lib/metadata.xml
index ab82d54bc79f..506c0d62570d 100644
--- a/dev-python/html5lib/metadata.xml
+++ b/dev-python/html5lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   html5lib is a pure-python library for parsing HTML. It is designed
   to conform to the WHATWG HTML specification, as is implemented by
diff --git a/dev-python/htmlgen/metadata.xml b/dev-python/htmlgen/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/htmlgen/metadata.xml
+++ b/dev-python/htmlgen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
index e89fb65d5770..10644b0aea77 100644
--- a/dev-python/httmock/metadata.xml
+++ b/dev-python/httmock/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">patrys/httmock</remote-id>
 	</upstream>
diff --git a/dev-python/http-parser/metadata.xml b/dev-python/http-parser/metadata.xml
index 7907c6d5b768..a36bd29664dc 100644
--- a/dev-python/http-parser/metadata.xml
+++ b/dev-python/http-parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">http-parser</remote-id>
     <remote-id type="github">benoitc/http-parser</remote-id>
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index c20641bb2f00..c092e157383a 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">httpbin</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index 0403f5d0dc8d..4bc054ef61d4 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">httplib2</remote-id>
     <remote-id type="pypi">httplib2</remote-id>
diff --git a/dev-python/httpretty/metadata.xml b/dev-python/httpretty/metadata.xml
index 9685d5af5113..e86e433e841b 100644
--- a/dev-python/httpretty/metadata.xml
+++ b/dev-python/httpretty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">httpretty</remote-id>
     <remote-id type="github">gabrielfalcao/httpretty</remote-id>
diff --git a/dev-python/httreplay/metadata.xml b/dev-python/httreplay/metadata.xml
index c1d3f6d580ad..02a5347b1c5a 100644
--- a/dev-python/httreplay/metadata.xml
+++ b/dev-python/httreplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">httreplay</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/humanfriendly/metadata.xml b/dev-python/humanfriendly/metadata.xml
index 6363c6f00d73..c2f18fc0ab58 100644
--- a/dev-python/humanfriendly/metadata.xml
+++ b/dev-python/humanfriendly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">humanfriendly</remote-id>
   </upstream>
diff --git a/dev-python/hypothesis/metadata.xml b/dev-python/hypothesis/metadata.xml
index 2e34ede407d7..1a99e8ba88e3 100644
--- a/dev-python/hypothesis/metadata.xml
+++ b/dev-python/hypothesis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">hypothesis</remote-id>
 		<remote-id type="github">DRMacIver/hypothesis</remote-id>
diff --git a/dev-python/icalendar/metadata.xml b/dev-python/icalendar/metadata.xml
index 4cc5905947ad..67aa3fbab02e 100644
--- a/dev-python/icalendar/metadata.xml
+++ b/dev-python/icalendar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="doc">Generate examples and other extra documentation</flag>
   </use>
diff --git a/dev-python/iconvcodec/metadata.xml b/dev-python/iconvcodec/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/iconvcodec/metadata.xml
+++ b/dev-python/iconvcodec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/id3-py/metadata.xml b/dev-python/id3-py/metadata.xml
index 50a933a80332..0abd567da904 100644
--- a/dev-python/id3-py/metadata.xml
+++ b/dev-python/id3-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">id3-py</remote-id>
 	</upstream>
diff --git a/dev-python/idna/metadata.xml b/dev-python/idna/metadata.xml
index ed0d06963b19..32f89ecdf0c8 100644
--- a/dev-python/idna/metadata.xml
+++ b/dev-python/idna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">idna</remote-id>
     <remote-id type="github">kjd/idna</remote-id>
diff --git a/dev-python/ijson/metadata.xml b/dev-python/ijson/metadata.xml
index be2e905889cf..2bf024cdc26e 100644
--- a/dev-python/ijson/metadata.xml
+++ b/dev-python/ijson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ijson</remote-id>
     <remote-id type="github">isagalaev/ijson</remote-id>
diff --git a/dev-python/imapclient/metadata.xml b/dev-python/imapclient/metadata.xml
index 4c44ce85c8de..7198f77d266a 100644
--- a/dev-python/imapclient/metadata.xml
+++ b/dev-python/imapclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">IMAPClient</remote-id>
 	</upstream>
diff --git a/dev-python/imdbpy/metadata.xml b/dev-python/imdbpy/metadata.xml
index 18cbc5c4dd67..fe768d1402ae 100644
--- a/dev-python/imdbpy/metadata.xml
+++ b/dev-python/imdbpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
+	<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">IMDbPY</remote-id>
 		<remote-id type="sourceforge">imdbpy</remote-id>
diff --git a/dev-python/importing/metadata.xml b/dev-python/importing/metadata.xml
index 16ed310e6320..9190f6fbb4af 100644
--- a/dev-python/importing/metadata.xml
+++ b/dev-python/importing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Importing</remote-id>
   </upstream>
diff --git a/dev-python/inflect/metadata.xml b/dev-python/inflect/metadata.xml
index bbe181ee663d..60747b1616d3 100644
--- a/dev-python/inflect/metadata.xml
+++ b/dev-python/inflect/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">inflect</remote-id>
 		<remote-id type="github">pwdyson/inflect.py</remote-id>
diff --git a/dev-python/iniparse/metadata.xml b/dev-python/iniparse/metadata.xml
index 4927106fb500..7478a5fc38a4 100644
--- a/dev-python/iniparse/metadata.xml
+++ b/dev-python/iniparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">iniparse</remote-id>
 	</upstream>
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
index 73a787db6be0..c439769a90c9 100644
--- a/dev-python/intelhex/metadata.xml
+++ b/dev-python/intelhex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <upstream>
 	<remote-id type="pypi">IntelHex</remote-id>
 	<remote-id type="github">bialix/intelhex</remote-id>
diff --git a/dev-python/into/metadata.xml b/dev-python/into/metadata.xml
index 756e541deb1d..024781b7c0b1 100644
--- a/dev-python/into/metadata.xml
+++ b/dev-python/into/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">into</remote-id>
   </upstream>
diff --git a/dev-python/ioflo/metadata.xml b/dev-python/ioflo/metadata.xml
index 17e8d2634f2e..7a555fee85a4 100644
--- a/dev-python/ioflo/metadata.xml
+++ b/dev-python/ioflo/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ioflo/ioflo</remote-id>
   </upstream>
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
index b039c82da95c..0bdc5845323d 100644
--- a/dev-python/ipaddr/metadata.xml
+++ b/dev-python/ipaddr/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <herd>python</herd>
   <maintainer>
     <email>andreis.vinogradovs@gmail.com</email>
   </maintainer>
@@ -10,6 +8,14 @@
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">ipaddr-py</remote-id>
     <remote-id type="pypi">ipaddr</remote-id>
diff --git a/dev-python/ipaddress/metadata.xml b/dev-python/ipaddress/metadata.xml
index 6358919f7ffb..0518175fd995 100644
--- a/dev-python/ipaddress/metadata.xml
+++ b/dev-python/ipaddress/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ipaddress</remote-id>
     <remote-id type="github">phihag/ipaddress</remote-id>
diff --git a/dev-python/ipcalc/metadata.xml b/dev-python/ipcalc/metadata.xml
index 2cda49ec8990..944367048089 100644
--- a/dev-python/ipcalc/metadata.xml
+++ b/dev-python/ipcalc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ipcalc</remote-id>
 	</upstream>
diff --git a/dev-python/ipdb/metadata.xml b/dev-python/ipdb/metadata.xml
index 8cf02f9346c7..9fdf430a9af1 100644
--- a/dev-python/ipdb/metadata.xml
+++ b/dev-python/ipdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ipdb</remote-id>
 	</upstream>
diff --git a/dev-python/ipy/metadata.xml b/dev-python/ipy/metadata.xml
index 8430480ce362..f50507bdef47 100644
--- a/dev-python/ipy/metadata.xml
+++ b/dev-python/ipy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">IPy</remote-id>
     <remote-id type="github">haypo/python-ipy</remote-id>
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 0e868ae83933..64ab2afa4106 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     This package provides the IPython kernel for Jupyter.
   </longdescription>
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 3f46dd1bfc06..2ea777d1eee7 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   	Interactive Parallel Computing with IPython.
     ipyparallel is the new home of IPython.parallel.
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index a337833e53ea..9194f627bc01 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   IPython provides a replacement for the interactive Python interpreter with
   extra functionality. Main features:
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
index 20b9b7572014..cf59b9bc9619 100644
--- a/dev-python/ipython_genutils/metadata.xml
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     This package contains some common utilities shared by Jupyter and
     IPython projects during The Big Split. As soon as possible, those
diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
index 71e3dc194126..942fa1bb12b7 100644
--- a/dev-python/ipywidgets/metadata.xml
+++ b/dev-python/ipywidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   	Interactive HTML widgets for Jupyter notebooks and the IPython
   	kernel.
diff --git a/dev-python/irc/metadata.xml b/dev-python/irc/metadata.xml
index bbcbe68d4049..0352f8100b41 100644
--- a/dev-python/irc/metadata.xml
+++ b/dev-python/irc/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This project includes an event-driven IRC client framework written in Python,
 		as well as an object-oriented wrapper class and some example programs.
diff --git a/dev-python/irman-python/metadata.xml b/dev-python/irman-python/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/irman-python/metadata.xml
+++ b/dev-python/irman-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/iso8601/metadata.xml b/dev-python/iso8601/metadata.xml
index c19ab23f7569..420edb48cff7 100644
--- a/dev-python/iso8601/metadata.xml
+++ b/dev-python/iso8601/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">iso8601</remote-id>
 	</upstream>
diff --git a/dev-python/isodate/metadata.xml b/dev-python/isodate/metadata.xml
index 1a5711f648c5..ff0b521eb38c 100644
--- a/dev-python/isodate/metadata.xml
+++ b/dev-python/isodate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 		This module implements ISO 8601 date, time and duration
 		parsing. The implementation follows ISO8601:2004 standard, and
diff --git a/dev-python/itsdangerous/metadata.xml b/dev-python/itsdangerous/metadata.xml
index d204c07a0838..ce3a41c5b356 100644
--- a/dev-python/itsdangerous/metadata.xml
+++ b/dev-python/itsdangerous/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">itsdangerous</remote-id>
   </upstream>
diff --git a/dev-python/jaraco-classes/metadata.xml b/dev-python/jaraco-classes/metadata.xml
index 93370f5a39ad..6b6d452aad56 100644
--- a/dev-python/jaraco-classes/metadata.xml
+++ b/dev-python/jaraco-classes/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.classes</remote-id>
 		<remote-id type="bitbucket">jaraco/jaraco.classes</remote-id>
diff --git a/dev-python/jaraco-collections/metadata.xml b/dev-python/jaraco-collections/metadata.xml
index 18440792aa47..039e30f2f42e 100644
--- a/dev-python/jaraco-collections/metadata.xml
+++ b/dev-python/jaraco-collections/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.collections</remote-id>
 		<remote-id type="github">jaraco/jaraco.collections</remote-id>
diff --git a/dev-python/jaraco-functools/metadata.xml b/dev-python/jaraco-functools/metadata.xml
index 811c8d1e1d47..629f1c515ef6 100644
--- a/dev-python/jaraco-functools/metadata.xml
+++ b/dev-python/jaraco-functools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.functools</remote-id>
 		<remote-id type="github">jaraco/jaraco.functools</remote-id>
diff --git a/dev-python/jaraco-itertools/metadata.xml b/dev-python/jaraco-itertools/metadata.xml
index 9961c850ad88..d5e6b564aacf 100644
--- a/dev-python/jaraco-itertools/metadata.xml
+++ b/dev-python/jaraco-itertools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.itertools</remote-id>
 		<remote-id type="github">jaraco/jaraco.itertools</remote-id>
diff --git a/dev-python/jaraco-logging/metadata.xml b/dev-python/jaraco-logging/metadata.xml
index 3c58c004f954..25c5adf0c91c 100644
--- a/dev-python/jaraco-logging/metadata.xml
+++ b/dev-python/jaraco-logging/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.logging</remote-id>
 		<remote-id type="github">jaraco/jaraco.logging</remote-id>
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index 088d700d9b21..b76dee0b5787 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.text</remote-id>
 		<remote-id type="github">jaraco/jaraco.text</remote-id>
diff --git a/dev-python/jaraco-utils/metadata.xml b/dev-python/jaraco-utils/metadata.xml
index f4ade42c4e56..a94d4ae87ed6 100644
--- a/dev-python/jaraco-utils/metadata.xml
+++ b/dev-python/jaraco-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.utils</remote-id>
 	</upstream>
diff --git a/dev-python/jaxml/metadata.xml b/dev-python/jaxml/metadata.xml
index 9b498c17fdc6..6c1fc0fdac71 100644
--- a/dev-python/jaxml/metadata.xml
+++ b/dev-python/jaxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaxml</remote-id>
 	</upstream>
diff --git a/dev-python/jdcal/metadata.xml b/dev-python/jdcal/metadata.xml
index d52cdc2e6871..9f8a42e08793 100644
--- a/dev-python/jdcal/metadata.xml
+++ b/dev-python/jdcal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jdcal</remote-id>
     <remote-id type="github">phn/jdcal</remote-id>
diff --git a/dev-python/jedi/metadata.xml b/dev-python/jedi/metadata.xml
index 8fd43766e8bd..fb6405a6e61a 100644
--- a/dev-python/jedi/metadata.xml
+++ b/dev-python/jedi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jedi</remote-id>
     <remote-id type="github">davidhalter/jedi</remote-id>
diff --git a/dev-python/jellyfish/metadata.xml b/dev-python/jellyfish/metadata.xml
index 57ab8724c126..8b815b22c315 100644
--- a/dev-python/jellyfish/metadata.xml
+++ b/dev-python/jellyfish/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jellyfish</remote-id>
     <remote-id type="github">jamesturk/jellyfish</remote-id>
diff --git a/dev-python/jenkins-autojobs/metadata.xml b/dev-python/jenkins-autojobs/metadata.xml
index 08e838d6acb5..cd0b59a802df 100644
--- a/dev-python/jenkins-autojobs/metadata.xml
+++ b/dev-python/jenkins-autojobs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
@@ -10,6 +9,10 @@
     <name>Tomas Mozes</name>
     <description>Proxy maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gvalkov/jenkins-autojobs</remote-id>
   </upstream>
diff --git a/dev-python/jenkins-webapi/metadata.xml b/dev-python/jenkins-webapi/metadata.xml
index 09bd92a7dcaa..ff52935965e1 100644
--- a/dev-python/jenkins-webapi/metadata.xml
+++ b/dev-python/jenkins-webapi/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">gvalkov/jenkins-webapi</remote-id>
 	</upstream>
diff --git a/dev-python/jenkinsapi/metadata.xml b/dev-python/jenkinsapi/metadata.xml
index 2c8e9674aa1b..ab693af3467b 100644
--- a/dev-python/jenkinsapi/metadata.xml
+++ b/dev-python/jenkinsapi/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">salimfadhley/jenkinsapi</remote-id>
 	</upstream>
diff --git a/dev-python/jingo/metadata.xml b/dev-python/jingo/metadata.xml
index 122dccb9144f..44601925be1b 100644
--- a/dev-python/jingo/metadata.xml
+++ b/dev-python/jingo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jingo</remote-id>
     <remote-id type="github">jbalogh/jingo</remote-id>
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 45bb8cf511c3..74d3ac1be847 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Jinja2</remote-id>
   </upstream>
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
index d1bd75aebfc7..0db345a8a5ba 100644
--- a/dev-python/jmespath/metadata.xml
+++ b/dev-python/jmespath/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jmespath</remote-id>
     <remote-id type="github">boto/jmespath</remote-id>
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
index 35b86bedc8c3..c288d4143fd0 100644
--- a/dev-python/joblib/metadata.xml
+++ b/dev-python/joblib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   Joblib is a set of tools to provide lightweight pipelining in
   Python. In particular, joblib offers:
diff --git a/dev-python/jonpy/metadata.xml b/dev-python/jonpy/metadata.xml
index 5103c52d4d0a..350f978c5697 100644
--- a/dev-python/jonpy/metadata.xml
+++ b/dev-python/jonpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jonpy</remote-id>
     <remote-id type="sourceforge">jonpy</remote-id>
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
index a4bede9eb394..fd74b9920de9 100644
--- a/dev-python/jsmin/metadata.xml
+++ b/dev-python/jsmin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jsmin</remote-id>
     <remote-id type="bitbucket">dcs/jsmin</remote-id>
diff --git a/dev-python/json-rpc/metadata.xml b/dev-python/json-rpc/metadata.xml
index 99af37920dca..20a6ce7328e3 100644
--- a/dev-python/json-rpc/metadata.xml
+++ b/dev-python/json-rpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	JSON-RPC is a stateless, light-weight remote procedure call (RPC) protocol.
 	Primarily this specification defines several data structures and the rules
diff --git a/dev-python/json-tools/metadata.xml b/dev-python/json-tools/metadata.xml
index 3212f3c37437..b7f9be52e64e 100644
--- a/dev-python/json-tools/metadata.xml
+++ b/dev-python/json-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">json_tools</remote-id>
     <remote-id type="bitbucket">vadim_semenov/json_tools</remote-id>
diff --git a/dev-python/jsonfield/metadata.xml b/dev-python/jsonfield/metadata.xml
index a28d03e5e5db..5fe01e5aed2b 100644
--- a/dev-python/jsonfield/metadata.xml
+++ b/dev-python/jsonfield/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jsonfield</remote-id>
     <remote-id type="github">bradjasper/django-jsonfield</remote-id>
diff --git a/dev-python/jsonpatch/metadata.xml b/dev-python/jsonpatch/metadata.xml
index 813d431e479c..4ea222561c7c 100644
--- a/dev-python/jsonpatch/metadata.xml
+++ b/dev-python/jsonpatch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Python library to apply JSON Patches according to
   http://tools.ietf.org/html/draft-ietf-appsawg-json-patch-08
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index c2c1d1d9b4be..067ecc9441af 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">jsonpickle</remote-id>
     <remote-id type="github">jsonpickle/jsonpickle</remote-id>
diff --git a/dev-python/jsonpointer/metadata.xml b/dev-python/jsonpointer/metadata.xml
index 4682e7f37ec5..872853f737aa 100644
--- a/dev-python/jsonpointer/metadata.xml
+++ b/dev-python/jsonpointer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Identify specific nodes in a JSON document (according to draft 08)
   http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-08
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 93833cfa1fae..ad01ff38b3e9 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>vapier@gentoo.org</email>
     <description>make whatever changes you want</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">joshmarshall/jsonrpclib</remote-id>
   </upstream>
diff --git a/dev-python/jupyter/metadata.xml b/dev-python/jupyter/metadata.xml
index 00118fe11137..663a012a33f1 100644
--- a/dev-python/jupyter/metadata.xml
+++ b/dev-python/jupyter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 Install the Jupyter system, including the notebook, qtconsole, and the IPython kernel.
   </longdescription>
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index 6c569595fd80..f4f0e384147e 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Contains the reference implementation of the Jupyter protocol. It
     also provides client and kernel management APIs for working with
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index a069311d1416..3acf4df8f99b 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index 07c5e187e973..9d2c3ea7d602 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Core common functionality of Jupyter projects.
     This package contains base application classes and configuration
diff --git a/dev-python/kaa-base/metadata.xml b/dev-python/kaa-base/metadata.xml
index 4fbeabc7eaf8..d318c165c976 100644
--- a/dev-python/kaa-base/metadata.xml
+++ b/dev-python/kaa-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Kaa-base provides the base Kaa framework and is an implicit
 		dependency for all kaa modules. The kaa framework includes a
diff --git a/dev-python/kaa-display/metadata.xml b/dev-python/kaa-display/metadata.xml
index b64cc34153e2..3b956311a681 100644
--- a/dev-python/kaa-display/metadata.xml
+++ b/dev-python/kaa-display/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freevo</remote-id>
 	</upstream>
diff --git a/dev-python/kaa-imlib2/metadata.xml b/dev-python/kaa-imlib2/metadata.xml
index 1a1352521491..919119bfb2f1 100644
--- a/dev-python/kaa-imlib2/metadata.xml
+++ b/dev-python/kaa-imlib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Kaa-Imlib2 is a python module for Imlib2.
 	</longdescription>
diff --git a/dev-python/kaa-metadata/metadata.xml b/dev-python/kaa-metadata/metadata.xml
index 7c977ff801b9..4d72b6e520d8 100644
--- a/dev-python/kaa-metadata/metadata.xml
+++ b/dev-python/kaa-metadata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		A powerful media metadata parser in Python. It can extract
 		metadata (such as id3 tags, for example) from a wide range of
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
index 59a2b478a979..897fc55b1a57 100644
--- a/dev-python/kazoo/metadata.xml
+++ b/dev-python/kazoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="gevent">Enable support for the gevent based handler</flag>
   </use>
diff --git a/dev-python/keepassx/metadata.xml b/dev-python/keepassx/metadata.xml
index c65b8302b93a..268170f25ca4 100644
--- a/dev-python/keepassx/metadata.xml
+++ b/dev-python/keepassx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">keepassx</remote-id>
     <remote-id type="github">jamesls/python-keepassx</remote-id>
diff --git a/dev-python/keyczar/metadata.xml b/dev-python/keyczar/metadata.xml
index 0a3e6626ed64..9bd95b4d65d5 100644
--- a/dev-python/keyczar/metadata.xml
+++ b/dev-python/keyczar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-keyczar</remote-id>
 	</upstream>
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index ef2f5eba9e84..d2704e951825 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 		Provides a easy way to access the system keyring service from python.
 	</longdescription>
diff --git a/dev-python/keystonemiddleware/metadata.xml b/dev-python/keystonemiddleware/metadata.xml
index 3f4361b8b56c..930f547dee16 100644
--- a/dev-python/keystonemiddleware/metadata.xml
+++ b/dev-python/keystonemiddleware/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     OpenStack Identity (Keystone) Middleware
   </longdescription>
diff --git a/dev-python/kid/metadata.xml b/dev-python/kid/metadata.xml
index 4813d7da1baf..3f81a8ae1eb9 100644
--- a/dev-python/kid/metadata.xml
+++ b/dev-python/kid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 Kid is a simple template language for XML based vocabularies written
 in Python. The syntax was inspired by a number of existing template
diff --git a/dev-python/kiwi/metadata.xml b/dev-python/kiwi/metadata.xml
index 2c9d990566e6..d396d93d2f15 100644
--- a/dev-python/kiwi/metadata.xml
+++ b/dev-python/kiwi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">kiwi-gtk</remote-id>
 		<remote-id type="launchpad">kiwi</remote-id>
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index d9cbb330499e..c52bcc2d5a3f 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">kombu</remote-id>
 		<remote-id type="github">celery/kombu</remote-id>
diff --git a/dev-python/lazy-object-proxy/metadata.xml b/dev-python/lazy-object-proxy/metadata.xml
index 139dca7f0107..00576dc2357e 100644
--- a/dev-python/lazy-object-proxy/metadata.xml
+++ b/dev-python/lazy-object-proxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">lazy-object-proxy</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/ldap3/metadata.xml b/dev-python/ldap3/metadata.xml
index 658dcd90272e..6faffefbb556 100644
--- a/dev-python/ldap3/metadata.xml
+++ b/dev-python/ldap3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		ldap3 is a strictly RFC 4511 conforming LDAP V3 pure Python client. The same codebase works with Python, Python 3, PyPy and PyPy3.
 		This project was formerly named python3-ldap. The name has been changed to avoid confusion with the python-ldap library.
diff --git a/dev-python/ldappool/metadata.xml b/dev-python/ldappool/metadata.xml
index 5df08f8da794..4009b35f0afc 100644
--- a/dev-python/ldappool/metadata.xml
+++ b/dev-python/ldappool/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	A simple connector pool for python-ldap.
 	</longdescription>
diff --git a/dev-python/lesscpy/metadata.xml b/dev-python/lesscpy/metadata.xml
index 45e0253a5f96..41d397100039 100644
--- a/dev-python/lesscpy/metadata.xml
+++ b/dev-python/lesscpy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     A compiler written in Python for the LESS language.
   </longdescription>
diff --git a/dev-python/libbonobo-python/metadata.xml b/dev-python/libbonobo-python/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/libbonobo-python/metadata.xml
+++ b/dev-python/libbonobo-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/libcloud/metadata.xml b/dev-python/libcloud/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/libcloud/metadata.xml
+++ b/dev-python/libcloud/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/libextractor-python/metadata.xml b/dev-python/libextractor-python/metadata.xml
index accefe08c311..d0f199770f41 100644
--- a/dev-python/libextractor-python/metadata.xml
+++ b/dev-python/libextractor-python/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>net-p2p</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/libgnome-python/metadata.xml b/dev-python/libgnome-python/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/libgnome-python/metadata.xml
+++ b/dev-python/libgnome-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/libgnomecanvas-python/metadata.xml b/dev-python/libgnomecanvas-python/metadata.xml
index 888e60bf6a90..bf4781aecfda 100644
--- a/dev-python/libgnomecanvas-python/metadata.xml
+++ b/dev-python/libgnomecanvas-python/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>gnome</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/libnacl/metadata.xml b/dev-python/libnacl/metadata.xml
index 91d2d7777dba..c0a9b5862a17 100644
--- a/dev-python/libnacl/metadata.xml
+++ b/dev-python/libnacl/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">libnacl</remote-id>
   </upstream>
diff --git a/dev-python/librharris/metadata.xml b/dev-python/librharris/metadata.xml
index acd281e0fe7b..ac76697c6b1c 100644
--- a/dev-python/librharris/metadata.xml
+++ b/dev-python/librharris/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">lib_rharris</remote-id>
 	</upstream>
diff --git a/dev-python/librsvg-python/metadata.xml b/dev-python/librsvg-python/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-python/librsvg-python/metadata.xml
+++ b/dev-python/librsvg-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/libvirt-python/metadata.xml b/dev-python/libvirt-python/metadata.xml
index 0349051772f9..5e9818456079 100644
--- a/dev-python/libvirt-python/metadata.xml
+++ b/dev-python/libvirt-python/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<herd>virtualization</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-python/libwnck-python/metadata.xml b/dev-python/libwnck-python/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-python/libwnck-python/metadata.xml
+++ b/dev-python/libwnck-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index 270efb218b4c..e8b052af1883 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     line_profiler is a module for doing line-by-line profiling of
     functions. kernprof is a convenient script for running either
diff --git a/dev-python/llfuse/metadata.xml b/dev-python/llfuse/metadata.xml
index 6749cd70eb50..efbc6f2029cf 100644
--- a/dev-python/llfuse/metadata.xml
+++ b/dev-python/llfuse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">llfuse</remote-id>
 	</upstream>
diff --git a/dev-python/llvmlite/metadata.xml b/dev-python/llvmlite/metadata.xml
index a384c2f3ddc8..962015440dbb 100644
--- a/dev-python/llvmlite/metadata.xml
+++ b/dev-python/llvmlite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">llvmlite</remote-id>
   </upstream>
diff --git a/dev-python/llvmmath/metadata.xml b/dev-python/llvmmath/metadata.xml
index 3a2c2a56ccf3..f1f5c1cc4453 100644
--- a/dev-python/llvmmath/metadata.xml
+++ b/dev-python/llvmmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The purpose of this project is to provide portable math functions,
   many of which are in C99 and not available on all platforms. It is
diff --git a/dev-python/llvmpy/metadata.xml b/dev-python/llvmpy/metadata.xml
index 73f8aae9c57b..08aae36f8635 100644
--- a/dev-python/llvmpy/metadata.xml
+++ b/dev-python/llvmpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   llvmpy is a Python wrapper around the LLVM C++ library which allows
   simple access to compiler tools.
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
index deb69e0f0f3a..1f9ad75fd153 100644
--- a/dev-python/lockfile/metadata.xml
+++ b/dev-python/lockfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">lockfile</remote-id>
 		<remote-id type="launchpad">pylockfile</remote-id>
diff --git a/dev-python/locustio/metadata.xml b/dev-python/locustio/metadata.xml
index 7474427bba31..5a8effb3bcd6 100644
--- a/dev-python/locustio/metadata.xml
+++ b/dev-python/locustio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">locustio</remote-id>
 	<remote-id type="github">locustio/locust</remote-id>
diff --git a/dev-python/log4py/metadata.xml b/dev-python/log4py/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/log4py/metadata.xml
+++ b/dev-python/log4py/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/logbook/metadata.xml b/dev-python/logbook/metadata.xml
index d7c3f72cb386..c04389a31ef8 100644
--- a/dev-python/logbook/metadata.xml
+++ b/dev-python/logbook/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Logbook</remote-id>
     <remote-id type="github">mitsuhiko/logbook</remote-id>
diff --git a/dev-python/logilab-common/metadata.xml b/dev-python/logilab-common/metadata.xml
index 2c6b0c6b32ab..41c8cd89f1b8 100644
--- a/dev-python/logilab-common/metadata.xml
+++ b/dev-python/logilab-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">logilab-common</remote-id>
 	</upstream>
diff --git a/dev-python/logilab-constraint/metadata.xml b/dev-python/logilab-constraint/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/logilab-constraint/metadata.xml
+++ b/dev-python/logilab-constraint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/louie/metadata.xml b/dev-python/louie/metadata.xml
index 4053af5244ec..960d311383fe 100644
--- a/dev-python/louie/metadata.xml
+++ b/dev-python/louie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Louie</remote-id>
 	</upstream>
diff --git a/dev-python/lp_solve/metadata.xml b/dev-python/lp_solve/metadata.xml
index 71f0f27b3d6f..3b8e93e82f25 100644
--- a/dev-python/lp_solve/metadata.xml
+++ b/dev-python/lp_solve/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Python wrapper modules for the linear programming library lpsolve.
 </longdescription>
diff --git a/dev-python/lupy/metadata.xml b/dev-python/lupy/metadata.xml
index 25857ab459f4..29d7ca7ac8ed 100644
--- a/dev-python/lupy/metadata.xml
+++ b/dev-python/lupy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>lordvan@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lupy</remote-id>
 	</upstream>
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index 086b32604647..28149c95f758 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">lxml</remote-id>
   </upstream>
diff --git a/dev-python/lz4/metadata.xml b/dev-python/lz4/metadata.xml
index c61a5de810e3..20b675958b7b 100644
--- a/dev-python/lz4/metadata.xml
+++ b/dev-python/lz4/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">lz4</remote-id>
     <remote-id type="github">steeve/python-lz4</remote-id>
diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml
index 63966d0bad92..c863df2ed6f3 100644
--- a/dev-python/m2crypto/metadata.xml
+++ b/dev-python/m2crypto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">M2Crypto</remote-id>
     <remote-id type="github">martinpaljak/M2Crypto</remote-id>
diff --git a/dev-python/m2secret/metadata.xml b/dev-python/m2secret/metadata.xml
index 905c86f17a63..4fb55a02cead 100644
--- a/dev-python/m2secret/metadata.xml
+++ b/dev-python/m2secret/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">m2secret</remote-id>
 	</upstream>
diff --git a/dev-python/maintboot/metadata.xml b/dev-python/maintboot/metadata.xml
index e954bcf3d627..336669dd8d0c 100644
--- a/dev-python/maintboot/metadata.xml
+++ b/dev-python/maintboot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">maintboot</remote-id>
   </upstream>
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index baf06ef2b08a..ddfd3d4bea56 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mako</remote-id>
   </upstream>
diff --git a/dev-python/mantissa/metadata.xml b/dev-python/mantissa/metadata.xml
index 52fe40b7484f..4235f45867ad 100644
--- a/dev-python/mantissa/metadata.xml
+++ b/dev-python/mantissa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Mantissa is an application server. It provides integration between
 		the AxiomProject object database, and the TwistedFramework, as well
 		as web user-interface utilities.</longdescription>
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
index 4d89e2cd6f39..a8260651239a 100644
--- a/dev-python/manuel/metadata.xml
+++ b/dev-python/manuel/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">benji-york/manuel</remote-id>
     <remote-id type="pypi">manuel</remote-id>
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 50c3f9d83463..8b6d4c0d1bfc 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="pygments">Enable fancy pygments support</flag>
   </use>
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
index 0dea06b2d2a2..536e1b7c1fc6 100644
--- a/dev-python/markdown2/metadata.xml
+++ b/dev-python/markdown2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email/>
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index 4857b1a70812..8644e421de13 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Markups</remote-id>
     <remote-id type="github">retext-project/pymarkups</remote-id>
diff --git a/dev-python/markupsafe/metadata.xml b/dev-python/markupsafe/metadata.xml
index 5eb521f7c15b..ea0ef542a454 100644
--- a/dev-python/markupsafe/metadata.xml
+++ b/dev-python/markupsafe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">MarkupSafe</remote-id>
 	</upstream>
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index fa1693c70e1f..f43f75bcbd50 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   matplotlib is an interactive library for plotting and doing basic
   data analysis in python with a syntax similar to matlab. It provides a
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
index de8b0975f4e6..869910158fe7 100644
--- a/dev-python/mccabe/metadata.xml
+++ b/dev-python/mccabe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mccabe</remote-id>
     <remote-id type="github">flintwork/mccabe</remote-id>
diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
index ed7f2d4ce9af..3fa5e363aed3 100644
--- a/dev-python/mecab-python/metadata.xml
+++ b/dev-python/mecab-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
diff --git a/dev-python/mechanize/metadata.xml b/dev-python/mechanize/metadata.xml
index 9c040559f301..4e3d1f7fe9cd 100644
--- a/dev-python/mechanize/metadata.xml
+++ b/dev-python/mechanize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     mechanize is a Python module for static programmatic web browsing in
     Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
diff --git a/dev-python/medusa/metadata.xml b/dev-python/medusa/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/medusa/metadata.xml
+++ b/dev-python/medusa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/meld3/metadata.xml b/dev-python/meld3/metadata.xml
index a0ae747bfbf6..6ffaabe99d2f 100644
--- a/dev-python/meld3/metadata.xml
+++ b/dev-python/meld3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">meld3</remote-id>
     <remote-id type="github">supervisor/meld3</remote-id>
diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
index f7a32cf0f434..01b8bedca379 100644
--- a/dev-python/memory_profiler/metadata.xml
+++ b/dev-python/memory_profiler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">memory_profiler</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/mergedict/metadata.xml b/dev-python/mergedict/metadata.xml
index 1e9c6e609666..51108da60d26 100644
--- a/dev-python/mergedict/metadata.xml
+++ b/dev-python/mergedict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">configclass</remote-id>
 		<remote-id type="github">schettino72/mergedict</remote-id>
diff --git a/dev-python/meteor-ejson/metadata.xml b/dev-python/meteor-ejson/metadata.xml
index 3dd330ea778f..9697070452fa 100644
--- a/dev-python/meteor-ejson/metadata.xml
+++ b/dev-python/meteor-ejson/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">meteor-ejson</remote-id>
   </upstream>
diff --git a/dev-python/micawber/metadata.xml b/dev-python/micawber/metadata.xml
index 59b5b5cb7bd1..f1cc0db0c400 100644
--- a/dev-python/micawber/metadata.xml
+++ b/dev-python/micawber/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">coleifer/micawber</remote-id>
   </upstream>
diff --git a/dev-python/milk/metadata.xml b/dev-python/milk/metadata.xml
index 62f6e4aafbaa..8c9ece5d042f 100644
--- a/dev-python/milk/metadata.xml
+++ b/dev-python/milk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Milk is a machine learning toolkit in Python.
   Its focus is on supervised classification with several classifiers
diff --git a/dev-python/milksets/metadata.xml b/dev-python/milksets/metadata.xml
index f52e62d1286d..65145fc51009 100644
--- a/dev-python/milksets/metadata.xml
+++ b/dev-python/milksets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This packages contains some U.C.I. datasets in a common Pythonic
   interface, which makes them easy to use with milk.
diff --git a/dev-python/mimeparse/metadata.xml b/dev-python/mimeparse/metadata.xml
index 1a36be27c13e..6106a856cbdd 100644
--- a/dev-python/mimeparse/metadata.xml
+++ b/dev-python/mimeparse/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-mimeparse</remote-id>
     <remote-id type="github">dbtsai/python-mimeparse</remote-id>
diff --git a/dev-python/mimerender/metadata.xml b/dev-python/mimerender/metadata.xml
index 5ea2ed67490d..ff64932e112c 100644
--- a/dev-python/mimerender/metadata.xml
+++ b/dev-python/mimerender/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mimerender</remote-id>
 	</upstream>
diff --git a/dev-python/minidb/metadata.xml b/dev-python/minidb/metadata.xml
index 82fbe793c728..3d337b8d963e 100644
--- a/dev-python/minidb/metadata.xml
+++ b/dev-python/minidb/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">minidb</remote-id>
 		<remote-id type="github">thp/minidb</remote-id>
diff --git a/dev-python/minimock/metadata.xml b/dev-python/minimock/metadata.xml
index c88fc0c84b80..70affa0e188c 100644
--- a/dev-python/minimock/metadata.xml
+++ b/dev-python/minimock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">MiniMock</remote-id>
 	</upstream>
diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
index f38aad4d9e51..0e1cc0eb8474 100644
--- a/dev-python/miniupnpc/metadata.xml
+++ b/dev-python/miniupnpc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
@@ -10,4 +9,8 @@
 	<email>nikoli@gmx.us</email>
 	<name>Nikoli</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
index 2a633326801a..7486e277a0da 100644
--- a/dev-python/misaka/metadata.xml
+++ b/dev-python/misaka/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">misaka</remote-id>
   </upstream>
diff --git a/dev-python/mistune/metadata.xml b/dev-python/mistune/metadata.xml
index 97f827c797de..8236b7c436cc 100644
--- a/dev-python/mistune/metadata.xml
+++ b/dev-python/mistune/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mistune</remote-id>
     <remote-id type="github">lepture/mistune</remote-id>
diff --git a/dev-python/mkpythonproj/metadata.xml b/dev-python/mkpythonproj/metadata.xml
index 0d924dec2c7d..10cccaa609a7 100644
--- a/dev-python/mkpythonproj/metadata.xml
+++ b/dev-python/mkpythonproj/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/mock/metadata.xml b/dev-python/mock/metadata.xml
index 65b34d679ea4..509a6bbd50f5 100644
--- a/dev-python/mock/metadata.xml
+++ b/dev-python/mock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mock</remote-id>
 		<remote-id type="github">testing-cabal/mock</remote-id>
diff --git a/dev-python/mocker/metadata.xml b/dev-python/mocker/metadata.xml
index ff6fd8b591ac..904e2b2cfc8d 100644
--- a/dev-python/mocker/metadata.xml
+++ b/dev-python/mocker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mocker</remote-id>
   </upstream>
diff --git a/dev-python/mockldap/metadata.xml b/dev-python/mockldap/metadata.xml
index 4f80f5ed7d98..6a95008194cc 100644
--- a/dev-python/mockldap/metadata.xml
+++ b/dev-python/mockldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mockldap</remote-id>
     <remote-id type="bitbucket">psagers/mockldap</remote-id>
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
index a1b620006dcf..5f0cc9403b62 100644
--- a/dev-python/mongoengine/metadata.xml
+++ b/dev-python/mongoengine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">MongoEngine/mongoengine</remote-id>
   </upstream>
diff --git a/dev-python/morbid/metadata.xml b/dev-python/morbid/metadata.xml
index 615475f3eedf..9756ad05e5f1 100644
--- a/dev-python/morbid/metadata.xml
+++ b/dev-python/morbid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">morbid</remote-id>
 	</upstream>
diff --git a/dev-python/more-itertools/metadata.xml b/dev-python/more-itertools/metadata.xml
index a6785f1e01b7..7ecf5fc2679c 100644
--- a/dev-python/more-itertools/metadata.xml
+++ b/dev-python/more-itertools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">more-itertools</remote-id>
 	</upstream>
diff --git a/dev-python/moto/metadata.xml b/dev-python/moto/metadata.xml
index bf151f0343d0..0f045197cc8a 100644
--- a/dev-python/moto/metadata.xml
+++ b/dev-python/moto/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">moto</remote-id>
     <remote-id type="github">spulec/moto</remote-id>
diff --git a/dev-python/mox/metadata.xml b/dev-python/mox/metadata.xml
index 95a2d0e50d9a..c92df719671d 100644
--- a/dev-python/mox/metadata.xml
+++ b/dev-python/mox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">pymox</remote-id>
     <remote-id type="pypi">mox</remote-id>
diff --git a/dev-python/mox3/metadata.xml b/dev-python/mox3/metadata.xml
index b1c2c7fd684e..e8e62729a351 100644
--- a/dev-python/mox3/metadata.xml
+++ b/dev-python/mox3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mox3</remote-id>
   </upstream>
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index 60bfc6b20263..8fbc12f83042 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">MPI for Python (mpi4py) provides bindings of the Message Passing
   Interface (MPI) standard for the Python programming language,
   allowing any Python program to exploit multiple processors.
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 2d2c4a18f19f..4aea70c8477b 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
 <maintainer>
   <email>grozin@gentoo.org</email>
   <name>Andrey Grozin</name>
 </maintainer>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   A Python library for arbitrary-precision floating-point arithmetic
 </longdescription>
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
index 6860185adab5..53b1c5790cb2 100644
--- a/dev-python/msgpack/metadata.xml
+++ b/dev-python/msgpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">msgpack-python</remote-id>
     <remote-id type="github">msgpack/msgpack-python</remote-id>
diff --git a/dev-python/multipledispatch/metadata.xml b/dev-python/multipledispatch/metadata.xml
index dcddd9577ad5..114616963e31 100644
--- a/dev-python/multipledispatch/metadata.xml
+++ b/dev-python/multipledispatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">multipledispatch</remote-id>
 	</upstream>
diff --git a/dev-python/munkres/metadata.xml b/dev-python/munkres/metadata.xml
index 3524090db533..57c9ba72a6e4 100644
--- a/dev-python/munkres/metadata.xml
+++ b/dev-python/munkres/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>joshua.downer@gmail.com</email>
     <name>Joshua Downer</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">The Munkres module provides an implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), useful for solving the Assignment Problem.
 	</longdescription>
   <upstream>
diff --git a/dev-python/mwlib-ext/metadata.xml b/dev-python/mwlib-ext/metadata.xml
index c74bb5b4ec56..8c026a1f9e46 100644
--- a/dev-python/mwlib-ext/metadata.xml
+++ b/dev-python/mwlib-ext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mwlib.ext</remote-id>
 	</upstream>
diff --git a/dev-python/mwlib-rl/metadata.xml b/dev-python/mwlib-rl/metadata.xml
index afa512415f69..f1c38ba66529 100644
--- a/dev-python/mwlib-rl/metadata.xml
+++ b/dev-python/mwlib-rl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mwlib.rl</remote-id>
     <remote-id type="github">pediapress/mwlib.rl</remote-id>
diff --git a/dev-python/mwlib/metadata.xml b/dev-python/mwlib/metadata.xml
index a27761e03ab6..fc00128fa27e 100644
--- a/dev-python/mwlib/metadata.xml
+++ b/dev-python/mwlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mwlib</remote-id>
     <remote-id type="github">pediapress/mwlib</remote-id>
diff --git a/dev-python/myghty/metadata.xml b/dev-python/myghty/metadata.xml
index 4c18139204fc..8aac0c18cb17 100644
--- a/dev-python/myghty/metadata.xml
+++ b/dev-python/myghty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Myghty</remote-id>
 	</upstream>
diff --git a/dev-python/myghtyutils/metadata.xml b/dev-python/myghtyutils/metadata.xml
index ed85cb0f24be..90c1cb7d8ca4 100644
--- a/dev-python/myghtyutils/metadata.xml
+++ b/dev-python/myghtyutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">MyghtyUtils</remote-id>
 	</upstream>
diff --git a/dev-python/mygpoclient/metadata.xml b/dev-python/mygpoclient/metadata.xml
index c77ae0cadabb..8e4f66421511 100644
--- a/dev-python/mygpoclient/metadata.xml
+++ b/dev-python/mygpoclient/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<herd>python</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/mysql-connector-python/metadata.xml b/dev-python/mysql-connector-python/metadata.xml
index 665d741edb2a..352a364ee0ed 100644
--- a/dev-python/mysql-connector-python/metadata.xml
+++ b/dev-python/mysql-connector-python/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-<herd>python</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <use>
 </use>
 </pkgmetadata>
diff --git a/dev-python/mysql-python/metadata.xml b/dev-python/mysql-python/metadata.xml
index 8e649cfb2347..e15399c25cf2 100644
--- a/dev-python/mysql-python/metadata.xml
+++ b/dev-python/mysql-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mysql-python</remote-id>
     <remote-id type="sourceforge">mysql-python</remote-id>
diff --git a/dev-python/mysqlclient/metadata.xml b/dev-python/mysqlclient/metadata.xml
index 8113edf6fa5a..12b34a4c660e 100644
--- a/dev-python/mysqlclient/metadata.xml
+++ b/dev-python/mysqlclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">mysqlclient</remote-id>
     <remote-id type="github">PyMySQL/mysqlclient-python</remote-id>
diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
index 1bfc67db88e4..9d09d79975b7 100644
--- a/dev-python/nagiosplugin/metadata.xml
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
 	  <email>sautier.louis@gmail.com</email>
 	  <name>Louis Sautier</name>
   </maintainer>
+  <maintainer>
+	  <email>proxy-maint@gentoo.org</email>
+	  <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
 	  <remote-id type="pypi">nagiosplugin</remote-id>
 	  <remote-id type="bitbucket">flyingcircus/nagiosplugin</remote-id>
diff --git a/dev-python/natgrid/metadata.xml b/dev-python/natgrid/metadata.xml
index a3b93014161b..7177b90c82b8 100644
--- a/dev-python/natgrid/metadata.xml
+++ b/dev-python/natgrid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   mpl_toolkits.natgrid is an python interface to natgrid C library for
   gridding irregularly spaced data.
diff --git a/dev-python/natsort/metadata.xml b/dev-python/natsort/metadata.xml
index 05b633d68765..1797bab0e5fd 100644
--- a/dev-python/natsort/metadata.xml
+++ b/dev-python/natsort/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">natsort</remote-id>
   </upstream>
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index 19af6126203f..e5081b3f165c 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Jupyter NBConvert converts Jupyter notebooks to various other
     formats via Jinja templates.
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
index cf2dd6b8fd9d..6a23b20cb15e 100644
--- a/dev-python/nbformat/metadata.xml
+++ b/dev-python/nbformat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Jupyther nbformat contains the reference implementation of the
     Jupyter Notebook format, and Python APIs for working with
diff --git a/dev-python/ndg-httpsclient/metadata.xml b/dev-python/ndg-httpsclient/metadata.xml
index 7a46194ed57f..914b16d632d8 100644
--- a/dev-python/ndg-httpsclient/metadata.xml
+++ b/dev-python/ndg-httpsclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ndg-httpsclient</remote-id>
     <remote-id type="github">cedadev/ndg_httpsclient</remote-id>
diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/neovim-python-client/metadata.xml
index 804596a47144..580c5d659ee6 100644
--- a/dev-python/neovim-python-client/metadata.xml
+++ b/dev-python/neovim-python-client/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">neovim/python-client</remote-id>
   </upstream>
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 591d65cef994..bf82ecaf8e69 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>andreis.vinogradovs@gmail.com</email>
   </maintainer>
@@ -9,6 +8,10 @@
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
   </use>
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index f9af26ff1f28..4c922340e7aa 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Unidata/netcdf4-python</remote-id>
   </upstream>
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index 434ad9ca391d..6c0879e7a070 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">netifaces</remote-id>
   </upstream>
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index 6281d76bab46..530f3a01f960 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   NetworkX is a Python-based package for the creation, manipulation, and
   study of the structure, dynamics, and functions of complex networks.
diff --git a/dev-python/nevow/metadata.xml b/dev-python/nevow/metadata.xml
index 991dd94eb658..65f0419f0bb4 100644
--- a/dev-python/nevow/metadata.xml
+++ b/dev-python/nevow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Nevow</remote-id>
 	</upstream>
diff --git a/dev-python/newt_syrup/metadata.xml b/dev-python/newt_syrup/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/newt_syrup/metadata.xml
+++ b/dev-python/newt_syrup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/nltk/metadata.xml b/dev-python/nltk/metadata.xml
index 3e7fe5a2e9f8..5b6b892a1236 100644
--- a/dev-python/nltk/metadata.xml
+++ b/dev-python/nltk/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>clabbe.montjoie@gmail.com</email>
     <name>LABBE Corentin (Montjoie)</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="numpy">Use numpy for the saved word tokenizer</flag>
   </use>
diff --git a/dev-python/nose-cover3/metadata.xml b/dev-python/nose-cover3/metadata.xml
index cdf915205e17..348f5ee687b8 100644
--- a/dev-python/nose-cover3/metadata.xml
+++ b/dev-python/nose-cover3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nose-cover3</remote-id>
     <remote-id type="github">ask/nosecover3</remote-id>
diff --git a/dev-python/nose-exclude/metadata.xml b/dev-python/nose-exclude/metadata.xml
index bd8748095b45..21903046ca35 100644
--- a/dev-python/nose-exclude/metadata.xml
+++ b/dev-python/nose-exclude/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Exclude specific directories from nosetests runs.
   </longdescription>
diff --git a/dev-python/nose-testconfig/metadata.xml b/dev-python/nose-testconfig/metadata.xml
index 651b8ab51417..e1a8272b9f72 100644
--- a/dev-python/nose-testconfig/metadata.xml
+++ b/dev-python/nose-testconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nose-testconfig</remote-id>
     <remote-id type="bitbucket">jnoller/nose-testconfig</remote-id>
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 467060e4a3fb..6a0b945a580d 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
diff --git a/dev-python/nose_fixes/metadata.xml b/dev-python/nose_fixes/metadata.xml
index 3c51872bc41f..d436df1b6dcc 100644
--- a/dev-python/nose_fixes/metadata.xml
+++ b/dev-python/nose_fixes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nose_fixes</remote-id>
   </upstream>
diff --git a/dev-python/nosehtmloutput/metadata.xml b/dev-python/nosehtmloutput/metadata.xml
index 079041c345e7..a26c5a246b25 100644
--- a/dev-python/nosehtmloutput/metadata.xml
+++ b/dev-python/nosehtmloutput/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Nose plugin to produce test results in html.
   </longdescription>
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
index 9930af0eba66..2506e1f126c7 100644
--- a/dev-python/nosexcover/metadata.xml
+++ b/dev-python/nosexcover/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nosexcover</remote-id>
     <remote-id type="github">cmheisel/nose-xcover</remote-id>
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index d82c21c4251f..7ce21878e1fc 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     The Jupyter HTML notebook is a web-based notebook environment
     for interactive computing.
diff --git a/dev-python/notify-python/metadata.xml b/dev-python/notify-python/metadata.xml
index f95d435c3a6f..99ba9d837185 100644
--- a/dev-python/notify-python/metadata.xml
+++ b/dev-python/notify-python/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/numba/metadata.xml b/dev-python/numba/metadata.xml
index 98eac6d30b5e..eb5e17fab1cd 100644
--- a/dev-python/numba/metadata.xml
+++ b/dev-python/numba/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Numba is a NumPy-aware optimizing compiler for Python. It uses the LLVM
   compiler infrastructure to compile Python syntax to machine code.
diff --git a/dev-python/numdisplay/metadata.xml b/dev-python/numdisplay/metadata.xml
index 7a5f1bc18040..bc4c59c773db 100644
--- a/dev-python/numdisplay/metadata.xml
+++ b/dev-python/numdisplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
     Numdisplay provides the capability to visualize numarray array objects
     using astronomical image display tools such as DS9 or XIMTOOL
diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml
index d1db4bfbe81a..597547995e02 100644
--- a/dev-python/numexpr/metadata.xml
+++ b/dev-python/numexpr/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The numexpr package evaluates multiple-operator array expressions
   many times faster than NumPy can. It accepts the expression as a
diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml
index 0bfafa1af2f6..2f97bd31bbc9 100644
--- a/dev-python/numpy/metadata.xml
+++ b/dev-python/numpy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   NumPy is a general-purpose array-processing Python package designed to
   efficiently manipulate large multi-dimensional arrays of arbitrary
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
index d70636c886e7..7a8df894ab9d 100644
--- a/dev-python/numpydoc/metadata.xml
+++ b/dev-python/numpydoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">numpydoc</remote-id>
   </upstream>
diff --git a/dev-python/oauth/metadata.xml b/dev-python/oauth/metadata.xml
index 27c5e14c8ffb..5d16745e9614 100644
--- a/dev-python/oauth/metadata.xml
+++ b/dev-python/oauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">oauth</remote-id>
 	</upstream>
diff --git a/dev-python/oauth2/metadata.xml b/dev-python/oauth2/metadata.xml
index b8382a97ef63..69042455f04f 100644
--- a/dev-python/oauth2/metadata.xml
+++ b/dev-python/oauth2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">oauth2</remote-id>
 	</upstream>
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index b36b6dfa4390..2e19968ca34f 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">google/oauth2client</remote-id>
   </upstream>
diff --git a/dev-python/oauthlib/metadata.xml b/dev-python/oauthlib/metadata.xml
index 73b1a997dc90..203f7d397c7c 100644
--- a/dev-python/oauthlib/metadata.xml
+++ b/dev-python/oauthlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">oauthlib</remote-id>
     <remote-id type="github">idan/oauthlib</remote-id>
diff --git a/dev-python/oct2py/metadata.xml b/dev-python/oct2py/metadata.xml
index 2e6369294eac..1cfa20fdd629 100644
--- a/dev-python/oct2py/metadata.xml
+++ b/dev-python/oct2py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Uses Octave to run commands and m-files. Supports any Octave
   function or m-file, passing the data seamlessly between Python and
diff --git a/dev-python/odfpy/metadata.xml b/dev-python/odfpy/metadata.xml
index 70933e33efcb..00644bfc9c7c 100644
--- a/dev-python/odfpy/metadata.xml
+++ b/dev-python/odfpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">odfpy</remote-id>
 	</upstream>
diff --git a/dev-python/odo/metadata.xml b/dev-python/odo/metadata.xml
index bbfce266d3f9..c9e118dcce91 100644
--- a/dev-python/odo/metadata.xml
+++ b/dev-python/odo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">odo</remote-id>
     <remote-id type="github">ContinuumIO/odo</remote-id>
diff --git a/dev-python/oosuite/metadata.xml b/dev-python/oosuite/metadata.xml
index a661b5421854..cb657dd55b9e 100644
--- a/dev-python/oosuite/metadata.xml
+++ b/dev-python/oosuite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   The OpenOpt suite of Python packages contains the following modules:
   * openopt: universal numerical optimization package with
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index 22dd4e4633f7..532a117a9bcd 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   Openpyxl is a pure Python module to read/write Excel 2007 (OpenXML)
   xlsx/xlsm files.
diff --git a/dev-python/openstack-nose-plugin/metadata.xml b/dev-python/openstack-nose-plugin/metadata.xml
index 2187f9b909e0..61ac399e8351 100644
--- a/dev-python/openstack-nose-plugin/metadata.xml
+++ b/dev-python/openstack-nose-plugin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     openstack.nose_plugin provides a nose plugin that allow's nosetests output
 	to mimic the output of openstack's run_tests.py.
diff --git a/dev-python/optcomplete/metadata.xml b/dev-python/optcomplete/metadata.xml
index 7685e730d334..baa3858521d8 100644
--- a/dev-python/optcomplete/metadata.xml
+++ b/dev-python/optcomplete/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     This Python module aims at providing almost automatically shell completion
     for any Python program that already uses the optparse module.
diff --git a/dev-python/ordereddict/metadata.xml b/dev-python/ordereddict/metadata.xml
index 4c42f6a05cf7..436433ff04bb 100644
--- a/dev-python/ordereddict/metadata.xml
+++ b/dev-python/ordereddict/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6.
 	</longdescription>
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
index 4369f0dc28fc..3290d03e4da8 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Disk Config extension for python-novaclient
   </longdescription>
diff --git a/dev-python/os-networksv2-python-novaclient-ext/metadata.xml b/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
index 9991ef9522ad..341a67f0b4dd 100644
--- a/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Adds network extension support to python-novaclient
   </longdescription>
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml
index 4e679560300b..7753cb84badd 100644
--- a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Adds Virtual Interfaces support to python-novaclient
   </longdescription>
diff --git a/dev-python/oslo-concurrency/metadata.xml b/dev-python/oslo-concurrency/metadata.xml
index 8de0725b580a..65167f348201 100644
--- a/dev-python/oslo-concurrency/metadata.xml
+++ b/dev-python/oslo-concurrency/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes.
   </longdescription>
diff --git a/dev-python/oslo-config/metadata.xml b/dev-python/oslo-config/metadata.xml
index 71fd3c13f709..b47164a22064 100644
--- a/dev-python/oslo-config/metadata.xml
+++ b/dev-python/oslo-config/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     The Oslo configuration API supports parsing command line arguments.
 	Oslo also supports .ini style configuration files.
diff --git a/dev-python/oslo-context/metadata.xml b/dev-python/oslo-context/metadata.xml
index 511a7b2f8d1d..0663aa42f470 100644
--- a/dev-python/oslo-context/metadata.xml
+++ b/dev-python/oslo-context/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging
   </longdescription>
diff --git a/dev-python/oslo-db/metadata.xml b/dev-python/oslo-db/metadata.xml
index 35df51154681..05af5dd98e8a 100644
--- a/dev-python/oslo-db/metadata.xml
+++ b/dev-python/oslo-db/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	OpenStack Common DB Code
 	</longdescription>
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index d91740215fc9..5d3622b6785a 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/oslo-log/metadata.xml b/dev-python/oslo-log/metadata.xml
index 78bc1ad14f00..b6b9ba13e102 100644
--- a/dev-python/oslo-log/metadata.xml
+++ b/dev-python/oslo-log/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 OpenStack logging configuration library provides standardized configuration for all openstack projects.
 It also provides custom formatters, handlers and support for context specific logging (like resource id’s etc).
diff --git a/dev-python/oslo-messaging/metadata.xml b/dev-python/oslo-messaging/metadata.xml
index d885208542e6..21e5c4922062 100644
--- a/dev-python/oslo-messaging/metadata.xml
+++ b/dev-python/oslo-messaging/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
   </longdescription>
diff --git a/dev-python/oslo-middleware/metadata.xml b/dev-python/oslo-middleware/metadata.xml
index b9665513ba25..6f77c20c82e7 100644
--- a/dev-python/oslo-middleware/metadata.xml
+++ b/dev-python/oslo-middleware/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Oslo middleware library includes components that can be injected into wsgi pipelines to intercept request/response flows. The base class can be enhanced with functionality like add/delete/modification of http headers and support for limiting size/connection etc
   </longdescription>
diff --git a/dev-python/oslo-policy/metadata.xml b/dev-python/oslo-policy/metadata.xml
index e0f0463b6ffb..5ca4d17a7e6b 100644
--- a/dev-python/oslo-policy/metadata.xml
+++ b/dev-python/oslo-policy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
   </longdescription>
diff --git a/dev-python/oslo-rootwrap/metadata.xml b/dev-python/oslo-rootwrap/metadata.xml
index cfdefbb90e7e..6e31a84e0c0c 100644
--- a/dev-python/oslo-rootwrap/metadata.xml
+++ b/dev-python/oslo-rootwrap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services.
   </longdescription>
diff --git a/dev-python/oslo-serialization/metadata.xml b/dev-python/oslo-serialization/metadata.xml
index d046d5582843..aafaaa5ba3c0 100644
--- a/dev-python/oslo-serialization/metadata.xml
+++ b/dev-python/oslo-serialization/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
index be8e747352d4..615fd83a2816 100644
--- a/dev-python/oslo-sphinx/metadata.xml
+++ b/dev-python/oslo-sphinx/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Theme and extension support for Sphinx documentation from the OpenStack project.
   </longdescription>
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
index 9a4d5257d746..61c1abf89890 100644
--- a/dev-python/oslo-utils/metadata.xml
+++ b/dev-python/oslo-utils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/oslo-vmware/metadata.xml b/dev-python/oslo-vmware/metadata.xml
index b86dca4897a6..2a24b297352a 100644
--- a/dev-python/oslo-vmware/metadata.xml
+++ b/dev-python/oslo-vmware/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>openstack@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
   </longdescription>
diff --git a/dev-python/oslotest/metadata.xml b/dev-python/oslotest/metadata.xml
index acff0385e32d..9ec82e919bea 100644
--- a/dev-python/oslotest/metadata.xml
+++ b/dev-python/oslotest/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     OpenStack test framework and test fixtures
 	The oslotest package is cross-tested against its consuming projects to
diff --git a/dev-python/osprofiler/metadata.xml b/dev-python/osprofiler/metadata.xml
index 0960b3e8e578..151eecd2b14d 100644
--- a/dev-python/osprofiler/metadata.xml
+++ b/dev-python/osprofiler/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	OpenStack Profiler Library
 	</longdescription>
diff --git a/dev-python/pSQL/metadata.xml b/dev-python/pSQL/metadata.xml
index 361f5aeb05ee..4e3e6d4ec18b 100644
--- a/dev-python/pSQL/metadata.xml
+++ b/dev-python/pSQL/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>ercpe@gentoo.org</email>
     <name>Johann Schmitz</name>
   </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/packaging/metadata.xml b/dev-python/packaging/metadata.xml
index 2c7e5b66300c..fb612442b105 100644
--- a/dev-python/packaging/metadata.xml
+++ b/dev-python/packaging/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">packaging</remote-id>
 		<remote-id type="github">pypa/packaging</remote-id>
diff --git a/dev-python/paisley/metadata.xml b/dev-python/paisley/metadata.xml
index ead40ea006d1..90d7cb555f93 100644
--- a/dev-python/paisley/metadata.xml
+++ b/dev-python/paisley/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">paisley</remote-id>
 		<remote-id type="launchpad">paisley</remote-id>
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index b78ecc9eaeb1..f9e5d3724649 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Pandas is a Python package providing fast, flexible, and expressive
   data structures designed to make working with "relational" or
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 3684fd934053..1f708803d047 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
diff --git a/dev-python/parsedatetime/metadata.xml b/dev-python/parsedatetime/metadata.xml
index a228b5e1ed86..4c6b9ff9ae6e 100644
--- a/dev-python/parsedatetime/metadata.xml
+++ b/dev-python/parsedatetime/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">bear/parsedatetime</remote-id>
 	</upstream>
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index 67a9a00294cf..268b73443b1e 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     comprehensive password hashing framework supporting over 20 schemes
   </longdescription>
diff --git a/dev-python/passwordmeter/metadata.xml b/dev-python/passwordmeter/metadata.xml
index 67c270b6f0a7..043e8e023b0d 100644
--- a/dev-python/passwordmeter/metadata.xml
+++ b/dev-python/passwordmeter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">passwordmeter</remote-id>
 		<remote-id type="github">cadithealth/passwordmeter</remote-id>
diff --git a/dev-python/paste/metadata.xml b/dev-python/paste/metadata.xml
index 60a4c1835023..fc2b266fbbc5 100644
--- a/dev-python/paste/metadata.xml
+++ b/dev-python/paste/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="flup">enable support for flup (and therefore for various
 		wgsi servers and middleware)</flag>
diff --git a/dev-python/pastedeploy/metadata.xml b/dev-python/pastedeploy/metadata.xml
index 12e6c22fb53d..7c4d8f5b11d4 100644
--- a/dev-python/pastedeploy/metadata.xml
+++ b/dev-python/pastedeploy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Paste Deployment is a system for finding and configuring WSGI applications
 	and servers. For WSGI application consumers it provides a single, simple
 	function (loadapp) for loading a WSGI application from a configuration file
diff --git a/dev-python/pastescript/metadata.xml b/dev-python/pastescript/metadata.xml
index 6b387078e551..72d6c05013a9 100644
--- a/dev-python/pastescript/metadata.xml
+++ b/dev-python/pastescript/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PasteScript</remote-id>
   </upstream>
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path-py/metadata.xml
index d1a9051ef223..17bf45e656ab 100644
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">path.py</remote-id>
     <remote-id type="github">jaraco/path.py</remote-id>
diff --git a/dev-python/pathlib/metadata.xml b/dev-python/pathlib/metadata.xml
index 71126cde3058..8eacd2a31dda 100644
--- a/dev-python/pathlib/metadata.xml
+++ b/dev-python/pathlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pathlib</remote-id>
 	</upstream>
diff --git a/dev-python/patsy/metadata.xml b/dev-python/patsy/metadata.xml
index 5296bb5bc086..5c2e8af8324a 100644
--- a/dev-python/patsy/metadata.xml
+++ b/dev-python/patsy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
   A Python package for describing statistical models and for building
   design matrices. It is closely inspired by and compatible with the
diff --git a/dev-python/paver/metadata.xml b/dev-python/paver/metadata.xml
index eacac6c8f0d0..fee590effa42 100644
--- a/dev-python/paver/metadata.xml
+++ b/dev-python/paver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Paver</remote-id>
     <remote-id type="github">paver/paver</remote-id>
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index b987fb894b5c..4ebf46d8bada 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pbkdf2</remote-id>
   </upstream>
diff --git a/dev-python/pbr/metadata.xml b/dev-python/pbr/metadata.xml
index bbc246e7b750..a1179c6bd071 100644
--- a/dev-python/pbr/metadata.xml
+++ b/dev-python/pbr/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     Python Build Reasonableness
 	PBR is a library that injects some useful and sensible default behaviors into your setuptools run.
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index eae3ef7aec24..796deba9d1ba 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pdfrw</remote-id>
 		<remote-id type="github">pmaupin/pdfrw</remote-id>
diff --git a/dev-python/pdoc/metadata.xml b/dev-python/pdoc/metadata.xml
index dc4835843a34..8de3a9f833e0 100644
--- a/dev-python/pdoc/metadata.xml
+++ b/dev-python/pdoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/peak-rules/metadata.xml b/dev-python/peak-rules/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/peak-rules/metadata.xml
+++ b/dev-python/peak-rules/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/peewee/metadata.xml b/dev-python/peewee/metadata.xml
index dfaea1228fe1..5fb3990c4f46 100644
--- a/dev-python/peewee/metadata.xml
+++ b/dev-python/peewee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">coleifer/peewee</remote-id>
   </upstream>
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
index 3be2d3b02ee5..5907bdc72898 100644
--- a/dev-python/pep8/metadata.xml
+++ b/dev-python/pep8/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pep8</remote-id>
     <remote-id type="github">jcrocholl/pep8</remote-id>
diff --git a/dev-python/peppercorn/metadata.xml b/dev-python/peppercorn/metadata.xml
index 0d46aa06c986..dd53a735babd 100644
--- a/dev-python/peppercorn/metadata.xml
+++ b/dev-python/peppercorn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">peppercorn</remote-id>
     <remote-id type="github">Pylons/peppercorn</remote-id>
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
index 4342adeb1f1e..d9120656b898 100644
--- a/dev-python/pexpect/metadata.xml
+++ b/dev-python/pexpect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pexpect</remote-id>
     <remote-id type="github">pexpect/pexpect</remote-id>
diff --git a/dev-python/pgasync/metadata.xml b/dev-python/pgasync/metadata.xml
index 664c1a06cc54..73350e4cdebf 100644
--- a/dev-python/pgasync/metadata.xml
+++ b/dev-python/pgasync/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pgmagick/metadata.xml b/dev-python/pgmagick/metadata.xml
index 961ad9f0991c..10935b4dcc90 100644
--- a/dev-python/pgmagick/metadata.xml
+++ b/dev-python/pgmagick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pgmagick</remote-id>
 		<remote-id type="bitbucket">hhatto/pgmagick</remote-id>
diff --git a/dev-python/pgpdump/metadata.xml b/dev-python/pgpdump/metadata.xml
index 3fb0d3fd7af9..d7fa3021105f 100644
--- a/dev-python/pgpdump/metadata.xml
+++ b/dev-python/pgpdump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pgpdump</remote-id>
     <remote-id type="github">toofishes/python-pgpdump</remote-id>
diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
index ea703f9fdaee..6e4a88dc9f9f 100644
--- a/dev-python/pickleshare/metadata.xml
+++ b/dev-python/pickleshare/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Like shelve, a PickleShareDB object acts like a normal dictionary.
     Unlike shelve, many processes can access the database
diff --git a/dev-python/pid/metadata.xml b/dev-python/pid/metadata.xml
index e506309dc74d..5bb650041659 100644
--- a/dev-python/pid/metadata.xml
+++ b/dev-python/pid/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pid</remote-id>
   </upstream>
diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml
index fa6e0500f8c7..9149e90b4656 100644
--- a/dev-python/piddle/metadata.xml
+++ b/dev-python/piddle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 PIDDLE is a Python module for creating two-dimensional graphics in a
 manner that is both cross-platform and cross-media; that is, it can
diff --git a/dev-python/pika/metadata.xml b/dev-python/pika/metadata.xml
index a0484b5114c6..ccaab35d2349 100644
--- a/dev-python/pika/metadata.xml
+++ b/dev-python/pika/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>Pika is a pure-Python implementation of the AMQP 0-9-1 protocol that tries to stay fairly independent of the underlying network support library. Pika was developed primarily for use with RabbitMQ, but should also work with other AMQP 0-9-1 brokers.</longdescription>
   <upstream>
     <remote-id type="pypi">pika</remote-id>
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index 848581db03a4..31f219b35a1f 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="webp">Enable support for webp image format.</flag>
   </use>
diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml
index 91d90ee478ae..3ae510e48d2b 100644
--- a/dev-python/pillowfight/metadata.xml
+++ b/dev-python/pillowfight/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">beanbaginc/pillowfight</remote-id>
     <remote-id type="pypi">pillowfight</remote-id>
diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml
index 183e12f9a072..4e2165c75754 100644
--- a/dev-python/pip/metadata.xml
+++ b/dev-python/pip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pip</remote-id>
     <remote-id type="github">pypa/pip</remote-id>
diff --git a/dev-python/pkgconfig/metadata.xml b/dev-python/pkgconfig/metadata.xml
index d726210dbd46..4c65ba122012 100644
--- a/dev-python/pkgconfig/metadata.xml
+++ b/dev-python/pkgconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pkgconfig</remote-id>
     <remote-id type="github">matze/pkgconfig</remote-id>
diff --git a/dev-python/pkginfo/metadata.xml b/dev-python/pkginfo/metadata.xml
index 4bd145235c72..d5c1d2268dba 100644
--- a/dev-python/pkginfo/metadata.xml
+++ b/dev-python/pkginfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pkginfo</remote-id>
   </upstream>
diff --git a/dev-python/pkipplib/metadata.xml b/dev-python/pkipplib/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pkipplib/metadata.xml
+++ b/dev-python/pkipplib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/placefinder/metadata.xml b/dev-python/placefinder/metadata.xml
index 7f97fccc20fc..7423d3672bcb 100644
--- a/dev-python/placefinder/metadata.xml
+++ b/dev-python/placefinder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">placefinder-py</remote-id>
     <remote-id type="github">adampresley/placefinder-py</remote-id>
diff --git a/dev-python/platinfo/metadata.xml b/dev-python/platinfo/metadata.xml
index 7b85f99ef402..054fab4ab141 100644
--- a/dev-python/platinfo/metadata.xml
+++ b/dev-python/platinfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		This is a small Python module that determines and returns standardized
 		names for platforms, where the "standard" is Trent Mick's reasoning :)
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
index d9daaefd1772..f9fef2322cce 100644
--- a/dev-python/plumbum/metadata.xml
+++ b/dev-python/plumbum/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A library for shell script-like programs in python,
     attempting to mimic the shell syntax (shell combinators) where it makes sense,
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 3548cd63e6c3..a113d17bb732 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 PLY is a Python-only implementation of the popular compiler construction
 tools lex and yacc. The implementation borrows ideas from a number of
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
index 0605aa6c4353..c1c05e445845 100644
--- a/dev-python/plyr/metadata.xml
+++ b/dev-python/plyr/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
@@ -11,6 +9,14 @@
     <name>Witold Piłat</name>
     <description>Proxy maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sahib/python-glyr</remote-id>
   </upstream>
diff --git a/dev-python/plyvel/metadata.xml b/dev-python/plyvel/metadata.xml
index 55fd330e1a3e..19a27dc3ee6d 100644
--- a/dev-python/plyvel/metadata.xml
+++ b/dev-python/plyvel/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">plyvel</remote-id>
 		<remote-id type="bitbucket">wbolster/plyvel</remote-id>
diff --git a/dev-python/pmw/metadata.xml b/dev-python/pmw/metadata.xml
index 3d154b2d2a84..0f5e001e0f13 100644
--- a/dev-python/pmw/metadata.xml
+++ b/dev-python/pmw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pmw</remote-id>
     <remote-id type="sourceforge">pmw</remote-id>
diff --git a/dev-python/polygon/metadata.xml b/dev-python/polygon/metadata.xml
index 9754f81c78b5..300df7a7daa3 100644
--- a/dev-python/polygon/metadata.xml
+++ b/dev-python/polygon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription lang="en">
   Polygon is a python package that handles polygonal shapes in 2D. It contains 
   Python bindings for gpc, the General Polygon Clipping Library by 
diff --git a/dev-python/posix_ipc/metadata.xml b/dev-python/posix_ipc/metadata.xml
index 12f81c32d1bf..481ad52d2dc2 100644
--- a/dev-python/posix_ipc/metadata.xml
+++ b/dev-python/posix_ipc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	POSIX IPC primitives (semaphores, shared memory and message queues) for Python
 	</longdescription>
diff --git a/dev-python/pp/metadata.xml b/dev-python/pp/metadata.xml
index d95e954c9ea7..fc5e023b4067 100644
--- a/dev-python/pp/metadata.xml
+++ b/dev-python/pp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   PP is a python module which provides mechanism for parallel
   execution of python code on SMP (systems with multiple processors or
diff --git a/dev-python/pretend/metadata.xml b/dev-python/pretend/metadata.xml
index d9c43ee47ef8..50744b4bd940 100644
--- a/dev-python/pretend/metadata.xml
+++ b/dev-python/pretend/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pretend</remote-id>
     <remote-id type="github">alex/pretend</remote-id>
diff --git a/dev-python/pretty-yaml/metadata.xml b/dev-python/pretty-yaml/metadata.xml
index 4eb0ed72e473..66af332a1151 100644
--- a/dev-python/pretty-yaml/metadata.xml
+++ b/dev-python/pretty-yaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyaml</remote-id>
     <remote-id type="github">mk-fg/pretty-yaml</remote-id>
diff --git a/dev-python/prettytable/metadata.xml b/dev-python/prettytable/metadata.xml
index 70d493aab966..1ac197190676 100644
--- a/dev-python/prettytable/metadata.xml
+++ b/dev-python/prettytable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">prettytable</remote-id>
     <remote-id type="pypi">PrettyTable</remote-id>
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
index fa0f6de04213..2e1c1b298eb9 100644
--- a/dev-python/process-tests/metadata.xml
+++ b/dev-python/process-tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/processing/metadata.xml b/dev-python/processing/metadata.xml
index 7e66f50bca02..8ca52b730af5 100644
--- a/dev-python/processing/metadata.xml
+++ b/dev-python/processing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">processing</remote-id>
 	</upstream>
diff --git a/dev-python/progress/metadata.xml b/dev-python/progress/metadata.xml
index ff5859951d4b..28aeac61282f 100644
--- a/dev-python/progress/metadata.xml
+++ b/dev-python/progress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">progress</remote-id>
 		<remote-id type="github">verigak/progress</remote-id>
diff --git a/dev-python/progressbar/metadata.xml b/dev-python/progressbar/metadata.xml
index fe5274bb9ce5..eb3f48a00cc3 100644
--- a/dev-python/progressbar/metadata.xml
+++ b/dev-python/progressbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">python-progressbar</remote-id>
   </upstream>
diff --git a/dev-python/promise/metadata.xml b/dev-python/promise/metadata.xml
index 54bf1e04ffd8..de7f8cde27f2 100644
--- a/dev-python/promise/metadata.xml
+++ b/dev-python/promise/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">promise</remote-id>
     <remote-id type="github">rfk/promise</remote-id>
diff --git a/dev-python/prompt_toolkit/metadata.xml b/dev-python/prompt_toolkit/metadata.xml
index 914a986c0b1c..964cacec2e9a 100644
--- a/dev-python/prompt_toolkit/metadata.xml
+++ b/dev-python/prompt_toolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">prompt_toolkit</remote-id>
     <remote-id type="github">jonathanslenders/python-prompt-toolkit</remote-id>
diff --git a/dev-python/protorpc/metadata.xml b/dev-python/protorpc/metadata.xml
index 20a58d91a282..e62144741cb4 100644
--- a/dev-python/protorpc/metadata.xml
+++ b/dev-python/protorpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">google/protorpc</remote-id>
     <remote-id type="pypi">protorpc</remote-id>
diff --git a/dev-python/pssi/metadata.xml b/dev-python/pssi/metadata.xml
index 2ed81f2fca34..582849db0be6 100644
--- a/dev-python/pssi/metadata.xml
+++ b/dev-python/pssi/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pssi</remote-id>
 		<remote-id type="github">Eric-Bourry/pssi</remote-id>
diff --git a/dev-python/psutil/metadata.xml b/dev-python/psutil/metadata.xml
index 38e5b2d54f7d..54859e483550 100644
--- a/dev-python/psutil/metadata.xml
+++ b/dev-python/psutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">psutil</remote-id>
     <remote-id type="github">giampaolo/psutil</remote-id>
diff --git a/dev-python/psycopg/metadata.xml b/dev-python/psycopg/metadata.xml
index ff3e2390552d..ef72cf5d8938 100644
--- a/dev-python/psycopg/metadata.xml
+++ b/dev-python/psycopg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">psycopg2</remote-id>
   </upstream>
diff --git a/dev-python/ptpython/metadata.xml b/dev-python/ptpython/metadata.xml
index 912d470c1ef4..9477f7e545f6 100644
--- a/dev-python/ptpython/metadata.xml
+++ b/dev-python/ptpython/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ptpython</remote-id>
     <remote-id type="github">jonathanslenders/ptpython</remote-id>
diff --git a/dev-python/ptyprocess/metadata.xml b/dev-python/ptyprocess/metadata.xml
index 3393616794da..6ea42d32fd0d 100644
--- a/dev-python/ptyprocess/metadata.xml
+++ b/dev-python/ptyprocess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ptyprocess</remote-id>
     <remote-id type="github">pexpect/ptyprocess</remote-id>
diff --git a/dev-python/pudb/metadata.xml b/dev-python/pudb/metadata.xml
index 9031f0b5e0ca..c16d69aeac7f 100644
--- a/dev-python/pudb/metadata.xml
+++ b/dev-python/pudb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>A full-screen, console-based Python debugger</longdescription>
 	<upstream>
 		<remote-id type="pypi">pudb</remote-id>
diff --git a/dev-python/pudge/metadata.xml b/dev-python/pudge/metadata.xml
index cd1625bb6e82..dc4e77cb999f 100644
--- a/dev-python/pudge/metadata.xml
+++ b/dev-python/pudge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pudge</remote-id>
 	</upstream>
diff --git a/dev-python/pupynere/metadata.xml b/dev-python/pupynere/metadata.xml
index 4b41f58210e1..a3d19c86e33a 100644
--- a/dev-python/pupynere/metadata.xml
+++ b/dev-python/pupynere/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">Pupynere is a Python module for reading and writing NetCDF files,
     using the same API as Scientific.IO.NetCDF and pynetcdf.</longdescription>
 	<upstream>
diff --git a/dev-python/pxml/metadata.xml b/dev-python/pxml/metadata.xml
index fa0f6de04213..2e1c1b298eb9 100644
--- a/dev-python/pxml/metadata.xml
+++ b/dev-python/pxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/py-amqp/metadata.xml b/dev-python/py-amqp/metadata.xml
index 46b58f8ceb3c..d0bfa80c625c 100644
--- a/dev-python/py-amqp/metadata.xml
+++ b/dev-python/py-amqp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="extras">Install extra tools to generate initial Python mod
 		from an AMQP XML file</flag>
diff --git a/dev-python/py-bcrypt/metadata.xml b/dev-python/py-bcrypt/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/py-bcrypt/metadata.xml
+++ b/dev-python/py-bcrypt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
index a88cb1e4f213..be614d7a41ab 100644
--- a/dev-python/py-gfm/metadata.xml
+++ b/dev-python/py-gfm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">google/py-gfm</remote-id>
 </upstream>
diff --git a/dev-python/py-notify/metadata.xml b/dev-python/py-notify/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/py-notify/metadata.xml
+++ b/dev-python/py-notify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/py-smbpasswd/metadata.xml b/dev-python/py-smbpasswd/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/py-smbpasswd/metadata.xml
+++ b/dev-python/py-smbpasswd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/py-xmlrpc/metadata.xml b/dev-python/py-xmlrpc/metadata.xml
index c36840f9176b..44d30b823688 100644
--- a/dev-python/py-xmlrpc/metadata.xml
+++ b/dev-python/py-xmlrpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">py-xmlrpc</remote-id>
 	</upstream>
diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
index a5dad3defd79..d061bbaac997 100644
--- a/dev-python/py/metadata.xml
+++ b/dev-python/py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">py</remote-id>
   </upstream>
diff --git a/dev-python/py2neo/metadata.xml b/dev-python/py2neo/metadata.xml
index 2e7e33c43468..576c17a333ab 100644
--- a/dev-python/py2neo/metadata.xml
+++ b/dev-python/py2neo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">py2neo</remote-id>
 	</upstream>
diff --git a/dev-python/py2play/metadata.xml b/dev-python/py2play/metadata.xml
index 9b2fd781c1d0..bae13e5d8be0 100644
--- a/dev-python/py2play/metadata.xml
+++ b/dev-python/py2play/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>games</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyGPG/metadata.xml b/dev-python/pyGPG/metadata.xml
index 084a922fc0b0..f08836146a7b 100644
--- a/dev-python/pyGPG/metadata.xml
+++ b/dev-python/pyGPG/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<longdescription>A python interface library for wrapping gnupg's gpg command.
 		It also connects to gpg's status-fd output and makes all the status data
 		available as subclassed namedtuple instances.
diff --git a/dev-python/pyPdf/metadata.xml b/dev-python/pyPdf/metadata.xml
index 498c8a4babfb..a0554723dc32 100644
--- a/dev-python/pyPdf/metadata.xml
+++ b/dev-python/pyPdf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     A Pure-Python library built as a PDF toolkit. It is capable of:
     * extracting document information (title, author, ...),
diff --git a/dev-python/pyalsa/metadata.xml b/dev-python/pyalsa/metadata.xml
index c4c2070030e4..20d2d8408e67 100644
--- a/dev-python/pyalsa/metadata.xml
+++ b/dev-python/pyalsa/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>alsa</herd>
-<herd>python</herd>
+<maintainer>
+	<email>alsa-bugs@gentoo.org</email>
+	<name>Gentoo ALSA Project</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyalsaaudio/metadata.xml b/dev-python/pyalsaaudio/metadata.xml
index 3715bb37fcca..09a8281f503a 100644
--- a/dev-python/pyalsaaudio/metadata.xml
+++ b/dev-python/pyalsaaudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyalsaaudio</remote-id>
 		<remote-id type="sourceforge">pyalsaaudio</remote-id>
diff --git a/dev-python/pyamazon/metadata.xml b/dev-python/pyamazon/metadata.xml
index 414a5eeccf59..c2e8f65d74b5 100644
--- a/dev-python/pyamazon/metadata.xml
+++ b/dev-python/pyamazon/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyamf/metadata.xml b/dev-python/pyamf/metadata.xml
index b190388f8ae2..b484a57b15a6 100644
--- a/dev-python/pyamf/metadata.xml
+++ b/dev-python/pyamf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hydralabs/pyamf</remote-id>
 		<remote-id type="pypi">PyAMF</remote-id>
diff --git a/dev-python/pyamg/metadata.xml b/dev-python/pyamg/metadata.xml
index dc8de417402f..3dc7d2b7c04a 100644
--- a/dev-python/pyamg/metadata.xml
+++ b/dev-python/pyamg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   PyAMG is a library of Algebraic Multigrid (AMG) solvers with a
   Python interface.
diff --git a/dev-python/pyao/metadata.xml b/dev-python/pyao/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyao/metadata.xml
+++ b/dev-python/pyao/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index a9d9baa85472..f29b4da2d29e 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyasn1-modules</remote-id>
     <remote-id type="sourceforge">pyasn1</remote-id>
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index 96fdefbafe70..121c4aebe0be 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyasn1</remote-id>
     <remote-id type="sourceforge">pyasn1</remote-id>
diff --git a/dev-python/pyatspi/metadata.xml b/dev-python/pyatspi/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/dev-python/pyatspi/metadata.xml
+++ b/dev-python/pyatspi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyaudio/metadata.xml b/dev-python/pyaudio/metadata.xml
index c1096494e794..31e6c08780fc 100644
--- a/dev-python/pyaudio/metadata.xml
+++ b/dev-python/pyaudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		PyAudio provides Python bindings for PortAudio (media-libs/portaudio),
 		the cross-platform audio I/O library.
diff --git a/dev-python/pyavm/metadata.xml b/dev-python/pyavm/metadata.xml
index b0e9feda2056..cc40ec9a0bd8 100644
--- a/dev-python/pyavm/metadata.xml
+++ b/dev-python/pyavm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   PyAVM is a module to represent, read, and write metadata following
   the Astronomy Visualization Metadata (AVM) standard.
diff --git a/dev-python/pybloomfiltermmap/metadata.xml b/dev-python/pybloomfiltermmap/metadata.xml
index 74c0e96c61bd..d2b0e1c05c2d 100644
--- a/dev-python/pybloomfiltermmap/metadata.xml
+++ b/dev-python/pybloomfiltermmap/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>clabbe.montjoie@gmail.com</email>
 		<name>LABBE Corentin (Montjoie)</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
index 04b90bd9fa3c..8cfe0ad71a8d 100644
--- a/dev-python/pybluez/metadata.xml
+++ b/dev-python/pybluez/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
 developers to use system bluetooth resources. It works on machines running the
 GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
diff --git a/dev-python/pycadf/metadata.xml b/dev-python/pycadf/metadata.xml
index ce24edf446a0..add9bb415adb 100644
--- a/dev-python/pycadf/metadata.xml
+++ b/dev-python/pycadf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     python implementation of DMTF Cloud Audit (CADF) data model
   </longdescription>
diff --git a/dev-python/pycairo/metadata.xml b/dev-python/pycairo/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/pycairo/metadata.xml
+++ b/dev-python/pycairo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pycanberra/metadata.xml b/dev-python/pycanberra/metadata.xml
index 76493836e911..c90d8c8a8978 100644
--- a/dev-python/pycanberra/metadata.xml
+++ b/dev-python/pycanberra/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>python</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">psykoyiko/pycanberra</remote-id>
   </upstream>
diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
index 287b2e45b07c..f1a18e81df3e 100644
--- a/dev-python/pycapnp/metadata.xml
+++ b/dev-python/pycapnp/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pycapnp</remote-id>
   </upstream>
diff --git a/dev-python/pycdf/metadata.xml b/dev-python/pycdf/metadata.xml
index ed85ab12b1bc..2069e5d2ca3e 100644
--- a/dev-python/pycdf/metadata.xml
+++ b/dev-python/pycdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pysclint</remote-id>
 	</upstream>
diff --git a/dev-python/pycdio/metadata.xml b/dev-python/pycdio/metadata.xml
index 23ae40d39515..f1c154e22c2f 100644
--- a/dev-python/pycdio/metadata.xml
+++ b/dev-python/pycdio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">The pycdio (and libcdio) libraries encapsulate CD-ROM reading and
 		control. Python programs wishing to be oblivious of the OS- and
 		device-dependent properties of a CD-ROM can use this library.</longdescription>
diff --git a/dev-python/pychart/metadata.xml b/dev-python/pychart/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pychart/metadata.xml
+++ b/dev-python/pychart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pychecker/metadata.xml b/dev-python/pychecker/metadata.xml
index 1ed01a6dd62d..ef5ce577d92d 100644
--- a/dev-python/pychecker/metadata.xml
+++ b/dev-python/pychecker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pychecker</remote-id>
 	</upstream>
diff --git a/dev-python/pychef/metadata.xml b/dev-python/pychef/metadata.xml
index 6e72a706ec1e..76e8a8d9f3e0 100644
--- a/dev-python/pychef/metadata.xml
+++ b/dev-python/pychef/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     A Python API for interacting with a Chef server.
   </longdescription>
diff --git a/dev-python/pychm/metadata.xml b/dev-python/pychm/metadata.xml
index 9ddd1c3a5b12..a0fd49b50fd8 100644
--- a/dev-python/pychm/metadata.xml
+++ b/dev-python/pychm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 The chm package provides three modules, chm, chmlib and extra, which
 provide access to the API implemented by the C library chmlib and some
diff --git a/dev-python/pycipher/metadata.xml b/dev-python/pycipher/metadata.xml
index 2ac3f1d437fe..d9cf1a119166 100644
--- a/dev-python/pycipher/metadata.xml
+++ b/dev-python/pycipher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pycipher</remote-id>
 	</upstream>
diff --git a/dev-python/pyclamav/metadata.xml b/dev-python/pyclamav/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pyclamav/metadata.xml
+++ b/dev-python/pyclamav/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml
index 4f43dbf23fe8..8f532d2ed38f 100644
--- a/dev-python/pyclimate/metadata.xml
+++ b/dev-python/pyclimate/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
  A package designed to accomplish some usual tasks during the analysis of 
  climate variability using Python. It provides functions to perform some 
diff --git a/dev-python/pycmd/metadata.xml b/dev-python/pycmd/metadata.xml
index 78a66191b6b4..f38260825d4d 100644
--- a/dev-python/pycmd/metadata.xml
+++ b/dev-python/pycmd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pycmd</remote-id>
 	</upstream>
diff --git a/dev-python/pyconstruct/metadata.xml b/dev-python/pyconstruct/metadata.xml
index 1900fbbcd35d..e4afdba15896 100644
--- a/dev-python/pyconstruct/metadata.xml
+++ b/dev-python/pyconstruct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">construct</remote-id>
 	</upstream>
diff --git a/dev-python/pycountry/metadata.xml b/dev-python/pycountry/metadata.xml
index b170fed1253d..fc3599502bbf 100644
--- a/dev-python/pycountry/metadata.xml
+++ b/dev-python/pycountry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">ISO country, subdivision, language, currency and script definitions and
 		their translations</longdescription>
 	<upstream>
diff --git a/dev-python/pycparser/metadata.xml b/dev-python/pycparser/metadata.xml
index 3e51ef091666..362340128b78 100644
--- a/dev-python/pycparser/metadata.xml
+++ b/dev-python/pycparser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pycparser</remote-id>
     <remote-id type="github">eliben/pycparser</remote-id>
diff --git a/dev-python/pycrypto/metadata.xml b/dev-python/pycrypto/metadata.xml
index 15b44a0ae34f..594e3f4a8a3d 100644
--- a/dev-python/pycrypto/metadata.xml
+++ b/dev-python/pycrypto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 The Python Cryptography Toolkit is a collection of cryptographic
 algorithms and protocols, implemented for use from Python. Among
diff --git a/dev-python/pycryptopp/metadata.xml b/dev-python/pycryptopp/metadata.xml
index de28f2cd2c7b..223ec2ded07f 100644
--- a/dev-python/pycryptopp/metadata.xml
+++ b/dev-python/pycryptopp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pycryptopp</remote-id>
 	</upstream>
diff --git a/dev-python/pycuda/metadata.xml b/dev-python/pycuda/metadata.xml
index 858a4b6936dd..95379aa89a15 100644
--- a/dev-python/pycuda/metadata.xml
+++ b/dev-python/pycuda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pycuda</remote-id>
   </upstream>
diff --git a/dev-python/pycups/metadata.xml b/dev-python/pycups/metadata.xml
index 18260a405bb4..7b34fcf984ae 100644
--- a/dev-python/pycups/metadata.xml
+++ b/dev-python/pycups/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>printing</herd>
   <maintainer>
     <email>reavertm@gentoo.org</email>
     <name>Maciej Mrozowski</name>
   </maintainer>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pycups</remote-id>
   </upstream>
diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
index a560f37eab85..8e675e299a62 100644
--- a/dev-python/pycurl/metadata.xml
+++ b/dev-python/pycurl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 PycURL is a Python interface to libcurl. PycURL can be used to fetch
 objects identified by a URL from a Python program, similar to the urllib
diff --git a/dev-python/pycxx/metadata.xml b/dev-python/pycxx/metadata.xml
index 6ed1f5edceb1..1fcf9343c095 100644
--- a/dev-python/pycxx/metadata.xml
+++ b/dev-python/pycxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     PyCXX is a set of C++ facilities to make it easier to write Python
     extensions.  The chief way in which PyCXX makes it easier to write
diff --git a/dev-python/pydb/metadata.xml b/dev-python/pydb/metadata.xml
index bfa2bf74f9b0..b3a4616a31ec 100644
--- a/dev-python/pydb/metadata.xml
+++ b/dev-python/pydb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Extended python debugger</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bashdb</remote-id>
diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml
index 6dc7c317f900..cb39ca853d06 100644
--- a/dev-python/pydecomp/metadata.xml
+++ b/dev-python/pydecomp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tools-portage</herd>
 	<maintainer>
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer>
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
 	<longdescription>A python interface library for common compression ,
 		decompression and contents generation.  It aims to create a simple,
 		easily extended and configurable common interface to various compressison
diff --git a/dev-python/pydiff/metadata.xml b/dev-python/pydiff/metadata.xml
index eae4cd3cc844..646dee442264 100644
--- a/dev-python/pydiff/metadata.xml
+++ b/dev-python/pydiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pydiff</remote-id>
     <remote-id type="github">myint/pydiff</remote-id>
diff --git a/dev-python/pydispatcher/metadata.xml b/dev-python/pydispatcher/metadata.xml
index 865be7da569c..a4b161683e9b 100644
--- a/dev-python/pydispatcher/metadata.xml
+++ b/dev-python/pydispatcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PyDispatcher</remote-id>
     <remote-id type="sourceforge">pydispatcher</remote-id>
diff --git a/dev-python/pydns/metadata.xml b/dev-python/pydns/metadata.xml
index a565bffda0ea..98ab1fba6bfc 100644
--- a/dev-python/pydns/metadata.xml
+++ b/dev-python/pydns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">PyDNS provides a module for performing DNS queries from python
 		applications. This was originally based on Guido van Rossum's DNS
 		library code, but has drifted further and further away from it over
diff --git a/dev-python/pyds/metadata.xml b/dev-python/pyds/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyds/metadata.xml
+++ b/dev-python/pyds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyds9/metadata.xml b/dev-python/pyds9/metadata.xml
index b1a88710b3d0..6d48d94d9148 100644
--- a/dev-python/pyds9/metadata.xml
+++ b/dev-python/pyds9/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   The XPA messaging system provides seamless communication between
   many kinds of Unix programs, including Tcl/Tk programs such as
diff --git a/dev-python/pydvdread/metadata.xml b/dev-python/pydvdread/metadata.xml
index af0bf6021f10..cbd9e8e25c36 100644
--- a/dev-python/pydvdread/metadata.xml
+++ b/dev-python/pydvdread/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pydvdread</remote-id>
 	</upstream>
diff --git a/dev-python/pyee/metadata.xml b/dev-python/pyee/metadata.xml
index 102f97035020..2f68ef84db76 100644
--- a/dev-python/pyee/metadata.xml
+++ b/dev-python/pyee/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyee</remote-id>
   </upstream>
diff --git a/dev-python/pyelemental/metadata.xml b/dev-python/pyelemental/metadata.xml
index b6b1bfeaddfb..f5501b8f24b1 100644
--- a/dev-python/pyelemental/metadata.xml
+++ b/dev-python/pyelemental/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">gelemental</remote-id>
 	</upstream>
diff --git a/dev-python/pyelftools/metadata.xml b/dev-python/pyelftools/metadata.xml
index ec397e2251e1..42feb8241ddc 100644
--- a/dev-python/pyelftools/metadata.xml
+++ b/dev-python/pyelftools/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyelftools</remote-id>
 		<remote-id type="github">eliben/pyelftools</remote-id>
diff --git a/dev-python/pyemf/metadata.xml b/dev-python/pyemf/metadata.xml
index 6de9012edfeb..81a3c00916a8 100644
--- a/dev-python/pyemf/metadata.xml
+++ b/dev-python/pyemf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
   pyemf is a pure python module that provides a cross-platform ability
   to generate enhanced metafiles (.emf files), a vector graphics
diff --git a/dev-python/pyenchant/metadata.xml b/dev-python/pyenchant/metadata.xml
index eab3acf9a02e..4dbc917a544e 100644
--- a/dev-python/pyenchant/metadata.xml
+++ b/dev-python/pyenchant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">PyEnchant is a set of language bindings and some wrapper classes to
 		make the excellent Enchant spellchecker available as a Python
 		module. The bindings are generated using SWIG. It includes all the
diff --git a/dev-python/pyev/metadata.xml b/dev-python/pyev/metadata.xml
index 8f4c7f40ad14..72bc9078388f 100644
--- a/dev-python/pyev/metadata.xml
+++ b/dev-python/pyev/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	 Pyev is the python interface of <pkg>dev-libs/libev</pkg>
 	 which provides event loop, support select, poll, the
diff --git a/dev-python/pyface/metadata.xml b/dev-python/pyface/metadata.xml
index 9acace48f165..226d1dfd084f 100644
--- a/dev-python/pyface/metadata.xml
+++ b/dev-python/pyface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   The pyface project contains a toolkit-independent GUI abstraction
   layer, which is used to support the "visualization" features of the
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/pyfeyn/metadata.xml
index ce523852f6d8..41de3426b900 100644
--- a/dev-python/pyfeyn/metadata.xml
+++ b/dev-python/pyfeyn/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Python package for drawing Feynman diagrams
 	</longdescription>
 	<upstream>
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
index af0cd001939c..befb718c1200 100644
--- a/dev-python/pyfits/metadata.xml
+++ b/dev-python/pyfits/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   PyFITS provides an interface to FITS formatted files under the
   Python scripting language and PyRAF, the Python-based interface to
diff --git a/dev-python/pyflakes/metadata.xml b/dev-python/pyflakes/metadata.xml
index 8336e0332203..81038fda398c 100644
--- a/dev-python/pyflakes/metadata.xml
+++ b/dev-python/pyflakes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>PyFlakes is a Lint-like tool for Python, like PyChecker. It is
   focused on identifying common errors quickly without executing
   Python code.
diff --git a/dev-python/pyflann/metadata.xml b/dev-python/pyflann/metadata.xml
index c792cc216478..facc750fb3b8 100644
--- a/dev-python/pyflann/metadata.xml
+++ b/dev-python/pyflann/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   FLANN is a library for performing fast approximate nearest neighbor
   searches in high dimensional spaces. It contains a collection of
diff --git a/dev-python/pyfltk/metadata.xml b/dev-python/pyfltk/metadata.xml
index cba14006000b..f3dc641eb605 100644
--- a/dev-python/pyfltk/metadata.xml
+++ b/dev-python/pyfltk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
   Python wrapper for the Fast Light Tool Kit cross-platform graphical
   user-interface library, using SWIG.
diff --git a/dev-python/pyformance/metadata.xml b/dev-python/pyformance/metadata.xml
index 1b848eb383ae..e2649f021c50 100644
--- a/dev-python/pyformance/metadata.xml
+++ b/dev-python/pyformance/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">pyformance</remote-id>
 		<remote-id type="github">omergertel/pyformance</remote-id>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyftpdlib/metadata.xml b/dev-python/pyftpdlib/metadata.xml
index 12b46e228600..7fc8df5364ee 100644
--- a/dev-python/pyftpdlib/metadata.xml
+++ b/dev-python/pyftpdlib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>phajdan.jr@gentoo.org</email>
     <name>Pawel Hajdan jr</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">pyftpdlib</remote-id>
     <remote-id type="pypi">pyftpdlib</remote-id>
diff --git a/dev-python/pygal/metadata.xml b/dev-python/pygal/metadata.xml
index 7fd8d91b4830..f73ece791c11 100644
--- a/dev-python/pygal/metadata.xml
+++ b/dev-python/pygal/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pygal</remote-id>
   </upstream>
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygene/metadata.xml b/dev-python/pygene/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pygene/metadata.xml
+++ b/dev-python/pygene/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygeocoder/metadata.xml b/dev-python/pygeocoder/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pygeocoder/metadata.xml
+++ b/dev-python/pygeocoder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygit2/metadata.xml b/dev-python/pygit2/metadata.xml
index 2f03fbdcbb32..a0416699250f 100644
--- a/dev-python/pygit2/metadata.xml
+++ b/dev-python/pygit2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">libgit2/pygit2</remote-id>
     <remote-id type="pypi">pygit2</remote-id>
diff --git a/dev-python/pyglet/metadata.xml b/dev-python/pyglet/metadata.xml
index 92156f1508db..f319b36a2285 100644
--- a/dev-python/pyglet/metadata.xml
+++ b/dev-python/pyglet/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>sci@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">This library provides an object-oriented programming interface
   for developing games and other visually-rich applications with Python.
   pyglet has virtually no external dependencies. For most applications
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index f91efd2fd030..6ac9d107a6d6 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index 7c374a2962fb..479a26f66314 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygoocanvas/metadata.xml b/dev-python/pygoocanvas/metadata.xml
index 7c374a2962fb..479a26f66314 100644
--- a/dev-python/pygoocanvas/metadata.xml
+++ b/dev-python/pygoocanvas/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygooglevoice/metadata.xml b/dev-python/pygooglevoice/metadata.xml
index 159cbbbf6632..a606d2ba44aa 100644
--- a/dev-python/pygooglevoice/metadata.xml
+++ b/dev-python/pygooglevoice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pygooglevoice</remote-id>
 	</upstream>
diff --git a/dev-python/pygpgme/metadata.xml b/dev-python/pygpgme/metadata.xml
index cc608635cc22..4a09b8f22a97 100644
--- a/dev-python/pygpgme/metadata.xml
+++ b/dev-python/pygpgme/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		PyGPGME is a Python module that lets you sign, verify, encrypt and
 		decrypt messages using the OpenPGP format.  It is built on top of the
diff --git a/dev-python/pygraphviz/metadata.xml b/dev-python/pygraphviz/metadata.xml
index d86fec8b72cd..2db2ca67a2e1 100644
--- a/dev-python/pygraphviz/metadata.xml
+++ b/dev-python/pygraphviz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Pygraphviz is a Python interface to the Graphviz graph layout and
   visualization package.
diff --git a/dev-python/pygresql/metadata.xml b/dev-python/pygresql/metadata.xml
index fac7207df9f3..7541311b3c5d 100644
--- a/dev-python/pygresql/metadata.xml
+++ b/dev-python/pygresql/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">PyGreSQL</remote-id>
 	</upstream>
diff --git a/dev-python/pygsl/metadata.xml b/dev-python/pygsl/metadata.xml
index ede9664139ef..e5be6c0c792b 100644
--- a/dev-python/pygsl/metadata.xml
+++ b/dev-python/pygsl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
     PyGSL provides a python interface for the GNU scientific library
     (gsl).
diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml
index d9424e6f4f51..d54a02dee24c 100644
--- a/dev-python/pygtk/metadata.xml
+++ b/dev-python/pygtk/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 PyGTK provides a convenient wrapper for the GTK+ library for use in
 Python programs, taking care of many of the boring details such as
diff --git a/dev-python/pygtkglext/metadata.xml b/dev-python/pygtkglext/metadata.xml
index c1bb83f0928b..f52007f9a817 100644
--- a/dev-python/pygtkglext/metadata.xml
+++ b/dev-python/pygtkglext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkglext</remote-id>
 	</upstream>
diff --git a/dev-python/pygtkhelpers/metadata.xml b/dev-python/pygtkhelpers/metadata.xml
index 986211d4c098..d6a52492038c 100644
--- a/dev-python/pygtkhelpers/metadata.xml
+++ b/dev-python/pygtkhelpers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pygtkhelpers</remote-id>
 	</upstream>
diff --git a/dev-python/pygtksourceview/metadata.xml b/dev-python/pygtksourceview/metadata.xml
index 7080c1467b4b..45db68be9fbe 100644
--- a/dev-python/pygtksourceview/metadata.xml
+++ b/dev-python/pygtksourceview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <!-- <herd>python</herd> -->
 <longdescription>
 Python bindings for gtksourceview (text editing widget)
diff --git a/dev-python/pygui/metadata.xml b/dev-python/pygui/metadata.xml
index d9113ab8f50a..8d08dbe9de9a 100644
--- a/dev-python/pygui/metadata.xml
+++ b/dev-python/pygui/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A cross-platform graphical application framework for Python.
   </longdescription>
diff --git a/dev-python/pyid3lib/metadata.xml b/dev-python/pyid3lib/metadata.xml
index 1f09e0ca6c52..43ac8be1e38b 100644
--- a/dev-python/pyid3lib/metadata.xml
+++ b/dev-python/pyid3lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyid3lib</remote-id>
 	</upstream>
diff --git a/dev-python/pyifp/metadata.xml b/dev-python/pyifp/metadata.xml
index ef19ed78816d..f10fe28aacdd 100644
--- a/dev-python/pyifp/metadata.xml
+++ b/dev-python/pyifp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ifp-gnome</remote-id>
 	</upstream>
diff --git a/dev-python/pyinotify/metadata.xml b/dev-python/pyinotify/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pyinotify/metadata.xml
+++ b/dev-python/pyinotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyjwt/metadata.xml b/dev-python/pyjwt/metadata.xml
index eddceefa4c06..8a093806e7dc 100644
--- a/dev-python/pyjwt/metadata.xml
+++ b/dev-python/pyjwt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PyJWT</remote-id>
     <remote-id type="github">progrium/pyjwt</remote-id>
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
index be8bb8b6ecea..0e0693652ea4 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/pykerberos/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>andreis.vinogradovs@gmail.com</email>
   </maintainer>
@@ -9,6 +8,10 @@
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pykerberos</remote-id>
   </upstream>
diff --git a/dev-python/pykit/metadata.xml b/dev-python/pykit/metadata.xml
index db53dcbe695a..68dd4b05ff8f 100644
--- a/dev-python/pykit/metadata.xml
+++ b/dev-python/pykit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Backend compiler for high-level typed code with first-class support
   for multi-dimensional arrays, list tuples and dicts. High-level
diff --git a/dev-python/pykka/metadata.xml b/dev-python/pykka/metadata.xml
index c953f1983592..1b6cf5063e17 100644
--- a/dev-python/pykka/metadata.xml
+++ b/dev-python/pykka/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Pykka</remote-id>
 		<remote-id type="github">jodal/pykka</remote-id>
diff --git a/dev-python/pykwalify/metadata.xml b/dev-python/pykwalify/metadata.xml
index 6da84ed66fc0..1195c06241f8 100644
--- a/dev-python/pykwalify/metadata.xml
+++ b/dev-python/pykwalify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
 	<upstream>
 		<remote-id type="github">Grokzen/pykwalify</remote-id>
 		<remote-id type="pypi">pykwalify</remote-id>
diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
index 7a3d4a504cc9..2f650c5070cb 100644
--- a/dev-python/pyldap/metadata.xml
+++ b/dev-python/pyldap/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 		<description>Upstream of the python3 port</description>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ldap</remote-id>
 		<remote-id type="github">pyldap/pyldap</remote-id>
diff --git a/dev-python/pylibacl/metadata.xml b/dev-python/pylibacl/metadata.xml
index 722d5c6169a3..260637a05504 100644
--- a/dev-python/pylibacl/metadata.xml
+++ b/dev-python/pylibacl/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pylibacl</remote-id>
 	</upstream>
diff --git a/dev-python/pyliblzma/metadata.xml b/dev-python/pyliblzma/metadata.xml
index ea2a8b112c95..709b39ced5a9 100644
--- a/dev-python/pyliblzma/metadata.xml
+++ b/dev-python/pyliblzma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyliblzma</remote-id>
 		<remote-id type="launchpad">pyliblzma</remote-id>
diff --git a/dev-python/pylibmc/metadata.xml b/dev-python/pylibmc/metadata.xml
index b549092efe6f..ad26d7188f55 100644
--- a/dev-python/pylibmc/metadata.xml
+++ b/dev-python/pylibmc/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
@@ -12,6 +10,14 @@
 		<email>djc@gentoo.org</email>
 		<name>Dirkjan Ochtman</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pylibmc</remote-id>
 	</upstream>
diff --git a/dev-python/pylibpcap/metadata.xml b/dev-python/pylibpcap/metadata.xml
index 5de669fc1069..5678eca73572 100644
--- a/dev-python/pylibpcap/metadata.xml
+++ b/dev-python/pylibpcap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pylibpcap</remote-id>
 	</upstream>
diff --git a/dev-python/pylint/metadata.xml b/dev-python/pylint/metadata.xml
index a108538b650b..4f05d2f4c29f 100644
--- a/dev-python/pylint/metadata.xml
+++ b/dev-python/pylint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">Pylint is a Python source code analyzer which looks for programming
 		errors, helps enforcing a coding standard and sniffs for some code
 		smells (as defined in Martin Fowler's Refactoring book).
diff --git a/dev-python/pylirc/metadata.xml b/dev-python/pylirc/metadata.xml
index 90a49430013b..8fd78d6da99f 100644
--- a/dev-python/pylirc/metadata.xml
+++ b/dev-python/pylirc/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pylirc</remote-id>
 	</upstream>
diff --git a/dev-python/pylons/metadata.xml b/dev-python/pylons/metadata.xml
index 10c66b0d7fe6..6e2ede5674a5 100644
--- a/dev-python/pylons/metadata.xml
+++ b/dev-python/pylons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="genshi">Add optional genshi support</flag>
 		<flag name="jinja">Add optional jinja support</flag>
diff --git a/dev-python/pyltxml/metadata.xml b/dev-python/pyltxml/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyltxml/metadata.xml
+++ b/dev-python/pyltxml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pylzma/metadata.xml b/dev-python/pylzma/metadata.xml
index 151fd0ccea62..8ea657e8d20b 100644
--- a/dev-python/pylzma/metadata.xml
+++ b/dev-python/pylzma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pylzma</remote-id>
 	</upstream>
diff --git a/dev-python/pymad/metadata.xml b/dev-python/pymad/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pymad/metadata.xml
+++ b/dev-python/pymad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
index 5e26eeefc858..905f9f13791b 100644
--- a/dev-python/pymediainfo/metadata.xml
+++ b/dev-python/pymediainfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
 	  <email>sautier.louis@gmail.com</email>
 	  <name>Louis Sautier</name>
   </maintainer>
+  <maintainer>
+	  <email>proxy-maint@gentoo.org</email>
+	  <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
 	  <remote-id type="pypi">pymediainfo</remote-id>
 	  <remote-id type="github">paltman/pymediainfo</remote-id>
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 110abde3a93a..a7a3785cb76d 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 This library downloads the weather report for a given station
 ID (get yours from http://www.nws.noaa.gov/tg/siteloc.shtml),
diff --git a/dev-python/pyminuit/metadata.xml b/dev-python/pyminuit/metadata.xml
index ca6ff921b36f..56061fde9615 100644
--- a/dev-python/pyminuit/metadata.xml
+++ b/dev-python/pyminuit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jpivarski/pyminuit</remote-id>
   </upstream>
diff --git a/dev-python/pyml/metadata.xml b/dev-python/pyml/metadata.xml
index 8457b7b53d6d..ecccb2cb82f4 100644
--- a/dev-python/pyml/metadata.xml
+++ b/dev-python/pyml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   PyML is a flexible Python framework for using various classification
   methods including Support Vector Machines (SVM).
diff --git a/dev-python/pymongo/metadata.xml b/dev-python/pymongo/metadata.xml
index d8be72d8d31c..472e729ad20c 100644
--- a/dev-python/pymongo/metadata.xml
+++ b/dev-python/pymongo/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
@@ -12,6 +10,14 @@
 		<name>Lujeni</name>
 		<description>Proxy-Maintainer, assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">PyMongo is a Python distribution containing tools 
 	for working with MongoDB, and is the recommended way to work 
 	with MongoDB from Python.</longdescription>
diff --git a/dev-python/pympler/metadata.xml b/dev-python/pympler/metadata.xml
index 5d7d984a68cf..54a551a1f886 100644
--- a/dev-python/pympler/metadata.xml
+++ b/dev-python/pympler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 Pympler is a development tool to measure, monitor and analyze the memory 
 behavior of Python objects in a running Python application. By pympling a 
diff --git a/dev-python/pymssql/metadata.xml b/dev-python/pymssql/metadata.xml
index 6fd34d4822e8..cf9073ffa0d5 100644
--- a/dev-python/pymssql/metadata.xml
+++ b/dev-python/pymssql/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>lordvan@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pymssql</remote-id>
 	</upstream>
diff --git a/dev-python/pymtp/metadata.xml b/dev-python/pymtp/metadata.xml
index 361e6ad5f590..eec9c4a053d5 100644
--- a/dev-python/pymtp/metadata.xml
+++ b/dev-python/pymtp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libmtp</remote-id>
   </upstream>
diff --git a/dev-python/pymysql/metadata.xml b/dev-python/pymysql/metadata.xml
index ef692b37f9f4..e8a90a502457 100644
--- a/dev-python/pymysql/metadata.xml
+++ b/dev-python/pymysql/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>mysql</herd>
-  <herd>python</herd>
   <maintainer>
     <email>grknight@gentoo.org</email>
     <name>Brian Evans</name>
   </maintainer>
+  <maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">PyMySQL/PyMySQL</remote-id>
   </upstream>
diff --git a/dev-python/pyndex/metadata.xml b/dev-python/pyndex/metadata.xml
index 307309402a1f..1bd577d19064 100644
--- a/dev-python/pyndex/metadata.xml
+++ b/dev-python/pyndex/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>lordvan@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyndex</remote-id>
 	</upstream>
diff --git a/dev-python/pynotifier/metadata.xml b/dev-python/pynotifier/metadata.xml
index 3c0d60c95c68..8101be8cc8b5 100644
--- a/dev-python/pynotifier/metadata.xml
+++ b/dev-python/pynotifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		pyNotifier provides an implementation of a notifier/event
 		scheduler and is capable of wrapping other notifier
diff --git a/dev-python/pynut/metadata.xml b/dev-python/pynut/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pynut/metadata.xml
+++ b/dev-python/pynut/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pynzb/metadata.xml b/dev-python/pynzb/metadata.xml
index 4f6c8e68e7c0..a571e6e6f54e 100644
--- a/dev-python/pynzb/metadata.xml
+++ b/dev-python/pynzb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pynzb</remote-id>
 	</upstream>
diff --git a/dev-python/pyodbc/metadata.xml b/dev-python/pyodbc/metadata.xml
index 89f9d1846231..b1b747fbf219 100644
--- a/dev-python/pyodbc/metadata.xml
+++ b/dev-python/pyodbc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pyodbc</remote-id>
 		<remote-id type="github">mkleehammer/pyodbc</remote-id>
diff --git a/dev-python/pyode/metadata.xml b/dev-python/pyode/metadata.xml
index 0cbac5cb0e74..99103dca3e80 100644
--- a/dev-python/pyode/metadata.xml
+++ b/dev-python/pyode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyode</remote-id>
 	</upstream>
diff --git a/dev-python/pyogg/metadata.xml b/dev-python/pyogg/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyogg/metadata.xml
+++ b/dev-python/pyogg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyopenal/metadata.xml b/dev-python/pyopenal/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyopenal/metadata.xml
+++ b/dev-python/pyopenal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
index 17d2b2bc6c6b..e29b5ba5bc81 100644
--- a/dev-python/pyopencl/metadata.xml
+++ b/dev-python/pyopencl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyopencl</remote-id>
 	</upstream>
diff --git a/dev-python/pyopengl/metadata.xml b/dev-python/pyopengl/metadata.xml
index 5827a0b3d7d1..31292764d6af 100644
--- a/dev-python/pyopengl/metadata.xml
+++ b/dev-python/pyopengl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">PyOpenGL</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index a50845d4626a..e194998a560e 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyOpenSSL</remote-id>
 		<remote-id type="launchpad">pyopenssl</remote-id>
diff --git a/dev-python/pyorbit/metadata.xml b/dev-python/pyorbit/metadata.xml
index 9b1bc26a9df2..a94d3d6563dd 100644
--- a/dev-python/pyorbit/metadata.xml
+++ b/dev-python/pyorbit/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyosd/metadata.xml b/dev-python/pyosd/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyosd/metadata.xml
+++ b/dev-python/pyosd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pypam/metadata.xml b/dev-python/pypam/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pypam/metadata.xml
+++ b/dev-python/pypam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index e9e87318b49c..3b8308a33fb7 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     The pyparsing module is an alternative approach to creating and
     executing simple grammars, vs. the traditional lex/yacc approach, or the
diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
index bb132f5b4f2d..6d7aa2108d4d 100644
--- a/dev-python/pyparted/metadata.xml
+++ b/dev-python/pyparted/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>livecd</herd>
+	<maintainer>
+		<email>livecd@gentoo.org</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rhinstaller/pyparted</remote-id>
 	</upstream>
diff --git a/dev-python/pypax/metadata.xml b/dev-python/pypax/metadata.xml
index 3055bd7f39b9..0cbc21254bc0 100644
--- a/dev-python/pypax/metadata.xml
+++ b/dev-python/pypax/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
 		<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
diff --git a/dev-python/pypcap/metadata.xml b/dev-python/pypcap/metadata.xml
index 1b65681c8e3b..6e640d6e3782 100644
--- a/dev-python/pypcap/metadata.xml
+++ b/dev-python/pypcap/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">pypcap</remote-id>
     <remote-id type="pypi">pypcap</remote-id>
diff --git a/dev-python/pypeg2/metadata.xml b/dev-python/pypeg2/metadata.xml
index 09eafda74579..1f4ec0a22a82 100644
--- a/dev-python/pypeg2/metadata.xml
+++ b/dev-python/pypeg2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyPEG2</remote-id>
 		<remote-id type="bitbucket">fdik/pypeg</remote-id>
diff --git a/dev-python/pypgsql/metadata.xml b/dev-python/pypgsql/metadata.xml
index 55c1d142df87..d492aab4d8db 100644
--- a/dev-python/pypgsql/metadata.xml
+++ b/dev-python/pypgsql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pypgsql</remote-id>
 	</upstream>
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 9b0f6f22e9af..6b6b6502a310 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Pyphen</remote-id>
     <remote-id type="github">Kozea/Pyphen</remote-id>
diff --git a/dev-python/pyprof2calltree/metadata.xml b/dev-python/pyprof2calltree/metadata.xml
index 603d5e5f4f91..5d54ba5d4b84 100644
--- a/dev-python/pyprof2calltree/metadata.xml
+++ b/dev-python/pyprof2calltree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyprof2calltree</remote-id>
 	</upstream>
diff --git a/dev-python/pyproj/metadata.xml b/dev-python/pyproj/metadata.xml
index 60cafbbd17f0..1d8ee74b2844 100644
--- a/dev-python/pyproj/metadata.xml
+++ b/dev-python/pyproj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pyproj</remote-id>
 		<remote-id type="pypi">pyproj</remote-id>
diff --git a/dev-python/pyprotocols/metadata.xml b/dev-python/pyprotocols/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyprotocols/metadata.xml
+++ b/dev-python/pyprotocols/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index 1ffa9f2e26f3..1e13e7cfa8bb 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index d6a870130d79..4383873e753d 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. \
 			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
index 1ffa9f2e26f3..1e13e7cfa8bb 100644
--- a/dev-python/pypy3-bin/metadata.xml
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index e1efe0bd25d7..97868a78a6ce 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
 		<flag name="sandbox">Enable sandboxing functionality</flag>
diff --git a/dev-python/pyqtgraph/metadata.xml b/dev-python/pyqtgraph/metadata.xml
index 8da1249232ec..ba3121b7bb14 100644
--- a/dev-python/pyqtgraph/metadata.xml
+++ b/dev-python/pyqtgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
   </upstream>
diff --git a/dev-python/pyquery/metadata.xml b/dev-python/pyquery/metadata.xml
index a606518ddfc6..019ac0397494 100644
--- a/dev-python/pyquery/metadata.xml
+++ b/dev-python/pyquery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyquery</remote-id>
     <remote-id type="github">gawel/pyquery</remote-id>
diff --git a/dev-python/pyqwt/metadata.xml b/dev-python/pyqwt/metadata.xml
index 3911f0748f20..3067d0d01e71 100644
--- a/dev-python/pyqwt/metadata.xml
+++ b/dev-python/pyqwt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
   PyQwt is a set of Python bindings for the Qwt  C++ class library which
   extends the Qt framework with widgets for scientific and engineering
diff --git a/dev-python/pyramid/metadata.xml b/dev-python/pyramid/metadata.xml
index 98d5d9c09f4c..f9c1dc600eca 100644
--- a/dev-python/pyramid/metadata.xml
+++ b/dev-python/pyramid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyramid</remote-id>
 	</upstream>
diff --git a/dev-python/pyrax/metadata.xml b/dev-python/pyrax/metadata.xml
index 6d382aad8e06..7b460260738b 100644
--- a/dev-python/pyrax/metadata.xml
+++ b/dev-python/pyrax/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
@@ -10,6 +9,10 @@
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Python SDK for OpenStack/Rackspace APIs
 	pyrax should work with most OpenStack-based cloud deployments,
diff --git a/dev-python/pyregion/metadata.xml b/dev-python/pyregion/metadata.xml
index b515cba0ba5d..85eb89d215de 100644
--- a/dev-python/pyregion/metadata.xml
+++ b/dev-python/pyregion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   pyregion is a python module to parse ds9 region files. It also
   support ciao region files, and can draw regions using matplotlib.
diff --git a/dev-python/pyrex/metadata.xml b/dev-python/pyrex/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyrex/metadata.xml
+++ b/dev-python/pyrex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyrfc3339/metadata.xml b/dev-python/pyrfc3339/metadata.xml
index daec48414900..c50d08070425 100644
--- a/dev-python/pyrfc3339/metadata.xml
+++ b/dev-python/pyrfc3339/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyRFC3339</remote-id>
 		<remote-id type="github">kurtraschke/pyRFC3339</remote-id>
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
index 60a3bab67c34..3fce96c44e67 100644
--- a/dev-python/pyro/metadata.xml
+++ b/dev-python/pyro/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aidecoe@gentoo.org</email>
     <name>Amadeusz Żołnowski</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Pyro</remote-id>
     <remote-id type="github">irmen/Pyro4</remote-id>
diff --git a/dev-python/pyrtf/metadata.xml b/dev-python/pyrtf/metadata.xml
index a7d5dbd587e0..2c3eaab244f1 100644
--- a/dev-python/pyrtf/metadata.xml
+++ b/dev-python/pyrtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyrtf</remote-id>
 	</upstream>
diff --git a/dev-python/pysaml2/metadata.xml b/dev-python/pysaml2/metadata.xml
index 7c2699cd6f44..ececa23a9289 100644
--- a/dev-python/pysaml2/metadata.xml
+++ b/dev-python/pysaml2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	Python implementation of SAML Version 2 to be used in a WSGI environment
 	</longdescription>
diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
index 409977240f48..75c162d0257c 100644
--- a/dev-python/pyscaffold/metadata.xml
+++ b/dev-python/pyscaffold/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
 	<upstream>
 		<remote-id type="pypi">PyScaffold</remote-id>
 	</upstream>
diff --git a/dev-python/pyscard/metadata.xml b/dev-python/pyscard/metadata.xml
index 26f852388375..8d2b159a6581 100644
--- a/dev-python/pyscard/metadata.xml
+++ b/dev-python/pyscard/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyscard</remote-id>
 	</upstream>
diff --git a/dev-python/pysctp/metadata.xml b/dev-python/pysctp/metadata.xml
index d121b14c06ec..e4359ec8b875 100644
--- a/dev-python/pysctp/metadata.xml
+++ b/dev-python/pysctp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>zx2c4@gentoo.org</email>
     <name>Jason A. Donenfeld</name>
@@ -10,6 +9,10 @@
     <email>phil@p1sec.com</email>
     <name>Philippe Langlois</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">philpraxis/pysctp</remote-id>
   </upstream>
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
index be8676d8f559..7764c53bd523 100644
--- a/dev-python/pysendfile/metadata.xml
+++ b/dev-python/pysendfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pysendfile</remote-id>
     <remote-id type="github">giampaolo/pysendfile</remote-id>
diff --git a/dev-python/pyserial/metadata.xml b/dev-python/pyserial/metadata.xml
index 3d869b101352..5eb4879523e2 100644
--- a/dev-python/pyserial/metadata.xml
+++ b/dev-python/pyserial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyserial</remote-id>
 		<remote-id type="sourceforge">pyserial</remote-id>
diff --git a/dev-python/pysfml/metadata.xml b/dev-python/pysfml/metadata.xml
index 6a4b06827515..1e0480def811 100644
--- a/dev-python/pysfml/metadata.xml
+++ b/dev-python/pysfml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sfml</remote-id>
 	</upstream>
diff --git a/dev-python/pyshark/metadata.xml b/dev-python/pyshark/metadata.xml
index f9b3553b83b0..4a34dfb08a3d 100644
--- a/dev-python/pyshark/metadata.xml
+++ b/dev-python/pyshark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyshark</remote-id>
     <remote-id type="github">KimiNewt/pyshark</remote-id>
diff --git a/dev-python/pyside-tools/metadata.xml b/dev-python/pyside-tools/metadata.xml
index c4e854451218..54136f1b69b2 100644
--- a/dev-python/pyside-tools/metadata.xml
+++ b/dev-python/pyside-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">PySide/Tools</remote-id>
   </upstream>
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 186ae3f8e09d..d8c975e39383 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="X">Build QtGui and QtTest modules</flag>
 		<flag name="declarative">Build QtDeclarative module</flag>
diff --git a/dev-python/pysnmp-apps/metadata.xml b/dev-python/pysnmp-apps/metadata.xml
index 2cf1edd5bc76..28e7b2384583 100644
--- a/dev-python/pysnmp-apps/metadata.xml
+++ b/dev-python/pysnmp-apps/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>
 This is a Python implementation of SNMP v.1/v.2c engine. Its general
 functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
index 0ddc38fed961..4197068a0898 100644
--- a/dev-python/pysnmp-mibs/metadata.xml
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 This is a Python implementation of SNMP v.1/v.2c engine. Its general
 functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index f6f3316afaee..f194c357e129 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>
 This is a Python implementation of SNMP v.1/v.2c engine. Its general
 functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysolr/metadata.xml b/dev-python/pysolr/metadata.xml
index 8cfbd29d7bd1..72ed4ab02fd0 100644
--- a/dev-python/pysolr/metadata.xml
+++ b/dev-python/pysolr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pysolr</remote-id>
     <remote-id type="github">toastdriven/pysolr</remote-id>
diff --git a/dev-python/pyspf/metadata.xml b/dev-python/pyspf/metadata.xml
index 1c6beeda5d8d..6cce1b98e855 100644
--- a/dev-python/pyspf/metadata.xml
+++ b/dev-python/pyspf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyspf</remote-id>
   </upstream>
diff --git a/dev-python/pysrt/metadata.xml b/dev-python/pysrt/metadata.xml
index d6dd2b40ebbc..7f903930cb24 100644
--- a/dev-python/pysrt/metadata.xml
+++ b/dev-python/pysrt/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>nikoli@gmx.us</email>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pysrt</remote-id>
     <remote-id type="github">byroot/pysrt</remote-id>
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
index c03b50fc09d3..429c83dbfd7b 100644
--- a/dev-python/pystache/metadata.xml
+++ b/dev-python/pystache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Pystache is a Python implementation of Mustache.
   Mustache is a framework-agnostic, logic-free
diff --git a/dev-python/pystatgrab/metadata.xml b/dev-python/pystatgrab/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pystatgrab/metadata.xml
+++ b/dev-python/pystatgrab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pysvg/metadata.xml b/dev-python/pysvg/metadata.xml
index f1cda9f0b9eb..340596f85c85 100644
--- a/dev-python/pysvg/metadata.xml
+++ b/dev-python/pysvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pysvg</remote-id>
 	</upstream>
diff --git a/dev-python/pysvn/metadata.xml b/dev-python/pysvn/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/pysvn/metadata.xml
+++ b/dev-python/pysvn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytables/metadata.xml b/dev-python/pytables/metadata.xml
index 9a0c6541eff2..1cff7e414033 100644
--- a/dev-python/pytables/metadata.xml
+++ b/dev-python/pytables/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   PyTables is a hierarchical database package designed to efficently
   manage very large amounts of data. PyTables is built on top of the
diff --git a/dev-python/pyte/metadata.xml b/dev-python/pyte/metadata.xml
index 759142512e72..3c0d84be8b25 100644
--- a/dev-python/pyte/metadata.xml
+++ b/dev-python/pyte/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyte</remote-id>
     <remote-id type="github">selectel/pyte</remote-id>
diff --git a/dev-python/pytest-cache/metadata.xml b/dev-python/pytest-cache/metadata.xml
index dc4835843a34..8de3a9f833e0 100644
--- a/dev-python/pytest-cache/metadata.xml
+++ b/dev-python/pytest-cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/pytest-capturelog/metadata.xml b/dev-python/pytest-capturelog/metadata.xml
index 89404ef92835..c89a4305ce83 100644
--- a/dev-python/pytest-capturelog/metadata.xml
+++ b/dev-python/pytest-capturelog/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-capturelog</remote-id>
 		<remote-id type="bitbucket">memedough/pytest-capturelog</remote-id>
diff --git a/dev-python/pytest-catchlog/metadata.xml b/dev-python/pytest-catchlog/metadata.xml
index 812a53f5f9ea..0bb5b5a0d01b 100644
--- a/dev-python/pytest-catchlog/metadata.xml
+++ b/dev-python/pytest-catchlog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-catchlog</remote-id>
 		<remote-id type="github">eisensheng/pytest-catchlog</remote-id>
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
index c2ceb9389f06..f04b205d7753 100644
--- a/dev-python/pytest-django/metadata.xml
+++ b/dev-python/pytest-django/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-django</remote-id>
 		<remote-id type="github">pytest-dev/pytest-django</remote-id>
diff --git a/dev-python/pytest-httpbin/metadata.xml b/dev-python/pytest-httpbin/metadata.xml
index 1979ce6a60df..5e430a1bcf35 100644
--- a/dev-python/pytest-httpbin/metadata.xml
+++ b/dev-python/pytest-httpbin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pytest-httpbin</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/pytest-localserver/metadata.xml b/dev-python/pytest-localserver/metadata.xml
index f431e796434f..807fcb284968 100644
--- a/dev-python/pytest-localserver/metadata.xml
+++ b/dev-python/pytest-localserver/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-localserver</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-pythonpath/metadata.xml b/dev-python/pytest-pythonpath/metadata.xml
index da64f799a851..4fa53029378d 100644
--- a/dev-python/pytest-pythonpath/metadata.xml
+++ b/dev-python/pytest-pythonpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-pythonpath</remote-id>
 		<remote-id type="github">bigsassy/pytest-pythonpath</remote-id>
diff --git a/dev-python/pytest-runner/metadata.xml b/dev-python/pytest-runner/metadata.xml
index cabdc38ae25c..283c2bd38263 100644
--- a/dev-python/pytest-runner/metadata.xml
+++ b/dev-python/pytest-runner/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 		Adds support for tests during installation of setup.py files.
 	</longdescription>
diff --git a/dev-python/pytest-timeout/metadata.xml b/dev-python/pytest-timeout/metadata.xml
index dc17bfcfbb97..9e4e17c017e7 100644
--- a/dev-python/pytest-timeout/metadata.xml
+++ b/dev-python/pytest-timeout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pytest-timeout</remote-id>
   </upstream>
diff --git a/dev-python/pytest-xdist/metadata.xml b/dev-python/pytest-xdist/metadata.xml
index 680dd6d7b04e..75c9fbaed43f 100644
--- a/dev-python/pytest-xdist/metadata.xml
+++ b/dev-python/pytest-xdist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/pytest-xprocess/metadata.xml b/dev-python/pytest-xprocess/metadata.xml
index 3af550d07fa5..5846afc2a93b 100644
--- a/dev-python/pytest-xprocess/metadata.xml
+++ b/dev-python/pytest-xprocess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">pytest-dev/pytest-xprocess</remote-id>
     <remote-id type="pypi">pytest-xprocess</remote-id>
diff --git a/dev-python/pytest/metadata.xml b/dev-python/pytest/metadata.xml
index def7a965651c..3f04f5d3ceac 100644
--- a/dev-python/pytest/metadata.xml
+++ b/dev-python/pytest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest</remote-id>
 	</upstream>
diff --git a/dev-python/python-application/metadata.xml b/dev-python/python-application/metadata.xml
index 91adab3be3ef..9a260b9c5f18 100644
--- a/dev-python/python-application/metadata.xml
+++ b/dev-python/python-application/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package is a collection of modules that are useful when
 		building python applications. Their purpose is to eliminate the
diff --git a/dev-python/python-barbicanclient/metadata.xml b/dev-python/python-barbicanclient/metadata.xml
index fc78ab66d3e3..d33193cc5d5a 100644
--- a/dev-python/python-barbicanclient/metadata.xml
+++ b/dev-python/python-barbicanclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	Client library for Barbican API.
 	</longdescription>
diff --git a/dev-python/python-bibtex/metadata.xml b/dev-python/python-bibtex/metadata.xml
index 98ccc2e27a99..658717e49b3f 100644
--- a/dev-python/python-bibtex/metadata.xml
+++ b/dev-python/python-bibtex/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pybliographer</remote-id>
 	</upstream>
diff --git a/dev-python/python-biggles/metadata.xml b/dev-python/python-biggles/metadata.xml
index d971d394cc76..ddb37319ce2c 100644
--- a/dev-python/python-biggles/metadata.xml
+++ b/dev-python/python-biggles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">biggles</remote-id>
 	</upstream>
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
index 3845a45f0fab..50be21c925a4 100644
--- a/dev-python/python-caja/metadata.xml
+++ b/dev-python/python-caja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/python-caja</remote-id>
     </upstream>
diff --git a/dev-python/python-catcher/metadata.xml b/dev-python/python-catcher/metadata.xml
index 15b4a2b4fdd2..5a82af13d7fc 100644
--- a/dev-python/python-catcher/metadata.xml
+++ b/dev-python/python-catcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-catcher</remote-id>
   </upstream>
diff --git a/dev-python/python-cdb/metadata.xml b/dev-python/python-cdb/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/python-cdb/metadata.xml
+++ b/dev-python/python-cdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-ceilometerclient/metadata.xml b/dev-python/python-ceilometerclient/metadata.xml
index ca9fbcc0735a..97577c841611 100644
--- a/dev-python/python-ceilometerclient/metadata.xml
+++ b/dev-python/python-ceilometerclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     This is a client library for Ceilometer built on the Ceilometer API. It
 	provides a Python API (the ceilometerclient module) and a command-line tool (ceilometer).
diff --git a/dev-python/python-cinderclient/metadata.xml b/dev-python/python-cinderclient/metadata.xml
index ca4f314125d7..ddf48bcee84a 100644
--- a/dev-python/python-cinderclient/metadata.xml
+++ b/dev-python/python-cinderclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     This is a client for the OpenStack Cinder API.
   </longdescription>
diff --git a/dev-python/python-cjson/metadata.xml b/dev-python/python-cjson/metadata.xml
index 2018cab26b22..e0f13b88e3e5 100644
--- a/dev-python/python-cjson/metadata.xml
+++ b/dev-python/python-cjson/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		This module implements a very fast JSON encoder/decoder for Python.
 
diff --git a/dev-python/python-cluster/metadata.xml b/dev-python/python-cluster/metadata.xml
index ae07547fa10b..97dabcda6b19 100644
--- a/dev-python/python-cluster/metadata.xml
+++ b/dev-python/python-cluster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cluster</remote-id>
     <remote-id type="github">exhuma/python-cluster</remote-id>
diff --git a/dev-python/python-daap/metadata.xml b/dev-python/python-daap/metadata.xml
index 414a5eeccf59..c2e8f65d74b5 100644
--- a/dev-python/python-daap/metadata.xml
+++ b/dev-python/python-daap/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-daemon/metadata.xml b/dev-python/python-daemon/metadata.xml
index 836e1cdf2ccc..57b70074d625 100644
--- a/dev-python/python-daemon/metadata.xml
+++ b/dev-python/python-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-daemon</remote-id>
 	</upstream>
diff --git a/dev-python/python-dateutil/metadata.xml b/dev-python/python-dateutil/metadata.xml
index 04d467bab26c..0990af9e51e0 100644
--- a/dev-python/python-dateutil/metadata.xml
+++ b/dev-python/python-dateutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   The dateutil module provides powerful extensions to the standard
   datetime module, available in Python 2.3+.
diff --git a/dev-python/python-ddp/metadata.xml b/dev-python/python-ddp/metadata.xml
index 0a2a2f0a5229..f26071769de5 100644
--- a/dev-python/python-ddp/metadata.xml
+++ b/dev-python/python-ddp/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-ddp</remote-id>
   </upstream>
diff --git a/dev-python/python-debian/metadata.xml b/dev-python/python-debian/metadata.xml
index bdd3b1dee57e..c78eebee9b83 100644
--- a/dev-python/python-debian/metadata.xml
+++ b/dev-python/python-debian/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>floppym@gentoo.org</email>
     <name>Mike Gilbert</name>
   </maintainer>
+<maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-digest/metadata.xml b/dev-python/python-digest/metadata.xml
index e30ccd6a26bb..8d6381ffd0ff 100644
--- a/dev-python/python-digest/metadata.xml
+++ b/dev-python/python-digest/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-digest</remote-id>
     <remote-id type="bitbucket">akoha/python-digest</remote-id>
diff --git a/dev-python/python-discid/metadata.xml b/dev-python/python-discid/metadata.xml
index 0e71cb26d534..714c64063535 100644
--- a/dev-python/python-discid/metadata.xml
+++ b/dev-python/python-discid/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">JonnyJD/python-discid</remote-id>
   </upstream>
diff --git a/dev-python/python-distutils-extra/metadata.xml b/dev-python/python-distutils-extra/metadata.xml
index baa3463d92c0..7874fe2bf359 100644
--- a/dev-python/python-distutils-extra/metadata.xml
+++ b/dev-python/python-distutils-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">python-distutils-extra</remote-id>
 	</upstream>
diff --git a/dev-python/python-docs/metadata.xml b/dev-python/python-docs/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/python-docs/metadata.xml
+++ b/dev-python/python-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-engineio/metadata.xml b/dev-python/python-engineio/metadata.xml
index cf3c0cb7d14b..1446ee183a49 100644
--- a/dev-python/python-engineio/metadata.xml
+++ b/dev-python/python-engineio/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">python-engineio</remote-id>
 		<remote-id type="github">miguelgrinberg/python-engineio</remote-id>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-eventlib/metadata.xml b/dev-python/python-eventlib/metadata.xml
index a841434212dc..c46ec497c5c5 100644
--- a/dev-python/python-eventlib/metadata.xml
+++ b/dev-python/python-eventlib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Eventlib is a networking library written in Python. It achieves
 		high scalability by using non-blocking io while at the same time
diff --git a/dev-python/python-exconsole/metadata.xml b/dev-python/python-exconsole/metadata.xml
index 8259f7303141..7a0efb5c29a6 100644
--- a/dev-python/python-exconsole/metadata.xml
+++ b/dev-python/python-exconsole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-exconsole</remote-id>
     <remote-id type="github">Eugeny/exconsole</remote-id>
diff --git a/dev-python/python-fastcgi/metadata.xml b/dev-python/python-fastcgi/metadata.xml
index 6a01fd7dc0a1..dd06305d3730 100644
--- a/dev-python/python-fastcgi/metadata.xml
+++ b/dev-python/python-fastcgi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-fastcgi</remote-id>
 	</upstream>
diff --git a/dev-python/python-fastimport/metadata.xml b/dev-python/python-fastimport/metadata.xml
index 04f469d57e27..2d84d1c80106 100644
--- a/dev-python/python-fastimport/metadata.xml
+++ b/dev-python/python-fastimport/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
-	<herd>bazaar</herd>
+	<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">python-fastimport</remote-id>
 	</upstream>
diff --git a/dev-python/python-fchksum/metadata.xml b/dev-python/python-fchksum/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/python-fchksum/metadata.xml
+++ b/dev-python/python-fchksum/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-geoclue/metadata.xml b/dev-python/python-geoclue/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/python-geoclue/metadata.xml
+++ b/dev-python/python-geoclue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
index e79cd6bb6473..d6fd3772d98d 100644
--- a/dev-python/python-gflags/metadata.xml
+++ b/dev-python/python-gflags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">python-gflags</remote-id>
 		<remote-id type="github">gflags/python-gflags</remote-id>
diff --git a/dev-python/python-glanceclient/metadata.xml b/dev-python/python-glanceclient/metadata.xml
index 1efbdddc6fa6..6548e05f8ef8 100644
--- a/dev-python/python-glanceclient/metadata.xml
+++ b/dev-python/python-glanceclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client for the OpenStack Glance API.
   </longdescription>
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 400690395be8..081608f8741f 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">python-gnupg</remote-id>
     <remote-id type="github">vsajip/python-gnupg</remote-id>
diff --git a/dev-python/python-gnutls/metadata.xml b/dev-python/python-gnutls/metadata.xml
index a1b5a57c78d6..fe1536e620c6 100644
--- a/dev-python/python-gnutls/metadata.xml
+++ b/dev-python/python-gnutls/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		This package provides a high level object oriented wrapper around
 		libgnutls, as well as low level bindings to the GNUTLS types and
diff --git a/dev-python/python-gtkmvc/metadata.xml b/dev-python/python-gtkmvc/metadata.xml
index fad314aca6b6..6c6cfbee6fa6 100644
--- a/dev-python/python-gtkmvc/metadata.xml
+++ b/dev-python/python-gtkmvc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<!-- <herd>gnome</herd> -->
 	<upstream>
 		<remote-id type="sourceforge">pygtkmvc</remote-id>
diff --git a/dev-python/python-gudev/metadata.xml b/dev-python/python-gudev/metadata.xml
index cd9811889bab..8461a635820e 100644
--- a/dev-python/python-gudev/metadata.xml
+++ b/dev-python/python-gudev/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>laurento.frittella@gmail.com</email>
     <description>Proxy Maintainer (please CC on bugs)</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nzjrs/python-gudev</remote-id>
   </upstream>
diff --git a/dev-python/python-heatclient/metadata.xml b/dev-python/python-heatclient/metadata.xml
index e202b403f741..47a46dd21695 100644
--- a/dev-python/python-heatclient/metadata.xml
+++ b/dev-python/python-heatclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client library for Heat built on the Heat orchestration API
   </longdescription>
diff --git a/dev-python/python-iptables/metadata.xml b/dev-python/python-iptables/metadata.xml
index a46ccb914a05..d3b0b62e753a 100644
--- a/dev-python/python-iptables/metadata.xml
+++ b/dev-python/python-iptables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Python Bindings for IPtables: Iptables is the tool that is used to manage netfilter,
 		the standard packet filtering and manipulation framework under Linux. As the iptables
diff --git a/dev-python/python-iwscan/metadata.xml b/dev-python/python-iwscan/metadata.xml
index b193248853bc..1e980554d25e 100644
--- a/dev-python/python-iwscan/metadata.xml
+++ b/dev-python/python-iwscan/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <maintainer>
   <email>tomka@gentoo.org</email>
   <name>Thomas Kahle</name>
 </maintainer>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
index 861406253ce0..9a7605c425f4 100644
--- a/dev-python/python-keystoneclient/metadata.xml
+++ b/dev-python/python-keystoneclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     A client for the OpenStack Keystone API.
   </longdescription>
diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml
index c60eaa2fade6..8a0a6cf51364 100644
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 		<description>Upstream of the python3 port</description>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ldap</remote-id>
 	</upstream>
diff --git a/dev-python/python-levenshtein/metadata.xml b/dev-python/python-levenshtein/metadata.xml
index 97b5719f4a5d..fbc7a8d7c41b 100644
--- a/dev-python/python-levenshtein/metadata.xml
+++ b/dev-python/python-levenshtein/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-Levenshtein</remote-id>
     <remote-id type="github">miohtama/python-Levenshtein</remote-id>
diff --git a/dev-python/python-ly/metadata.xml b/dev-python/python-ly/metadata.xml
index cc6a6406f1f7..19bdc275c57c 100644
--- a/dev-python/python-ly/metadata.xml
+++ b/dev-python/python-ly/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>karl.j.linden@gmail.com</email>
     <name>Karl Linden</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-ly</remote-id>
     <remote-id type="github">wbsoft/python-ly</remote-id>
diff --git a/dev-python/python-lzo/metadata.xml b/dev-python/python-lzo/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/python-lzo/metadata.xml
+++ b/dev-python/python-lzo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index a64a331f07f5..95f72fc3c8ac 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 This is a Python based API (implemented in 100% python) for communicating with
 the memcached distributed memory object cache daemon.
diff --git a/dev-python/python-meteor/metadata.xml b/dev-python/python-meteor/metadata.xml
index 8b48854ad167..85ed6f7bb27d 100644
--- a/dev-python/python-meteor/metadata.xml
+++ b/dev-python/python-meteor/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-meteor</remote-id>
   </upstream>
diff --git a/dev-python/python-mhash/metadata.xml b/dev-python/python-mhash/metadata.xml
index fd0052effa62..f5a8fb7c4001 100644
--- a/dev-python/python-mhash/metadata.xml
+++ b/dev-python/python-mhash/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mhash</remote-id>
 	</upstream>
diff --git a/dev-python/python-mpd/metadata.xml b/dev-python/python-mpd/metadata.xml
index b0b8e66ea5c5..0a6dd1498d76 100644
--- a/dev-python/python-mpd/metadata.xml
+++ b/dev-python/python-mpd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-mpd</remote-id>
     <remote-id type="github">Mic92/python-mpd2</remote-id>
diff --git a/dev-python/python-msrplib/metadata.xml b/dev-python/python-msrplib/metadata.xml
index 5ea4fe9779f0..5d4275a7c54a 100644
--- a/dev-python/python-msrplib/metadata.xml
+++ b/dev-python/python-msrplib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Message Session Relay Protocol (MSRP) is a protocol for transmitting a
 		series of related instant messages in the context of a session. Message
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 51ea0bc8a268..1f48cbcd09b8 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gerion.entrup@t-online.de</email>
 		<name>Gerion Entrup</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 This library implements webservice bindings for the Musicbrainz NGS site, also known as /ws/2.
 	</longdescription>
diff --git a/dev-python/python-musicbrainz/metadata.xml b/dev-python/python-musicbrainz/metadata.xml
index 414a5eeccf59..c2e8f65d74b5 100644
--- a/dev-python/python-musicbrainz/metadata.xml
+++ b/dev-python/python-musicbrainz/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-nbxmpp/metadata.xml b/dev-python/python-nbxmpp/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/python-nbxmpp/metadata.xml
+++ b/dev-python/python-nbxmpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index 9657ead104e9..c2a28ff0f9cc 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     CLI and python client library for OpenStack Neutron
   </longdescription>
diff --git a/dev-python/python-novaclient/metadata.xml b/dev-python/python-novaclient/metadata.xml
index 6c13623d743c..668e1cc466a1 100644
--- a/dev-python/python-novaclient/metadata.xml
+++ b/dev-python/python-novaclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     This is a client for the OpenStack Nova API.
 	There's a Python API (the novaclient module),
diff --git a/dev-python/python-nss/metadata.xml b/dev-python/python-nss/metadata.xml
index 8b50aef611de..51f5c7a14f0e 100644
--- a/dev-python/python-nss/metadata.xml
+++ b/dev-python/python-nss/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 	</maintainer>
@@ -10,6 +8,14 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 	This package provides Python bindings for Network Security Services (NSS)
 	and the Netscape Portable Runtime (NSPR)
diff --git a/dev-python/python-oembed/metadata.xml b/dev-python/python-oembed/metadata.xml
index ecaf56af8d53..e9d8d458269e 100644
--- a/dev-python/python-oembed/metadata.xml
+++ b/dev-python/python-oembed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-oembed</remote-id>
   </upstream>
diff --git a/dev-python/python-openid/metadata.xml b/dev-python/python-openid/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/python-openid/metadata.xml
+++ b/dev-python/python-openid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-openstackclient/metadata.xml b/dev-python/python-openstackclient/metadata.xml
index 804c062e353f..c91327b79239 100644
--- a/dev-python/python-openstackclient/metadata.xml
+++ b/dev-python/python-openstackclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client for the OpenStack APIs.
   </longdescription>
diff --git a/dev-python/python-poppler-qt4/metadata.xml b/dev-python/python-poppler-qt4/metadata.xml
index 4c8686ed7dd0..83e7f2b9d67f 100644
--- a/dev-python/python-poppler-qt4/metadata.xml
+++ b/dev-python/python-poppler-qt4/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">python-poppler-qt4</remote-id>
     <remote-id type="github">wbsoft/python-poppler-qt4</remote-id>
diff --git a/dev-python/python-poppler/metadata.xml b/dev-python/python-poppler/metadata.xml
index 071b9c5fe39c..1dfd66f2c947 100644
--- a/dev-python/python-poppler/metadata.xml
+++ b/dev-python/python-poppler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">poppler-python</remote-id>
 	</upstream>
diff --git a/dev-python/python-prctl/metadata.xml b/dev-python/python-prctl/metadata.xml
index e33c535019f0..cec878c279e8 100644
--- a/dev-python/python-prctl/metadata.xml
+++ b/dev-python/python-prctl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seveas/python-prctl</remote-id>
   </upstream>
diff --git a/dev-python/python-ptrace/metadata.xml b/dev-python/python-ptrace/metadata.xml
index a484905aea3b..97cfad7094d2 100644
--- a/dev-python/python-ptrace/metadata.xml
+++ b/dev-python/python-ptrace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-ptrace</remote-id>
     <remote-id type="bitbucket">haypo/python-ptrace</remote-id>
diff --git a/dev-python/python-saharaclient/metadata.xml b/dev-python/python-saharaclient/metadata.xml
index e84ed46fdd9b..5b67373bcc02 100644
--- a/dev-python/python-saharaclient/metadata.xml
+++ b/dev-python/python-saharaclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client for the OpenStack Sahara API, aka HADOOP
   </longdescription>
diff --git a/dev-python/python-scw/metadata.xml b/dev-python/python-scw/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/python-scw/metadata.xml
+++ b/dev-python/python-scw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-sipsimple/metadata.xml b/dev-python/python-sipsimple/metadata.xml
index 2b568d81a793..25508e9c5282 100644
--- a/dev-python/python-sipsimple/metadata.xml
+++ b/dev-python/python-sipsimple/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		SIP SIMPLE client SDK is a Software Development Kit for easy
 		development of SIP end-points that support rich media like Audio,
diff --git a/dev-python/python-slip/metadata.xml b/dev-python/python-slip/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-python/python-slip/metadata.xml
+++ b/dev-python/python-slip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-social-auth/metadata.xml b/dev-python/python-social-auth/metadata.xml
index f51439d41095..767a8c27d13d 100644
--- a/dev-python/python-social-auth/metadata.xml
+++ b/dev-python/python-social-auth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">omab/python-social-auth</remote-id>
   </upstream>
diff --git a/dev-python/python-socketio/metadata.xml b/dev-python/python-socketio/metadata.xml
index fadd8644eacf..ce67963ddc83 100644
--- a/dev-python/python-socketio/metadata.xml
+++ b/dev-python/python-socketio/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">python-socketio</remote-id>
 		<remote-id type="github">miguelgrinberg/python-socketio</remote-id>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-sqlparse/metadata.xml b/dev-python/python-sqlparse/metadata.xml
index 2c3d22a35a9b..ca992e3a6095 100644
--- a/dev-python/python-sqlparse/metadata.xml
+++ b/dev-python/python-sqlparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">python-sqlparse</remote-id>
     <remote-id type="pypi">python-sqlparse</remote-id>
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
index 02d112347672..2b0fee43d158 100644
--- a/dev-python/python-swiftclient/metadata.xml
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     Python bindings to the OpenStack Object Storage API
   </longdescription>
diff --git a/dev-python/python-troveclient/metadata.xml b/dev-python/python-troveclient/metadata.xml
index 52b4c5bb12ef..e226ee2ee25d 100644
--- a/dev-python/python-troveclient/metadata.xml
+++ b/dev-python/python-troveclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client for the OpenStack Trove API, a scalable relational database service.
   </longdescription>
diff --git a/dev-python/python-tvrage/metadata.xml b/dev-python/python-tvrage/metadata.xml
index f3fef3579658..21cf9849703c 100644
--- a/dev-python/python-tvrage/metadata.xml
+++ b/dev-python/python-tvrage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-tvrage</remote-id>
     <remote-id type="github">ckreutzer/python-tvrage</remote-id>
diff --git a/dev-python/python-twitter/metadata.xml b/dev-python/python-twitter/metadata.xml
index 0aeabd36ac00..a0944ddacc5f 100644
--- a/dev-python/python-twitter/metadata.xml
+++ b/dev-python/python-twitter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">python-twitter</remote-id>
 		<remote-id type="github">bear/python-twitter</remote-id>
diff --git a/dev-python/python-uinput/metadata.xml b/dev-python/python-uinput/metadata.xml
index 61e167442787..431a9418fa52 100644
--- a/dev-python/python-uinput/metadata.xml
+++ b/dev-python/python-uinput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-uinput</remote-id>
   </upstream>
diff --git a/dev-python/python-urljr/metadata.xml b/dev-python/python-urljr/metadata.xml
index 7b4c64f109b6..6a165c805f79 100644
--- a/dev-python/python-urljr/metadata.xml
+++ b/dev-python/python-urljr/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>JanRain's URL Utilities</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python-virtkey/metadata.xml b/dev-python/python-virtkey/metadata.xml
index dcf1228fcdbe..bfe4973129d3 100644
--- a/dev-python/python-virtkey/metadata.xml
+++ b/dev-python/python-virtkey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-accessibility</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">python-virtkey</remote-id>
 	</upstream>
diff --git a/dev-python/python-wpactrl/metadata.xml b/dev-python/python-wpactrl/metadata.xml
index b193248853bc..1e980554d25e 100644
--- a/dev-python/python-wpactrl/metadata.xml
+++ b/dev-python/python-wpactrl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <maintainer>
   <email>tomka@gentoo.org</email>
   <name>Thomas Kahle</name>
 </maintainer>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-xcaplib/metadata.xml b/dev-python/python-xcaplib/metadata.xml
index 0dd9c1582327..36bdc7ac629d 100644
--- a/dev-python/python-xcaplib/metadata.xml
+++ b/dev-python/python-xcaplib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		XCAP protocol, defined in RFC 4825, allows a client to read, write,
 		and modify application configuration data stored in XML format on a
diff --git a/dev-python/python-xlib/metadata.xml b/dev-python/python-xlib/metadata.xml
index 8f5f346a1684..5c3060992221 100644
--- a/dev-python/python-xlib/metadata.xml
+++ b/dev-python/python-xlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">python-xlib</remote-id>
 	</upstream>
diff --git a/dev-python/python-yadis/metadata.xml b/dev-python/python-yadis/metadata.xml
index 86fcb975b657..91c363d83152 100644
--- a/dev-python/python-yadis/metadata.xml
+++ b/dev-python/python-yadis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Yadis service discovery library</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
index d7b5f819723b..60581ab400cf 100644
--- a/dev-python/python3-openid/metadata.xml
+++ b/dev-python/python3-openid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">necaris/python3-openid</remote-id>
   </upstream>
diff --git a/dev-python/python_orocos_kdl/metadata.xml b/dev-python/python_orocos_kdl/metadata.xml
index e484e59e950b..1eaa83592aa2 100644
--- a/dev-python/python_orocos_kdl/metadata.xml
+++ b/dev-python/python_orocos_kdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">orocos/orocos_kinematics_dynamics</remote-id>
 	</upstream>
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index 32f96b99b0bc..bacc12470feb 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pythondialog</remote-id>
 		<remote-id type="pypi">python2-pythondialog</remote-id>
diff --git a/dev-python/pythong/metadata.xml b/dev-python/pythong/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/pythong/metadata.xml
+++ b/dev-python/pythong/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pythonmagick/metadata.xml b/dev-python/pythonmagick/metadata.xml
index 36f667ac9d8e..de6a8d071c3c 100644
--- a/dev-python/pythonmagick/metadata.xml
+++ b/dev-python/pythonmagick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   An object-oriented Python interface to ImageMagick.
 </longdescription>
diff --git a/dev-python/pythonutils/metadata.xml b/dev-python/pythonutils/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pythonutils/metadata.xml
+++ b/dev-python/pythonutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytidylib/metadata.xml b/dev-python/pytidylib/metadata.xml
index da6a12e57459..c315814807dd 100644
--- a/dev-python/pytidylib/metadata.xml
+++ b/dev-python/pytidylib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">countergram/pytidylib</remote-id>
     <remote-id type="pypi">pytidylib</remote-id>
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
index 1925c43b3b42..7dcfa0700e0b 100644
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pytools</remote-id>
   </upstream>
diff --git a/dev-python/pytz/metadata.xml b/dev-python/pytz/metadata.xml
index 4981031aef4e..158ba4a80969 100644
--- a/dev-python/pytz/metadata.xml
+++ b/dev-python/pytz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   pytz brings the Olson tz database into Python. This library allows
   accurate and cross platform timezone calculations using Python 2.3
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index 3424bf98479a..b6eeec004eba 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">pyudev is a Python binding to libudev, the hardware management
 		library and service found in modern linux systems.</longdescription>
 	<use>
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index b291e8b89957..84446966c77f 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<longdescription>
 		pyusb is a python wrapper for the libusb user space USB device library.
 	</longdescription>
@@ -9,6 +8,10 @@
 		<email>josejx@gentoo.org</email>
 		<name>Joseph Jezak</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyusb</remote-id>
 		<remote-id type="sourceforge">pyusb</remote-id>
diff --git a/dev-python/pyutmp/metadata.xml b/dev-python/pyutmp/metadata.xml
index 4ac8bb73f0fb..0c78425e1740 100644
--- a/dev-python/pyutmp/metadata.xml
+++ b/dev-python/pyutmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyutmp</remote-id>
 	</upstream>
diff --git a/dev-python/pyvorbis/metadata.xml b/dev-python/pyvorbis/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/pyvorbis/metadata.xml
+++ b/dev-python/pyvorbis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyvtk/metadata.xml b/dev-python/pyvtk/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/dev-python/pyvtk/metadata.xml
+++ b/dev-python/pyvtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
index c03bc60f51c1..bc0f9e6fa18a 100644
--- a/dev-python/pywavelets/metadata.xml
+++ b/dev-python/pywavelets/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   PyWavelets is a Python wavelet transforms module that can perform:
   * Discrete Wavelet Transform (1D and 2D)
diff --git a/dev-python/pywebdav/metadata.xml b/dev-python/pywebdav/metadata.xml
index d06b0b308143..0ee0c51b3580 100644
--- a/dev-python/pywebdav/metadata.xml
+++ b/dev-python/pywebdav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">A WebDAV server implementation in python. It's aim is to provide a
 		simple interface to webdav services to any application which needs it.
 		It can be run as a daemon on *nix systems</longdescription>
diff --git a/dev-python/pywebkitgtk/metadata.xml b/dev-python/pywebkitgtk/metadata.xml
index eabb6d236cdd..16d53a6dfc55 100644
--- a/dev-python/pywebkitgtk/metadata.xml
+++ b/dev-python/pywebkitgtk/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sergio.rodriguez.inclan@gmail.com</email>
 		<name>Sergio Rodriguez</name>
@@ -11,6 +9,14 @@
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pywebkitgtk</remote-id>
 	</upstream>
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index 69bf06dee62d..373ffa9c2fb0 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 PyX is a Python package for the creation of encapsulated PostScript figures.
 It provides both an abstraction of PostScript and a TeX/LaTeX interface.
diff --git a/dev-python/pyxattr/metadata.xml b/dev-python/pyxattr/metadata.xml
index be6ec1870e53..a553de66e1a0 100644
--- a/dev-python/pyxattr/metadata.xml
+++ b/dev-python/pyxattr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <longdescription>
   pyxattr is an Python extension module wrapper for libattr. You can
   use this module to query, list, add and remove extended attributes
@@ -10,6 +9,10 @@
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyxattr</remote-id>
   </upstream>
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index 182ba5b16151..7644ec7a8e9b 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
     <bugs-to>https://bugs.freedesktop.org/</bugs-to>
diff --git a/dev-python/pyxenstore/metadata.xml b/dev-python/pyxenstore/metadata.xml
index 028202ff94bd..88ce93ed3a79 100644
--- a/dev-python/pyxenstore/metadata.xml
+++ b/dev-python/pyxenstore/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyxenstore</remote-id>
 		<remote-id type="launchpad">pyxenstore</remote-id>
diff --git a/dev-python/pyxml/metadata.xml b/dev-python/pyxml/metadata.xml
index 2093c15a879e..279852b7726e 100644
--- a/dev-python/pyxml/metadata.xml
+++ b/dev-python/pyxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyxml</remote-id>
 	</upstream>
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index 2e9a66761bd7..53e5e947bba7 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="libyaml">enable support for C implementation using libyaml</flag>
   </use>
diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
index 4fecbd76e7e6..bd8a169b1405 100644
--- a/dev-python/pyzmq/metadata.xml
+++ b/dev-python/pyzmq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="green">Enable gevent compatibility with zeromq</flag>
   </use>
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index c04565ff4da6..78c3f82cc748 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="pyzord">enable support for pyzord</flag>
     <flag name="mysql">Enables mysql support</flag>
diff --git a/dev-python/qpid-python/metadata.xml b/dev-python/qpid-python/metadata.xml
index 58ef75bf0e87..8556bd7eabc7 100644
--- a/dev-python/qpid-python/metadata.xml
+++ b/dev-python/qpid-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">qpid-python</remote-id>
   </upstream>
diff --git a/dev-python/qrcode/metadata.xml b/dev-python/qrcode/metadata.xml
index 76d59aacfa6a..4df55798b1d2 100644
--- a/dev-python/qrcode/metadata.xml
+++ b/dev-python/qrcode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">qrcode</remote-id>
 	</upstream>
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index e189b933de5a..613fc63daf26 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>phil@riverbankcomputing.com</email>
diff --git a/dev-python/qserve/metadata.xml b/dev-python/qserve/metadata.xml
index 9ec5d84fb802..0b53cdf5a61d 100644
--- a/dev-python/qserve/metadata.xml
+++ b/dev-python/qserve/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">qserve</remote-id>
     <remote-id type="github">pediapress/qserve</remote-id>
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index 0f494057d03a..e7eca32221cf 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     A rich Qt-based console for working with Jupyter kernels,
     supporting rich media output, session export, and more.
diff --git a/dev-python/queuelib/metadata.xml b/dev-python/queuelib/metadata.xml
index 257589dd8ef3..2dd8f1fc4e71 100644
--- a/dev-python/queuelib/metadata.xml
+++ b/dev-python/queuelib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">scrapy/queuelib</remote-id>
   </upstream>
diff --git a/dev-python/quixote/metadata.xml b/dev-python/quixote/metadata.xml
index 8dd6d62f0de2..4cc80616a5f5 100644
--- a/dev-python/quixote/metadata.xml
+++ b/dev-python/quixote/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/rackspace-auth-openstack/metadata.xml b/dev-python/rackspace-auth-openstack/metadata.xml
index 50a2b54e0958..4a72aa246981 100644
--- a/dev-python/rackspace-auth-openstack/metadata.xml
+++ b/dev-python/rackspace-auth-openstack/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     This is a plugin for OpenStack Clients which provides client support for
 	Rackspace authentication extensions to OpenStack.
diff --git a/dev-python/rackspace-monitoring-cli/metadata.xml b/dev-python/rackspace-monitoring-cli/metadata.xml
index a2e2096eeb44..65fbf937a45d 100644
--- a/dev-python/rackspace-monitoring-cli/metadata.xml
+++ b/dev-python/rackspace-monitoring-cli/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Command Line Utility for Rackspace Cloud Monitoring (MaaS)
   </longdescription>
diff --git a/dev-python/rackspace-monitoring/metadata.xml b/dev-python/rackspace-monitoring/metadata.xml
index 22de5298d962..2763309e5a1f 100644
--- a/dev-python/rackspace-monitoring/metadata.xml
+++ b/dev-python/rackspace-monitoring/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Client library for Rackspace Cloud Monitoring.
   </longdescription>
diff --git a/dev-python/rackspace-novaclient/metadata.xml b/dev-python/rackspace-novaclient/metadata.xml
index cb12089c0dd0..99301448b7ad 100644
--- a/dev-python/rackspace-novaclient/metadata.xml
+++ b/dev-python/rackspace-novaclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Metapackage to install python-novaclient and Rackspace extensions
   </longdescription>
diff --git a/dev-python/raet/metadata.xml b/dev-python/raet/metadata.xml
index 99c6c318206c..64873fc55b54 100644
--- a/dev-python/raet/metadata.xml
+++ b/dev-python/raet/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">raet</remote-id>
     <remote-id type="github">saltstack/raet</remote-id>
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml b/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
index ba06ddf71786..bd61dc837d9c 100644
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Adds instance default networks extension support to python-novaclient
   </longdescription>
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml b/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml
index 7f7c40453920..4db8923fef4a 100644
--- a/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Adds backup-schedule extension support to python-novaclient.
   </longdescription>
diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml
index 53fc3d1ed97e..f9813009b5c6 100644
--- a/dev-python/rdflib/metadata.xml
+++ b/dev-python/rdflib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="redland">enable support for Redland triplestore</flag>
   </use>
diff --git a/dev-python/readme/metadata.xml b/dev-python/readme/metadata.xml
index c4cf8bf04860..e37354784b88 100644
--- a/dev-python/readme/metadata.xml
+++ b/dev-python/readme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">readme</remote-id>
     <remote-id type="github">pypa/readme</remote-id>
diff --git a/dev-python/recaptcha-client/metadata.xml b/dev-python/recaptcha-client/metadata.xml
index d27c7095178e..2193a2540506 100644
--- a/dev-python/recaptcha-client/metadata.xml
+++ b/dev-python/recaptcha-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">recaptcha-client</remote-id>
   </upstream>
diff --git a/dev-python/reconfigure/metadata.xml b/dev-python/reconfigure/metadata.xml
index 89f2c4d320c0..67547cee7702 100644
--- a/dev-python/reconfigure/metadata.xml
+++ b/dev-python/reconfigure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">reconfigure</remote-id>
   </upstream>
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index b6916ebdbbbf..7b7a9b35cfcd 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">redis</remote-id>
     <remote-id type="github">andymccurdy/redis-py</remote-id>
diff --git a/dev-python/regendoc/metadata.xml b/dev-python/regendoc/metadata.xml
index 0fda211cdadc..60506a505ae8 100644
--- a/dev-python/regendoc/metadata.xml
+++ b/dev-python/regendoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pip</remote-id>
     <remote-id type="bitbucket">pytest-dev/regendoc</remote-id>
diff --git a/dev-python/regex/metadata.xml b/dev-python/regex/metadata.xml
index bea963872644..c02a1c9328af 100644
--- a/dev-python/regex/metadata.xml
+++ b/dev-python/regex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">regex</remote-id>
     <remote-id type="bitbucket">mrabarnett/mrab-regex</remote-id>
diff --git a/dev-python/reportlab/metadata.xml b/dev-python/reportlab/metadata.xml
index feed4369aef5..9c9962ea224f 100644
--- a/dev-python/reportlab/metadata.xml
+++ b/dev-python/reportlab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   The ReportLab Toolkit is a Python library for generating
   PDFs and graphics.
diff --git a/dev-python/repoze-lru/metadata.xml b/dev-python/repoze-lru/metadata.xml
index 6a927037604c..e4416e4974e6 100644
--- a/dev-python/repoze-lru/metadata.xml
+++ b/dev-python/repoze-lru/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">repoze.lru</remote-id>
   </upstream>
diff --git a/dev-python/repoze-sphinx-autointerface/metadata.xml b/dev-python/repoze-sphinx-autointerface/metadata.xml
index 266dfde2c0ad..77fb238869df 100644
--- a/dev-python/repoze-sphinx-autointerface/metadata.xml
+++ b/dev-python/repoze-sphinx-autointerface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">repoze.sphinx.autointerface</remote-id>
 	</upstream>
diff --git a/dev-python/repoze-who/metadata.xml b/dev-python/repoze-who/metadata.xml
index a61ca1538e10..b86462b56d84 100644
--- a/dev-python/repoze-who/metadata.xml
+++ b/dev-python/repoze-who/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	an identification and authentication framework for WSGI.
 	</longdescription>
diff --git a/dev-python/requests-cache/metadata.xml b/dev-python/requests-cache/metadata.xml
index 7ad6e2f72212..9b39535a056d 100644
--- a/dev-python/requests-cache/metadata.xml
+++ b/dev-python/requests-cache/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>zx2c4@gentoo.org</email>
     <name>Jason A. Donenfeld</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">requests-cache</remote-id>
   </upstream>
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index fd6d3b64fde4..309796305d2c 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/requests-oauthlib/metadata.xml b/dev-python/requests-oauthlib/metadata.xml
index 8d601f653b24..56483dd9718a 100644
--- a/dev-python/requests-oauthlib/metadata.xml
+++ b/dev-python/requests-oauthlib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">requests/requests-oauthlib</remote-id>
 	</upstream>
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index 875d26fa6c23..91d27547cfc4 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">requests</remote-id>
   </upstream>
diff --git a/dev-python/responses/metadata.xml b/dev-python/responses/metadata.xml
index d7dea0061984..8e17a208ce6e 100644
--- a/dev-python/responses/metadata.xml
+++ b/dev-python/responses/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">getsentry/responses</remote-id>
 	</upstream>
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index d8910af20cf0..a9a9608e0f36 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pnpnpn/retry-decorator</remote-id>
   </upstream>
diff --git a/dev-python/retrying/metadata.xml b/dev-python/retrying/metadata.xml
index d97f4a44bf78..724196315d27 100644
--- a/dev-python/retrying/metadata.xml
+++ b/dev-python/retrying/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
 	Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything.
 	</longdescription>
diff --git a/dev-python/reverend/metadata.xml b/dev-python/reverend/metadata.xml
index bc09d5b5945e..daa4f112691f 100644
--- a/dev-python/reverend/metadata.xml
+++ b/dev-python/reverend/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Reverend</remote-id>
 		<remote-id type="sourceforge">reverend</remote-id>
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index 80791af85dc5..00fe42426fd5 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
 	Validating URI References per RFC 3986
 	</longdescription>
diff --git a/dev-python/rlcompleter2/metadata.xml b/dev-python/rlcompleter2/metadata.xml
index 649fc1495ae0..eca9403eeaa5 100644
--- a/dev-python/rlcompleter2/metadata.xml
+++ b/dev-python/rlcompleter2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">rlcompleter2</remote-id>
 	</upstream>
diff --git a/dev-python/robotframework-selenium2library/metadata.xml b/dev-python/robotframework-selenium2library/metadata.xml
index 3be6755f6c6f..b662aaa3dafd 100644
--- a/dev-python/robotframework-selenium2library/metadata.xml
+++ b/dev-python/robotframework-selenium2library/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomac/robotframework-selenium2library</remote-id>
     <remote-id type="pypi">robotframework-selenium2library</remote-id>
diff --git a/dev-python/robotframework-sshlibrary/metadata.xml b/dev-python/robotframework-sshlibrary/metadata.xml
index d60a70340f85..0583ea551f92 100644
--- a/dev-python/robotframework-sshlibrary/metadata.xml
+++ b/dev-python/robotframework-sshlibrary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">robotframework-sshlibrary</remote-id>
     <remote-id type="pypi">robotframework-sshlibrary</remote-id>
diff --git a/dev-python/robotframework/metadata.xml b/dev-python/robotframework/metadata.xml
index ee063083712e..9d478596933e 100644
--- a/dev-python/robotframework/metadata.xml
+++ b/dev-python/robotframework/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">robotframework</remote-id>
     <remote-id type="pypi">robotframework</remote-id>
diff --git a/dev-python/roman/metadata.xml b/dev-python/roman/metadata.xml
index 4caedadf2ddc..20106208e351 100644
--- a/dev-python/roman/metadata.xml
+++ b/dev-python/roman/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">roman</remote-id>
   </upstream>
diff --git a/dev-python/root_numpy/metadata.xml b/dev-python/root_numpy/metadata.xml
index de695cc31797..5f2a120a5da8 100644
--- a/dev-python/root_numpy/metadata.xml
+++ b/dev-python/root_numpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   root_numpy is a Python extension for converting ROOT TTrees into
   NumPy recarrays or structured arrays. With the core internals
diff --git a/dev-python/rootpy/metadata.xml b/dev-python/rootpy/metadata.xml
index e00be2ed2d95..1d3ca2051197 100644
--- a/dev-python/rootpy/metadata.xml
+++ b/dev-python/rootpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   The rootpy project is a community-driven initiative aiming to provide
   a more pythonic interface with ROOT on top of the existing PyROOT
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index 711e52fa81ac..65c19a8dd1f7 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Rope is a python refactoring library.
   </longdescription>
diff --git a/dev-python/ropeide/metadata.xml b/dev-python/ropeide/metadata.xml
index cc44ce4146d8..24ee67845818 100644
--- a/dev-python/ropeide/metadata.xml
+++ b/dev-python/ropeide/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rope</remote-id>
 	</upstream>
diff --git a/dev-python/ropemacs/metadata.xml b/dev-python/ropemacs/metadata.xml
index 9bd7533d64eb..d4ce793ca45c 100644
--- a/dev-python/ropemacs/metadata.xml
+++ b/dev-python/ropemacs/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>emacs</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>emacs@gentoo.org</email>
+    <name>Gentoo Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ropemacs</remote-id>
     <remote-id type="sourceforge">rope</remote-id>
diff --git a/dev-python/ropemode/metadata.xml b/dev-python/ropemode/metadata.xml
index 8aab68f63068..aa733cd2e338 100644
--- a/dev-python/ropemode/metadata.xml
+++ b/dev-python/ropemode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ropemode</remote-id>
 	</upstream>
diff --git a/dev-python/rosdistro/metadata.xml b/dev-python/rosdistro/metadata.xml
index 0a799247b03d..d75b7c478ad2 100644
--- a/dev-python/rosdistro/metadata.xml
+++ b/dev-python/rosdistro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/rosdistro</remote-id>
 	</upstream>
diff --git a/dev-python/rospkg/metadata.xml b/dev-python/rospkg/metadata.xml
index 02ab2c759bcc..edf3b7137d69 100644
--- a/dev-python/rospkg/metadata.xml
+++ b/dev-python/rospkg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/rospkg</remote-id>
 	</upstream>
diff --git a/dev-python/routes/metadata.xml b/dev-python/routes/metadata.xml
index 2c6bedd73313..1f5d4ac40512 100644
--- a/dev-python/routes/metadata.xml
+++ b/dev-python/routes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Routes</remote-id>
 	</upstream>
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index b1b5e025f67a..e2a81ee12976 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">alex/rply</remote-id>
   </upstream>
diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy/metadata.xml
index 4f471223e05e..db9f3dc11b36 100644
--- a/dev-python/rpy/metadata.xml
+++ b/dev-python/rpy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   RPy provides a robust Python interface to the R programming
   language. It can manage R objects and can execute arbitrary R
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 5d21deec2ad0..716b8d512bb5 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>Remote python call</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">rpyc</remote-id>
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index 310d6b44cf36..1f5430d1f989 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">rsa</remote-id>
   </upstream>
diff --git a/dev-python/rst2pdf/metadata.xml b/dev-python/rst2pdf/metadata.xml
index 792f01232426..efe3cc56a415 100644
--- a/dev-python/rst2pdf/metadata.xml
+++ b/dev-python/rst2pdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">rst2pdf</remote-id>
   </upstream>
diff --git a/dev-python/rtgraph/metadata.xml b/dev-python/rtgraph/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/rtgraph/metadata.xml
+++ b/dev-python/rtgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/rtslib-fb/metadata.xml b/dev-python/rtslib-fb/metadata.xml
index 42140b4d7f46..a5bcdaf20bb8 100644
--- a/dev-python/rtslib-fb/metadata.xml
+++ b/dev-python/rtslib-fb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
      A Python object API for managing the Linux LIO kernel target
   </longdescription>
diff --git a/dev-python/rtslib/metadata.xml b/dev-python/rtslib/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/dev-python/rtslib/metadata.xml
+++ b/dev-python/rtslib/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/ruledispatch/metadata.xml b/dev-python/ruledispatch/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/ruledispatch/metadata.xml
+++ b/dev-python/ruledispatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/runsnakerun/metadata.xml b/dev-python/runsnakerun/metadata.xml
index afc69a780278..af088b28a04a 100644
--- a/dev-python/runsnakerun/metadata.xml
+++ b/dev-python/runsnakerun/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>swegener@gentoo.org</email>
     <name>Sven Wegener</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">RunSnakeRun</remote-id>
   </upstream>
diff --git a/dev-python/sampy/metadata.xml b/dev-python/sampy/metadata.xml
index 0a569a2a9a28..9e436f82baf9 100644
--- a/dev-python/sampy/metadata.xml
+++ b/dev-python/sampy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   SAMPy is a Python implementation of the Internation Virtual
   Astronomy Organiztion of the Simple Application
diff --git a/dev-python/sancho/metadata.xml b/dev-python/sancho/metadata.xml
index a816521c48d1..f91bd046e19f 100644
--- a/dev-python/sancho/metadata.xml
+++ b/dev-python/sancho/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/scientificpython/metadata.xml b/dev-python/scientificpython/metadata.xml
index 60d277ea12fa..dd70df2d50e5 100644
--- a/dev-python/scientificpython/metadata.xml
+++ b/dev-python/scientificpython/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   ScientificPython is a collection of Python modules that are useful for
   scientific computing. In this collection you will find modules that
diff --git a/dev-python/scimath/metadata.xml b/dev-python/scimath/metadata.xml
index 67f15cfd0d03..b010a0661939 100644
--- a/dev-python/scimath/metadata.xml
+++ b/dev-python/scimath/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
     The SciMath project from the Enthought Tool Suite includes
     packages to support scientific and mathematical calculations,
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index 4733256d88aa..db56c0a44c43 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>maksbotan@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="boto">Add support for Amazon S3 via <pkg>dev-python/boto</pkg></flag>
     <flag name="ibl">Use Instace Based Learning alrogirithm for automatic extraction</flag>
diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
index 7881e9f87271..6eba40691f8d 100644
--- a/dev-python/scripttest/metadata.xml
+++ b/dev-python/scripttest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ScriptTest</remote-id>
 	</upstream>
diff --git a/dev-python/seaborn/metadata.xml b/dev-python/seaborn/metadata.xml
index e0dbf67a5473..8f97e632387d 100644
--- a/dev-python/seaborn/metadata.xml
+++ b/dev-python/seaborn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 Seaborn is a library for making attractive and informative statistical graphics
 in Python. It is built on top of matplotlib and tightly integrated with the 
diff --git a/dev-python/selenium/metadata.xml b/dev-python/selenium/metadata.xml
index db4d8b6b09ac..01d1ae3870f9 100644
--- a/dev-python/selenium/metadata.xml
+++ b/dev-python/selenium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">selenium</remote-id>
     <remote-id type="github">SeleniumHQ/selenium</remote-id>
diff --git a/dev-python/semantic_version/metadata.xml b/dev-python/semantic_version/metadata.xml
index 6529a29c0fd6..f350febefe6a 100644
--- a/dev-python/semantic_version/metadata.xml
+++ b/dev-python/semantic_version/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     This small python library provides a few tools to handle SemVer in Python. It follows strictly the 2.0.0 version of the SemVer scheme.
   </longdescription>
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
index 149121d3eff7..a7232887375d 100644
--- a/dev-python/send2trash/metadata.xml
+++ b/dev-python/send2trash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Send2Trash</remote-id>
     <remote-id type="github">hsoft/send2trash</remote-id>
diff --git a/dev-python/serpent/metadata.xml b/dev-python/serpent/metadata.xml
index 264a869b9488..88841dd360b0 100644
--- a/dev-python/serpent/metadata.xml
+++ b/dev-python/serpent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">serpent</remote-id>
 		<remote-id type="github">irmen/Serpent</remote-id>
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index 9b8cc20e2223..082ced5111b4 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">service_identity</remote-id>
     <remote-id type="github">pyca/service_identity</remote-id>
diff --git a/dev-python/setproctitle/metadata.xml b/dev-python/setproctitle/metadata.xml
index 4f5a535f3b4b..f27b74681b20 100644
--- a/dev-python/setproctitle/metadata.xml
+++ b/dev-python/setproctitle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">setproctitle</remote-id>
 	</upstream>
diff --git a/dev-python/setuptools-git/metadata.xml b/dev-python/setuptools-git/metadata.xml
index cb6a3ae1a4ef..b422be30d8d7 100644
--- a/dev-python/setuptools-git/metadata.xml
+++ b/dev-python/setuptools-git/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Setuptools revision control system plugin for Git
   </longdescription>
diff --git a/dev-python/setuptools/metadata.xml b/dev-python/setuptools/metadata.xml
index b05fb95fd33f..024599a34b28 100644
--- a/dev-python/setuptools/metadata.xml
+++ b/dev-python/setuptools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">setuptools</remote-id>
   </upstream>
diff --git a/dev-python/setuptools_hg/metadata.xml b/dev-python/setuptools_hg/metadata.xml
index 7d3dea218e16..71696461a33c 100644
--- a/dev-python/setuptools_hg/metadata.xml
+++ b/dev-python/setuptools_hg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>setuptools_hg is a plugin for setuptools/distribute to enable it to find files under the Mercurial version control system.</longdescription>
   <upstream>
     <remote-id type="pypi">setuptools_hg</remote-id>
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
index 8885953e4b8c..aac370abf0a1 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">setuptools_scm</remote-id>
 		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/dev-python/shiboken/metadata.xml
+++ b/dev-python/shiboken/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/shm/metadata.xml b/dev-python/shm/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/shm/metadata.xml
+++ b/dev-python/shm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/simplegeneric/metadata.xml b/dev-python/simplegeneric/metadata.xml
index 81395895b629..5c9fed3a1b19 100644
--- a/dev-python/simplegeneric/metadata.xml
+++ b/dev-python/simplegeneric/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>The simplegeneric module lets you define simple single-dispatch
   generic functions, akin to Python's built-in generic functions like len(),
   iter() and so on. However, instead of using specially-named methods, these
diff --git a/dev-python/simplejson/metadata.xml b/dev-python/simplejson/metadata.xml
index a53cc93ce1e3..78e6212e4134 100644
--- a/dev-python/simplejson/metadata.xml
+++ b/dev-python/simplejson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">simplejson</remote-id>
   </upstream>
diff --git a/dev-python/simplekv/metadata.xml b/dev-python/simplekv/metadata.xml
index 4b9133c78f3b..a01b14c7efbc 100644
--- a/dev-python/simplekv/metadata.xml
+++ b/dev-python/simplekv/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">simplekv</remote-id>
     <remote-id type="github">mbr/simplekv</remote-id>
diff --git a/dev-python/simpleparse/metadata.xml b/dev-python/simpleparse/metadata.xml
index a0a170fb235a..5801f40a6329 100644
--- a/dev-python/simpleparse/metadata.xml
+++ b/dev-python/simpleparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">SimpleParse</remote-id>
 		<remote-id type="sourceforge">simpleparse</remote-id>
diff --git a/dev-python/simples3/metadata.xml b/dev-python/simples3/metadata.xml
index f98bb7f53d6c..23d821c3a82c 100644
--- a/dev-python/simples3/metadata.xml
+++ b/dev-python/simples3/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxy-Maintainer, assign bugs</description>
 	</maintainer>
-	<herd>python</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">simples3</remote-id>
 	</upstream>
diff --git a/dev-python/simplesettings/metadata.xml b/dev-python/simplesettings/metadata.xml
index 9c4eac8d5bca..8e36182588ea 100644
--- a/dev-python/simplesettings/metadata.xml
+++ b/dev-python/simplesettings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">simplesettings</remote-id>
 	</upstream>
diff --git a/dev-python/simpletal/metadata.xml b/dev-python/simpletal/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/simpletal/metadata.xml
+++ b/dev-python/simpletal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/simpy/metadata.xml b/dev-python/simpy/metadata.xml
index b4a764d95ee7..2eb14d59f5ef 100644
--- a/dev-python/simpy/metadata.xml
+++ b/dev-python/simpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">simpy</remote-id>
     <remote-id type="sourceforge">simpy</remote-id>
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index 318329c4c49f..cceae366066f 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>phil@riverbankcomputing.com</email>
diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml
index ce1e3409b591..d90acae9ebac 100644
--- a/dev-python/six/metadata.xml
+++ b/dev-python/six/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">six</remote-id>
     <remote-id type="bitbucket">gutworth/six</remote-id>
diff --git a/dev-python/sleekxmpp/metadata.xml b/dev-python/sleekxmpp/metadata.xml
index e75375bafac9..de697afa1504 100644
--- a/dev-python/sleekxmpp/metadata.xml
+++ b/dev-python/sleekxmpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fritzy/SleekXMPP</remote-id>
   </upstream>
diff --git a/dev-python/slowaes/metadata.xml b/dev-python/slowaes/metadata.xml
index 8de95c1970cf..d2d5ebab70a8 100644
--- a/dev-python/slowaes/metadata.xml
+++ b/dev-python/slowaes/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -14,6 +13,10 @@
     <email>maksverver@geocities.com</email>
     <name>Maks Verver</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">slowaes</remote-id>
   </upstream>
diff --git a/dev-python/smmap/metadata.xml b/dev-python/smmap/metadata.xml
index e4c82cb2ad4f..c7274e5f9767 100644
--- a/dev-python/smmap/metadata.xml
+++ b/dev-python/smmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">smmap</remote-id>
     <remote-id type="github">Byron/smmap</remote-id>
diff --git a/dev-python/snakefood/metadata.xml b/dev-python/snakefood/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/snakefood/metadata.xml
+++ b/dev-python/snakefood/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/snappy/metadata.xml b/dev-python/snappy/metadata.xml
index 265fef812185..14a8ab3e6500 100644
--- a/dev-python/snappy/metadata.xml
+++ b/dev-python/snappy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-snappy</remote-id>
   </upstream>
diff --git a/dev-python/snowballstemmer/metadata.xml b/dev-python/snowballstemmer/metadata.xml
index b37f5be03c6f..0d2c4e463e67 100644
--- a/dev-python/snowballstemmer/metadata.xml
+++ b/dev-python/snowballstemmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">snowballstemmer</remote-id>
     <remote-id type="github">shibukawa/snowball_py</remote-id>
diff --git a/dev-python/soappy/metadata.xml b/dev-python/soappy/metadata.xml
index bb2091ec0c7c..03d1dee48e5d 100644
--- a/dev-python/soappy/metadata.xml
+++ b/dev-python/soappy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">SOAPpy</remote-id>
 		<remote-id type="sourceforge">pywebsvcs</remote-id>
diff --git a/dev-python/socketio-client/metadata.xml b/dev-python/socketio-client/metadata.xml
index d807809d831b..936fc1ec3bbd 100644
--- a/dev-python/socketio-client/metadata.xml
+++ b/dev-python/socketio-client/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">socketIO-client</remote-id>
 		<remote-id type="github">invisibleroads/socketIO-client</remote-id>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
index 5d682bb96d18..ffcb61b90ab8 100644
--- a/dev-python/socketpool/metadata.xml
+++ b/dev-python/socketpool/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">socketpool</remote-id>
     <remote-id type="github">benoitc/socketpool</remote-id>
diff --git a/dev-python/socksipy/metadata.xml b/dev-python/socksipy/metadata.xml
index f5ef976ba101..00ee6ebfe344 100644
--- a/dev-python/socksipy/metadata.xml
+++ b/dev-python/socksipy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">socksipy</remote-id>
 	</upstream>
diff --git a/dev-python/south/metadata.xml b/dev-python/south/metadata.xml
index e049460bf258..a0ec2a52f46b 100644
--- a/dev-python/south/metadata.xml
+++ b/dev-python/south/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">south</remote-id>
   </upstream>
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/soya/metadata.xml
+++ b/dev-python/soya/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/sparql-wrapper/metadata.xml b/dev-python/sparql-wrapper/metadata.xml
index 2eb3da498b19..30c559855fe9 100644
--- a/dev-python/sparql-wrapper/metadata.xml
+++ b/dev-python/sparql-wrapper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">SPARQLWrapper</remote-id>
   </upstream>
diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
index 8ca5f2f0f580..00859e07cbd3 100644
--- a/dev-python/speaklater/metadata.xml
+++ b/dev-python/speaklater/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">speaklater</remote-id>
     <remote-id type="github">mitsuhiko/speaklater</remote-id>
diff --git a/dev-python/sphinx-better-theme/metadata.xml b/dev-python/sphinx-better-theme/metadata.xml
index 3f80e6c2f783..d420b241f5d4 100644
--- a/dev-python/sphinx-better-theme/metadata.xml
+++ b/dev-python/sphinx-better-theme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinx-better-theme</remote-id>
     <remote-id type="github">irskep/sphinx-better-theme</remote-id>
diff --git a/dev-python/sphinx-bootstrap-theme/metadata.xml b/dev-python/sphinx-bootstrap-theme/metadata.xml
index ebf5b8a4dc1c..f5f5889d53bc 100644
--- a/dev-python/sphinx-bootstrap-theme/metadata.xml
+++ b/dev-python/sphinx-bootstrap-theme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
   </upstream>
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
index 647e8ec840ab..9a6a32f34bcf 100644
--- a/dev-python/sphinx/metadata.xml
+++ b/dev-python/sphinx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or
     other documents consisting of multiple reStructuredText sources).</longdescription>
   <upstream>
diff --git a/dev-python/sphinx_rtd_theme/metadata.xml b/dev-python/sphinx_rtd_theme/metadata.xml
index f1054646c761..884b7db6a83c 100644
--- a/dev-python/sphinx_rtd_theme/metadata.xml
+++ b/dev-python/sphinx_rtd_theme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinx_rtd_theme</remote-id>
     <remote-id type="github">snide/sphinx_rtd_theme</remote-id>
diff --git a/dev-python/sphinxcontrib-doxylink/metadata.xml b/dev-python/sphinxcontrib-doxylink/metadata.xml
index 229aef6d540e..fa7e0146ef72 100644
--- a/dev-python/sphinxcontrib-doxylink/metadata.xml
+++ b/dev-python/sphinxcontrib-doxylink/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-doxylink</remote-id>
     <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-googleanalytics/metadata.xml b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
index f312ebabd5e6..e7e0b6135c80 100644
--- a/dev-python/sphinxcontrib-googleanalytics/metadata.xml
+++ b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-googleanalytics</remote-id>
     <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
index 3759492bd555..1c5bbd391013 100644
--- a/dev-python/sphinxcontrib-httpdomain/metadata.xml
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
     <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-issuetracker/metadata.xml b/dev-python/sphinxcontrib-issuetracker/metadata.xml
index 92945277e202..ecb7920bbce0 100644
--- a/dev-python/sphinxcontrib-issuetracker/metadata.xml
+++ b/dev-python/sphinxcontrib-issuetracker/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-issuetracker</remote-id>
 	</upstream>
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index e3954e33e9a6..7110a12f4107 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   A Sphinx extension to literally insert the output of arbitrary
   commands into documents, helping you to keep your command examples
diff --git a/dev-python/sphinxtogithub/metadata.xml b/dev-python/sphinxtogithub/metadata.xml
index 807e5f4823fb..fd6dfed0f1ac 100644
--- a/dev-python/sphinxtogithub/metadata.xml
+++ b/dev-python/sphinxtogithub/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxtogithub</remote-id>
     <remote-id type="github">michaeljones/sphinx-to-github</remote-id>
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index c4364ce877cf..b22808b15bb8 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   Spyder development environment and its PyQt4-based IDE tools:
   interactive Python shell, Python code editor, workspace
diff --git a/dev-python/sqlalchemy-migrate/metadata.xml b/dev-python/sqlalchemy-migrate/metadata.xml
index e72e7712b797..11cc5f623240 100644
--- a/dev-python/sqlalchemy-migrate/metadata.xml
+++ b/dev-python/sqlalchemy-migrate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">sqlalchemy-migrate</remote-id>
     <remote-id type="pypi">sqlalchemy-migrate</remote-id>
diff --git a/dev-python/sqlalchemy/metadata.xml b/dev-python/sqlalchemy/metadata.xml
index e289219495da..8fe1e5ef0c5a 100644
--- a/dev-python/sqlalchemy/metadata.xml
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">SQLAlchemy</remote-id>
 	</upstream>
diff --git a/dev-python/sqlite3dbm/metadata.xml b/dev-python/sqlite3dbm/metadata.xml
index a461b42c335d..bd3c1f952930 100644
--- a/dev-python/sqlite3dbm/metadata.xml
+++ b/dev-python/sqlite3dbm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Yelp/sqlite3dbm</remote-id>
   </upstream>
diff --git a/dev-python/sqlitecachec/metadata.xml b/dev-python/sqlitecachec/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/sqlitecachec/metadata.xml
+++ b/dev-python/sqlitecachec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/sqlobject/metadata.xml b/dev-python/sqlobject/metadata.xml
index 69b386336afc..53025ad1462e 100644
--- a/dev-python/sqlobject/metadata.xml
+++ b/dev-python/sqlobject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>SQLObject is an object-relational mapper. It allows you to translate RDBMS table rows into Python objects and manipulate
 	those objects to transparently manipulate the database.</longdescription>
 	<longdescription lang="ja">SQLObject はオブジェクト・リレーショナル・マッパです。これはデータベースの操作を明瞭にするため、RDBMS のテーブル列を Python
diff --git a/dev-python/squaremap/metadata.xml b/dev-python/squaremap/metadata.xml
index 7ca81b3ec348..9b6cb435a9cb 100644
--- a/dev-python/squaremap/metadata.xml
+++ b/dev-python/squaremap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>swegener@gentoo.org</email>
     <name>Sven Wegener</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">SquareMap</remote-id>
   </upstream>
diff --git a/dev-python/ssh/metadata.xml b/dev-python/ssh/metadata.xml
index a1fdb467c668..9743a7e75cf8 100644
--- a/dev-python/ssh/metadata.xml
+++ b/dev-python/ssh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ssh</remote-id>
 	</upstream>
diff --git a/dev-python/ssl-fetch/metadata.xml b/dev-python/ssl-fetch/metadata.xml
index 8d318a8ca736..dc416b087ca0 100644
--- a/dev-python/ssl-fetch/metadata.xml
+++ b/dev-python/ssl-fetch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tools-portage</herd>
   <maintainer>
     <email>dolsen@gentoo.org</email>
     <name>Brian Dolbec</name>
@@ -10,6 +9,10 @@
     <email>dastergon@gentoo.org</email>
     <name>Pavlos Ratis</name>
   </maintainer>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dol-sen/ssl-fetch</remote-id>
   </upstream>
diff --git a/dev-python/starcluster/metadata.xml b/dev-python/starcluster/metadata.xml
index d4c7dbd1c8e6..0fa7fa329aa1 100644
--- a/dev-python/starcluster/metadata.xml
+++ b/dev-python/starcluster/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="epydoc">Enable build of apidocs in html using epydoc</flag>
   </use>
diff --git a/dev-python/statistics/metadata.xml b/dev-python/statistics/metadata.xml
index 5e33c5ad0505..0cfbeb511623 100644
--- a/dev-python/statistics/metadata.xml
+++ b/dev-python/statistics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">statistics</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index c371fe81e6ea..56ac80e58290 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   statsmodels is a Python module that allows users to explore data,
   estimate statistical models, and perform statistical tests. An
diff --git a/dev-python/steadymark/metadata.xml b/dev-python/steadymark/metadata.xml
index 8d39b56b2cd1..f9789693c44d 100644
--- a/dev-python/steadymark/metadata.xml
+++ b/dev-python/steadymark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">steadymark</remote-id>
     <remote-id type="github">gabrielfalcao/steadymark</remote-id>
diff --git a/dev-python/stevedore/metadata.xml b/dev-python/stevedore/metadata.xml
index a93084d00c4f..dcfc1492568e 100644
--- a/dev-python/stevedore/metadata.xml
+++ b/dev-python/stevedore/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">stevedore</remote-id>
     <remote-id type="github">openstack/stevedore</remote-id>
diff --git a/dev-python/stomper/metadata.xml b/dev-python/stomper/metadata.xml
index 98087bc50e6b..8df21f298d71 100644
--- a/dev-python/stomper/metadata.xml
+++ b/dev-python/stomper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">stomper</remote-id>
 	</upstream>
diff --git a/dev-python/storm/metadata.xml b/dev-python/storm/metadata.xml
index eb2ab1aa0af2..5ab7fad19daa 100644
--- a/dev-python/storm/metadata.xml
+++ b/dev-python/storm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">storm</remote-id>
 	</upstream>
diff --git a/dev-python/strict-rfc3339/metadata.xml b/dev-python/strict-rfc3339/metadata.xml
index fde303d0e557..d3dae1d69403 100644
--- a/dev-python/strict-rfc3339/metadata.xml
+++ b/dev-python/strict-rfc3339/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">strict-rfc3339</remote-id>
 		<remote-id type="github">danielrichman/strict-rfc3339</remote-id>
diff --git a/dev-python/stripogram/metadata.xml b/dev-python/stripogram/metadata.xml
index d3c511b1b70e..383480cf32e1 100644
--- a/dev-python/stripogram/metadata.xml
+++ b/dev-python/stripogram/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">stripogram</remote-id>
 	</upstream>
diff --git a/dev-python/stsci-distutils/metadata.xml b/dev-python/stsci-distutils/metadata.xml
index 9d1830ea8ac0..6af906458e24 100644
--- a/dev-python/stsci-distutils/metadata.xml
+++ b/dev-python/stsci-distutils/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription>
   This package contains utilities used to package some of STScI's Python
   projects; specifically those projects that comprise stsci_python and
diff --git a/dev-python/stsci-sphinxext/metadata.xml b/dev-python/stsci-sphinxext/metadata.xml
index b30466cf748a..54d13fb3bdb3 100644
--- a/dev-python/stsci-sphinxext/metadata.xml
+++ b/dev-python/stsci-sphinxext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   This project contains extensions to Sphinx to build documentation
   from Space Telescope Science Institute.
diff --git a/dev-python/subunit/metadata.xml b/dev-python/subunit/metadata.xml
index 77be1e060a18..7d0f4ef8f5d2 100644
--- a/dev-python/subunit/metadata.xml
+++ b/dev-python/subunit/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>bazaar</herd>
-	<herd>python</herd>
-	<herd>openstack</herd>
+	<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">subunit</remote-id>
 	</upstream>
diff --git a/dev-python/subvertpy/metadata.xml b/dev-python/subvertpy/metadata.xml
index a05c0b585be1..53bbd5e2eb47 100644
--- a/dev-python/subvertpy/metadata.xml
+++ b/dev-python/subvertpy/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>bazaar</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/suds/metadata.xml b/dev-python/suds/metadata.xml
index ec200de66966..f20c40d2a096 100644
--- a/dev-python/suds/metadata.xml
+++ b/dev-python/suds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">A lightweight SOAP python client for consuming Web Services.</longdescription>
 	<upstream>
 		<remote-id type="pypi">suds</remote-id>
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index 5ccabfca54c5..d5c634465bff 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
diff --git a/dev-python/sure/metadata.xml b/dev-python/sure/metadata.xml
index 86a8cab220a9..eb88bc748827 100644
--- a/dev-python/sure/metadata.xml
+++ b/dev-python/sure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">sure</remote-id>
     <remote-id type="github">gabrielfalcao/sure</remote-id>
diff --git a/dev-python/symboltype/metadata.xml b/dev-python/symboltype/metadata.xml
index 9258479a4ac6..e35a2fdf20cc 100644
--- a/dev-python/symboltype/metadata.xml
+++ b/dev-python/symboltype/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">SymbolType</remote-id>
   </upstream>
diff --git a/dev-python/sympy/metadata.xml b/dev-python/sympy/metadata.xml
index d24ae6385695..2f4342b48777 100644
--- a/dev-python/sympy/metadata.xml
+++ b/dev-python/sympy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
  SymPy is a Python library for symbolic mathematics (manipulation). It
  aims to become a full-featured computer algebra system (CAS) while keeping
diff --git a/dev-python/tablib/metadata.xml b/dev-python/tablib/metadata.xml
index f253786e7cac..0ab28cba6085 100644
--- a/dev-python/tablib/metadata.xml
+++ b/dev-python/tablib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tablib</remote-id>
   </upstream>
diff --git a/dev-python/tabulate/metadata.xml b/dev-python/tabulate/metadata.xml
index 12f09a768cf2..b7dda7bd2ad5 100644
--- a/dev-python/tabulate/metadata.xml
+++ b/dev-python/tabulate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tabulate</remote-id>
   </upstream>
diff --git a/dev-python/tagpy/metadata.xml b/dev-python/tagpy/metadata.xml
index 92c517ef03a8..63f0ef490bc6 100644
--- a/dev-python/tagpy/metadata.xml
+++ b/dev-python/tagpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">TagPy is a Python crust (or a set of Python bindings) for Scott
 		Wheeler's TagLib. It builds upon Boost.Python, a wrapper generation
 		library which is part of the Boost set of C++ libraries.</longdescription>
diff --git a/dev-python/taskflow/metadata.xml b/dev-python/taskflow/metadata.xml
index 1a22092d6b2b..b795a02dccc8 100644
--- a/dev-python/taskflow/metadata.xml
+++ b/dev-python/taskflow/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
   A library to do [jobs, tasks, flows] in a HA manner
   using different backends to be used with OpenStack projects.
diff --git a/dev-python/tdaemon/metadata.xml b/dev-python/tdaemon/metadata.xml
index 75c15f485233..ac22acbf6dce 100644
--- a/dev-python/tdaemon/metadata.xml
+++ b/dev-python/tdaemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="coverage">Enable code coverage support</flag>
   </use>
diff --git a/dev-python/tempest-lib/metadata.xml b/dev-python/tempest-lib/metadata.xml
index 074404a5ec36..ac299b252380 100644
--- a/dev-python/tempest-lib/metadata.xml
+++ b/dev-python/tempest-lib/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 tempest-lib is a library of common functionality that was originally in tempest (or similar in scope to tempest)
 </longdescription>
diff --git a/dev-python/tempita/metadata.xml b/dev-python/tempita/metadata.xml
index 0a1092e0a2b5..e5d7fe3df81a 100644
--- a/dev-python/tempita/metadata.xml
+++ b/dev-python/tempita/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Tempita</remote-id>
   </upstream>
diff --git a/dev-python/tempora/metadata.xml b/dev-python/tempora/metadata.xml
index ba63b4356976..a1d531ff0ef0 100644
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sautier.louis@gmail.com</email>
 		<name>Louis Sautier</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tempora</remote-id>
 		<remote-id type="bitbucket">jaraco/tempora</remote-id>
diff --git a/dev-python/termcolor/metadata.xml b/dev-python/termcolor/metadata.xml
index e3fd6420d6d8..2f87f9af082e 100644
--- a/dev-python/termcolor/metadata.xml
+++ b/dev-python/termcolor/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     ANSII Color formatting for output in terminal.
   </longdescription>
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
index 52edcf5db0fa..c8ef7ad2bc8f 100644
--- a/dev-python/terminado/metadata.xml
+++ b/dev-python/terminado/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">terminado</remote-id>
     <remote-id type="github">takluyver/terminado</remote-id>
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
index 9a65a534442b..72a455e5969f 100644
--- a/dev-python/testfixtures/metadata.xml
+++ b/dev-python/testfixtures/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">testfixtures</remote-id>
     <remote-id type="github">Simplistix/testfixtures</remote-id>
diff --git a/dev-python/testify/metadata.xml b/dev-python/testify/metadata.xml
index 24da195dd289..1c5ebf3f79be 100644
--- a/dev-python/testify/metadata.xml
+++ b/dev-python/testify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">testify</remote-id>
     <remote-id type="github">Yelp/testify</remote-id>
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index 4db1c842b5ba..31de8f772793 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Testpath is a collection of utilities for Python code working with
     files and commands. It contains functions to check things on the
diff --git a/dev-python/testrepository/metadata.xml b/dev-python/testrepository/metadata.xml
index 741bc3417c10..95f5fd03e072 100644
--- a/dev-python/testrepository/metadata.xml
+++ b/dev-python/testrepository/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
 	<longdescription lang="en">
     A repository of test results.
   </longdescription>
diff --git a/dev-python/testresources/metadata.xml b/dev-python/testresources/metadata.xml
index e8c27a4d1dc8..e15292c9d1aa 100644
--- a/dev-python/testresources/metadata.xml
+++ b/dev-python/testresources/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Testresources extends unittest with a clean and simple api to provide test
 	optimisation where expensive common resources are needed for test cases
diff --git a/dev-python/testscenarios/metadata.xml b/dev-python/testscenarios/metadata.xml
index 5c275d80b9bf..8e4fe1fcf27d 100644
--- a/dev-python/testscenarios/metadata.xml
+++ b/dev-python/testscenarios/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
     Testscenarios provides clean dependency injection for
 	python unittest style tests. This can be used for interface testing
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index 248ba18d1bfd..63fb69bdc23c 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
-  <herd>python</herd>
-  <herd>openstack</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">testtools</remote-id>
     <remote-id type="github">testing-cabal/testtools</remote-id>
diff --git a/dev-python/tgmochikit/metadata.xml b/dev-python/tgmochikit/metadata.xml
index 74549fa84d67..8777725a57e5 100644
--- a/dev-python/tgmochikit/metadata.xml
+++ b/dev-python/tgmochikit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tgMochiKit</remote-id>
 	</upstream>
diff --git a/dev-python/theano/metadata.xml b/dev-python/theano/metadata.xml
index e92a8dee3bd8..cf1741d6b861 100644
--- a/dev-python/theano/metadata.xml
+++ b/dev-python/theano/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Theano is a numerical computation library for the Python. In Theano,
   computations are expressed using a NumPy-like syntax and compiled to
diff --git a/dev-python/timelib/metadata.xml b/dev-python/timelib/metadata.xml
index 5d5c6fdbe609..b555c23b401a 100644
--- a/dev-python/timelib/metadata.xml
+++ b/dev-python/timelib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">timelib</remote-id>
 	</upstream>
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
index dbd435291a84..68086d302593 100644
--- a/dev-python/tinycss/metadata.xml
+++ b/dev-python/tinycss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tinycss</remote-id>
     <remote-id type="github">SimonSapin/tinycss</remote-id>
diff --git a/dev-python/tlslite/metadata.xml b/dev-python/tlslite/metadata.xml
index a26485e98d02..d6d6991e72e2 100644
--- a/dev-python/tlslite/metadata.xml
+++ b/dev-python/tlslite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		TLS Lite is a free python library that implements SSL 3.0, TLS 1.0, and
 		TLS 1.1. TLS Lite supports non-traditional authentication methods such
diff --git a/dev-python/tmdb3/metadata.xml b/dev-python/tmdb3/metadata.xml
index 2878da44759a..ecca5705aaf9 100644
--- a/dev-python/tmdb3/metadata.xml
+++ b/dev-python/tmdb3/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>floppym@gentoo.org</email>
     <name>Mike Gilbert</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tmdb3</remote-id>
     <remote-id type="github">wagnerrp/pytmdb3</remote-id>
diff --git a/dev-python/toolz/metadata.xml b/dev-python/toolz/metadata.xml
index 082526d7d674..cba0c4aaece0 100644
--- a/dev-python/toolz/metadata.xml
+++ b/dev-python/toolz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">toolz</remote-id>
 	</upstream>
diff --git a/dev-python/tox/metadata.xml b/dev-python/tox/metadata.xml
index 15f2cb67d803..8941fdef313e 100644
--- a/dev-python/tox/metadata.xml
+++ b/dev-python/tox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tox</remote-id>
 	</upstream>
diff --git a/dev-python/tpg/metadata.xml b/dev-python/tpg/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/tpg/metadata.xml
+++ b/dev-python/tpg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
index ee1858d6af30..1353db630fbe 100644
--- a/dev-python/traitlets/metadata.xml
+++ b/dev-python/traitlets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     A lightweight pure-Python derivative of Enthought Traits,
     used for configuring Python objects. This package powers
diff --git a/dev-python/traits/metadata.xml b/dev-python/traits/metadata.xml
index f5194078267d..2be113db2f26 100644
--- a/dev-python/traits/metadata.xml
+++ b/dev-python/traits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <longdescription lang="en">
   The traits package from the Enthought Tool Suite provides a
   metaclass with special attributes that are called traits. A trait
diff --git a/dev-python/traitsui/metadata.xml b/dev-python/traitsui/metadata.xml
index 89dc0b657609..c1ca158f75fc 100644
--- a/dev-python/traitsui/metadata.xml
+++ b/dev-python/traitsui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   The traitsui project contains a toolkit-independent GUI abstraction
   layer, which is used to support the "visualization" features of the
diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index 0cb702435e12..fd62c956d7d6 100644
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="html">Support conversion between po and html files</flag>
 		<flag name="ical">Support conversion between po and ical files</flag>
diff --git a/dev-python/translationstring/metadata.xml b/dev-python/translationstring/metadata.xml
index fa2a3ed870b2..0a2244012e5c 100644
--- a/dev-python/translationstring/metadata.xml
+++ b/dev-python/translationstring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">translationstring</remote-id>
     <remote-id type="github">Pylons/translationstring</remote-id>
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
index 321c04a0531f..40ff20263c8f 100644
--- a/dev-python/trollius/metadata.xml
+++ b/dev-python/trollius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">trollius</remote-id>
     <remote-id type="bitbucket">enovance/trollius</remote-id>
diff --git a/dev-python/ttfquery/metadata.xml b/dev-python/ttfquery/metadata.xml
index fa12fc964861..da34cb61be61 100644
--- a/dev-python/ttfquery/metadata.xml
+++ b/dev-python/ttfquery/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">TTFQuery</remote-id>
 		<remote-id type="sourceforge">ttfquery</remote-id>
diff --git a/dev-python/turbocheetah/metadata.xml b/dev-python/turbocheetah/metadata.xml
index d0d144ae606d..4a8f88c46e6c 100644
--- a/dev-python/turbocheetah/metadata.xml
+++ b/dev-python/turbocheetah/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">TurboCheetah</remote-id>
 	</upstream>
diff --git a/dev-python/turbojson/metadata.xml b/dev-python/turbojson/metadata.xml
index 7afac5bb2a5a..d499c86407fc 100644
--- a/dev-python/turbojson/metadata.xml
+++ b/dev-python/turbojson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">TurboJson</remote-id>
 	</upstream>
diff --git a/dev-python/turbokid/metadata.xml b/dev-python/turbokid/metadata.xml
index 3dd032502ba8..ceb1eaa7fd28 100644
--- a/dev-python/turbokid/metadata.xml
+++ b/dev-python/turbokid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">TurboKid</remote-id>
 	</upstream>
diff --git a/dev-python/turbolift/metadata.xml b/dev-python/turbolift/metadata.xml
index a809de117fa1..dcaf6df44649 100644
--- a/dev-python/turbolift/metadata.xml
+++ b/dev-python/turbolift/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Openstack Swift sync/backup utility
   </longdescription>
diff --git a/dev-python/tweepy/metadata.xml b/dev-python/tweepy/metadata.xml
index 49b52e3a49c0..40dc657fcf55 100644
--- a/dev-python/tweepy/metadata.xml
+++ b/dev-python/tweepy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tweepy/tweepy</remote-id>
     <remote-id type="pypi">tweepy</remote-id>
diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml
index a67d0418f87b..14ef767e1310 100644
--- a/dev-python/twill/metadata.xml
+++ b/dev-python/twill/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
 	</longdescription>
diff --git a/dev-python/twisted-conch/metadata.xml b/dev-python/twisted-conch/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-conch/metadata.xml
+++ b/dev-python/twisted-conch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-core/metadata.xml b/dev-python/twisted-core/metadata.xml
index 5473acaeb8d0..c88e20007e3b 100644
--- a/dev-python/twisted-core/metadata.xml
+++ b/dev-python/twisted-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="serial">include serial port support</flag>
 	</use>
diff --git a/dev-python/twisted-lore/metadata.xml b/dev-python/twisted-lore/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-lore/metadata.xml
+++ b/dev-python/twisted-lore/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-mail/metadata.xml b/dev-python/twisted-mail/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-mail/metadata.xml
+++ b/dev-python/twisted-mail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-names/metadata.xml b/dev-python/twisted-names/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-names/metadata.xml
+++ b/dev-python/twisted-names/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-news/metadata.xml b/dev-python/twisted-news/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-news/metadata.xml
+++ b/dev-python/twisted-news/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-pair/metadata.xml b/dev-python/twisted-pair/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-pair/metadata.xml
+++ b/dev-python/twisted-pair/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-runner/metadata.xml b/dev-python/twisted-runner/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-runner/metadata.xml
+++ b/dev-python/twisted-runner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-web/metadata.xml b/dev-python/twisted-web/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-web/metadata.xml
+++ b/dev-python/twisted-web/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted-words/metadata.xml b/dev-python/twisted-words/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/twisted-words/metadata.xml
+++ b/dev-python/twisted-words/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/twitter/metadata.xml b/dev-python/twitter/metadata.xml
index b13a57cbfb48..2098ae67fca1 100644
--- a/dev-python/twitter/metadata.xml
+++ b/dev-python/twitter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">twitter</remote-id>
 	</upstream>
diff --git a/dev-python/twython/metadata.xml b/dev-python/twython/metadata.xml
index 0de0df0bb21b..150df137303c 100644
--- a/dev-python/twython/metadata.xml
+++ b/dev-python/twython/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>ercpe@gentoo.org</email>
     <name>Johann Schmitz</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ryanmcgrath/twython</remote-id>
     <remote-id type="pypi">twython</remote-id>
diff --git a/dev-python/txAMQP/metadata.xml b/dev-python/txAMQP/metadata.xml
index 1b8745ab66e8..e3c9ba035b4c 100644
--- a/dev-python/txAMQP/metadata.xml
+++ b/dev-python/txAMQP/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">txAMQP</remote-id>
 		<remote-id type="launchpad">txamqp</remote-id>
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index c017089accf5..db4b287dd581 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">txaio</remote-id>
 		<remote-id type="github">tavendo/txaio</remote-id>
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
index ba3614fc5729..787fe5263607 100644
--- a/dev-python/tzlocal/metadata.xml
+++ b/dev-python/tzlocal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tzlocal</remote-id>
     <remote-id type="github">regebro/tzlocal</remote-id>
diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
index 70d897f4c0bd..5e977a8c0f81 100644
--- a/dev-python/uhashring/metadata.xml
+++ b/dev-python/uhashring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">uhashring</remote-id>
 		<remote-id type="github">ultrabug/uhashring</remote-id>
diff --git a/dev-python/ujson/metadata.xml b/dev-python/ujson/metadata.xml
index 8ad7ebc5d6f2..9c8c69336321 100644
--- a/dev-python/ujson/metadata.xml
+++ b/dev-python/ujson/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>swegener@gentoo.org</email>
     <name>Sven Wegener</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ujson</remote-id>
   </upstream>
diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml
index 37731a4e8e11..18fe926c6bab 100644
--- a/dev-python/unicodecsv/metadata.xml
+++ b/dev-python/unicodecsv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">unicodecsv</remote-id>
 		<remote-id type="github">jdunck/python-unicodecsv</remote-id>
diff --git a/dev-python/unidecode/metadata.xml b/dev-python/unidecode/metadata.xml
index f84012a4838f..7a0198c3eb72 100644
--- a/dev-python/unidecode/metadata.xml
+++ b/dev-python/unidecode/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>jer@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 This is a Python port of the Text::Unidecode Perl (<pkg>dev-perl/Text-Unidecode</pkg> module
 </longdescription>
diff --git a/dev-python/unittest2/metadata.xml b/dev-python/unittest2/metadata.xml
index e38a59afbfc7..e48fdcb31ba9 100644
--- a/dev-python/unittest2/metadata.xml
+++ b/dev-python/unittest2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">unittest2</remote-id>
 		<remote-id type="github">testing-cabal/unittest-ext</remote-id>
diff --git a/dev-python/uritemplate/metadata.xml b/dev-python/uritemplate/metadata.xml
index 1d509adf1f25..76937baeafa1 100644
--- a/dev-python/uritemplate/metadata.xml
+++ b/dev-python/uritemplate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">uritemplate</remote-id>
   </upstream>
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index 10b42d6d5af9..ffaca3f684ab 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A high-level cross-protocol url-grabber.
 
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index f23a901265e4..f874b153c6b6 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">urllib3</remote-id>
     <remote-id type="github">shazow/urllib3</remote-id>
diff --git a/dev-python/urwid/metadata.xml b/dev-python/urwid/metadata.xml
index ca8f86fe7353..4f262a65a3ed 100644
--- a/dev-python/urwid/metadata.xml
+++ b/dev-python/urwid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 Urwid is a curses-based user interface library.  It includes many features
 useful for text console application developers including:
diff --git a/dev-python/utidylib/metadata.xml b/dev-python/utidylib/metadata.xml
index 17a2b037edad..dc310cb55f57 100644
--- a/dev-python/utidylib/metadata.xml
+++ b/dev-python/utidylib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">utidylib</remote-id>
   </upstream>
diff --git a/dev-python/utmp/metadata.xml b/dev-python/utmp/metadata.xml
index 58416c2743d0..c4ab2aaa781e 100644
--- a/dev-python/utmp/metadata.xml
+++ b/dev-python/utmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">utmp</remote-id>
 	</upstream>
diff --git a/dev-python/vatnumber/metadata.xml b/dev-python/vatnumber/metadata.xml
index 086f751e001e..2eb98c1c3b8f 100644
--- a/dev-python/vatnumber/metadata.xml
+++ b/dev-python/vatnumber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Python module to validate VAT numbers
 	</longdescription>
diff --git a/dev-python/vcrpy/metadata.xml b/dev-python/vcrpy/metadata.xml
index 9cbd842f8fa4..23aef431d8ff 100644
--- a/dev-python/vcrpy/metadata.xml
+++ b/dev-python/vcrpy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">kevin1024/vcrpy</remote-id>
 		<remote-id type="pypi">vcrpy</remote-id>
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index b43530749bcc..4b832f1942ca 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vcstools/vcstools</remote-id>
 	</upstream>
diff --git a/dev-python/venusian/metadata.xml b/dev-python/venusian/metadata.xml
index c789269653bf..0696692c079f 100644
--- a/dev-python/venusian/metadata.xml
+++ b/dev-python/venusian/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">venusian</remote-id>
 	</upstream>
diff --git a/dev-python/verboselogs/metadata.xml b/dev-python/verboselogs/metadata.xml
index 4b21ccf9c28e..926e78001d36 100644
--- a/dev-python/verboselogs/metadata.xml
+++ b/dev-python/verboselogs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">verboselogs</remote-id>
   </upstream>
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index e0b789fc33d1..9cf275c1efaa 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">warner/python-versioneer</remote-id>
     <remote-id type="pypi">versioneer</remote-id>
diff --git a/dev-python/versiontools/metadata.xml b/dev-python/versiontools/metadata.xml
index 0832c3b21c87..bbf8dd1f4663 100644
--- a/dev-python/versiontools/metadata.xml
+++ b/dev-python/versiontools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">versiontools</remote-id>
 		<remote-id type="launchpad">versiontools</remote-id>
diff --git a/dev-python/vertex/metadata.xml b/dev-python/vertex/metadata.xml
index ee44d1cd0503..422902dc0eb1 100644
--- a/dev-python/vertex/metadata.xml
+++ b/dev-python/vertex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Vertex is an implementation of the Q2Q protocol (sort of like P2P,
 		but one better). There are a few moving parts in Vertex: PTCP is a
 		protocol which is nearly identical to TCP, but which runs over
diff --git a/dev-python/virtualenv-clone/metadata.xml b/dev-python/virtualenv-clone/metadata.xml
index 2d5b6be29781..735a87feaaff 100644
--- a/dev-python/virtualenv-clone/metadata.xml
+++ b/dev-python/virtualenv-clone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">virtualenv-clone</remote-id>
     <remote-id type="github">edwardgeorge/virtualenv-clone</remote-id>
diff --git a/dev-python/virtualenv/metadata.xml b/dev-python/virtualenv/metadata.xml
index 9252bf6fa92a..4ac9eb8b5698 100644
--- a/dev-python/virtualenv/metadata.xml
+++ b/dev-python/virtualenv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">virtualenv</remote-id>
     <remote-id type="github">pypa/virtualenv</remote-id>
diff --git a/dev-python/virtualenvwrapper/metadata.xml b/dev-python/virtualenvwrapper/metadata.xml
index 5d6829fbe8eb..3478e2a3673c 100644
--- a/dev-python/virtualenvwrapper/metadata.xml
+++ b/dev-python/virtualenvwrapper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">virtualenvwrapper</remote-id>
 	</upstream>
diff --git a/dev-python/visual/metadata.xml b/dev-python/visual/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/dev-python/visual/metadata.xml
+++ b/dev-python/visual/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/vobject/metadata.xml b/dev-python/vobject/metadata.xml
index de483c53568f..87d7825812f4 100644
--- a/dev-python/vobject/metadata.xml
+++ b/dev-python/vobject/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/vulture/metadata.xml b/dev-python/vulture/metadata.xml
index 905ae2277298..1215e00fce66 100644
--- a/dev-python/vulture/metadata.xml
+++ b/dev-python/vulture/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <upstream>
 	<remote-id type="pypi">vulture</remote-id>
 	<remote-id type="bitbucket">jendrikseipp/vulture</remote-id>
diff --git a/dev-python/w3lib/metadata.xml b/dev-python/w3lib/metadata.xml
index e3fa45d6a1c2..1d71db8030fa 100644
--- a/dev-python/w3lib/metadata.xml
+++ b/dev-python/w3lib/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>maksbotan@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">w3lib</remote-id>
     <remote-id type="github">scrapy/w3lib</remote-id>
diff --git a/dev-python/waitress/metadata.xml b/dev-python/waitress/metadata.xml
index 913fdf59d480..8a15c1a61249 100644
--- a/dev-python/waitress/metadata.xml
+++ b/dev-python/waitress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">waitress</remote-id>
     <remote-id type="github">Pylons/waitress</remote-id>
diff --git a/dev-python/warlock/metadata.xml b/dev-python/warlock/metadata.xml
index e99437e2e041..857bca2a7c7e 100644
--- a/dev-python/warlock/metadata.xml
+++ b/dev-python/warlock/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	Python object model built on JSON schema and JSON patch.
   </longdescription>
diff --git a/dev-python/wcsaxes/metadata.xml b/dev-python/wcsaxes/metadata.xml
index 6ec9ee7ad1a1..a1f7adcdd405 100644
--- a/dev-python/wcsaxes/metadata.xml
+++ b/dev-python/wcsaxes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
+	<maintainer>
+    	<email>sci-astronomy@gentoo.org</email>
+    	<name>Gentoo Astronomy Project</name>
+ 	</maintainer>
 	<longdescription lang="en">
 		Framework for plotting astronomical and geospatial data
 	</longdescription>
diff --git a/dev-python/wcwidth/metadata.xml b/dev-python/wcwidth/metadata.xml
index b5bb437290a7..fd615c484f38 100644
--- a/dev-python/wcwidth/metadata.xml
+++ b/dev-python/wcwidth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">wcwidth</remote-id>
     <remote-id type="github">jquast/wcwidth</remote-id>
diff --git a/dev-python/weasyprint/metadata.xml b/dev-python/weasyprint/metadata.xml
index 1009a336b002..bed0b57a252e 100644
--- a/dev-python/weasyprint/metadata.xml
+++ b/dev-python/weasyprint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">WeasyPrint</remote-id>
     <remote-id type="github">Kozea/WeasyPrint</remote-id>
diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
index 4fa00587b82a..3f05941591a2 100644
--- a/dev-python/webassets/metadata.xml
+++ b/dev-python/webassets/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">miracle2k/webassets</remote-id>
   </upstream>
diff --git a/dev-python/webcolors/metadata.xml b/dev-python/webcolors/metadata.xml
index 78ff82829f62..2d07a8d87352 100644
--- a/dev-python/webcolors/metadata.xml
+++ b/dev-python/webcolors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">webcolors</remote-id>
 		<remote-id type="github">ubernostrum/webcolors</remote-id>
diff --git a/dev-python/webencodings/metadata.xml b/dev-python/webencodings/metadata.xml
index 697aa8382db5..71138b8dd683 100644
--- a/dev-python/webencodings/metadata.xml
+++ b/dev-python/webencodings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">webencodings</remote-id>
     <doc>http://pythonhosted.org/webencodings/</doc>
diff --git a/dev-python/weberror/metadata.xml b/dev-python/weberror/metadata.xml
index 1b97c1c396ce..cf5b7e83c200 100644
--- a/dev-python/weberror/metadata.xml
+++ b/dev-python/weberror/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WebError</remote-id>
 	</upstream>
diff --git a/dev-python/webhelpers/metadata.xml b/dev-python/webhelpers/metadata.xml
index b1cf2fcc4fde..25cd87c01fd3 100644
--- a/dev-python/webhelpers/metadata.xml
+++ b/dev-python/webhelpers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WebHelpers</remote-id>
 	</upstream>
diff --git a/dev-python/webob/metadata.xml b/dev-python/webob/metadata.xml
index b66579ea54e7..1da495c02983 100644
--- a/dev-python/webob/metadata.xml
+++ b/dev-python/webob/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WebOb</remote-id>
 	</upstream>
diff --git a/dev-python/webpy/metadata.xml b/dev-python/webpy/metadata.xml
index 6ee684afdb06..ec2cf1c5cd8a 100644
--- a/dev-python/webpy/metadata.xml
+++ b/dev-python/webpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		web.py provides small and simple web framework for
 		python. It is a convenient tool for small sized
diff --git a/dev-python/websocket-client/metadata.xml b/dev-python/websocket-client/metadata.xml
index 726606ed6410..7ba930c3d06f 100644
--- a/dev-python/websocket-client/metadata.xml
+++ b/dev-python/websocket-client/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
index 07db39f04d75..2f0bbf359c0e 100644
--- a/dev-python/websockify/metadata.xml
+++ b/dev-python/websockify/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     WebSockets support for any application/server
   </longdescription>
diff --git a/dev-python/webtest/metadata.xml b/dev-python/webtest/metadata.xml
index 3fcee65b5fb1..674c8fe77f48 100644
--- a/dev-python/webtest/metadata.xml
+++ b/dev-python/webtest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WebTest</remote-id>
 	</upstream>
diff --git a/dev-python/webut/metadata.xml b/dev-python/webut/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/dev-python/webut/metadata.xml
+++ b/dev-python/webut/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/wehjit/metadata.xml b/dev-python/wehjit/metadata.xml
index a0dee8239a94..866fbbcc8ae8 100644
--- a/dev-python/wehjit/metadata.xml
+++ b/dev-python/wehjit/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<herd>python</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
@@ -10,6 +8,14 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 	wehjit is a Python library for for building XHTML widgets for web
 	applications and web pages. It encapsulates the XHTML
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index 8b91a54f57ae..5547493f8741 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   Werkzeug is a WSGI utility library. It can serve as the basis for a
   custom framework.
diff --git a/dev-python/wheel/metadata.xml b/dev-python/wheel/metadata.xml
index 5f34195aa2ab..04447608f788 100644
--- a/dev-python/wheel/metadata.xml
+++ b/dev-python/wheel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">wheel</remote-id>
 	</upstream>
diff --git a/dev-python/whirlpool/metadata.xml b/dev-python/whirlpool/metadata.xml
index ad6838376fa3..9fa06d65131e 100644
--- a/dev-python/whirlpool/metadata.xml
+++ b/dev-python/whirlpool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Whirlpool</remote-id>
     <remote-id type="github">radiosilence/python-whirlpool</remote-id>
diff --git a/dev-python/whisper/metadata.xml b/dev-python/whisper/metadata.xml
index ddac9f5cb8f8..f6212645a90b 100644
--- a/dev-python/whisper/metadata.xml
+++ b/dev-python/whisper/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">whisper</remote-id>
 	</upstream>
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index 861b39a466ef..135b3db041d3 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -11,6 +9,14 @@
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Whoosh is a fast, featureful full-text indexing and searching
 		library implemented in pure Python. Programmers can use it to
diff --git a/dev-python/winpdb/metadata.xml b/dev-python/winpdb/metadata.xml
index 4625e849e175..1411baa2c18d 100644
--- a/dev-python/winpdb/metadata.xml
+++ b/dev-python/winpdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">winpdb</remote-id>
 	</upstream>
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
index ee323bf45a94..709095032b4d 100644
--- a/dev-python/workerpool/metadata.xml
+++ b/dev-python/workerpool/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">workerpool</remote-id>
     <remote-id type="github">shazow/workerpool</remote-id>
diff --git a/dev-python/wrapt/metadata.xml b/dev-python/wrapt/metadata.xml
index 307d493367cb..5a61380bc82b 100644
--- a/dev-python/wrapt/metadata.xml
+++ b/dev-python/wrapt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index 6a2af9d51e73..47fac32cd53a 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>vapier@gentoo.org</email>
     <description>make whatever changes you want</description>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="client">Install client modules</flag>
     <flag name="server">Install server modules</flag>
diff --git a/dev-python/wsaccel/metadata.xml b/dev-python/wsaccel/metadata.xml
index a86b59a16270..e10269ed5dc2 100644
--- a/dev-python/wsaccel/metadata.xml
+++ b/dev-python/wsaccel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">wsaccel</remote-id>
     <remote-id type="github">methane/wsaccel</remote-id>
diff --git a/dev-python/wsgiintercept/metadata.xml b/dev-python/wsgiintercept/metadata.xml
index bf5af49c8d75..2c1046796960 100644
--- a/dev-python/wsgiintercept/metadata.xml
+++ b/dev-python/wsgiintercept/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
 Testing a WSGI application normally involves starting a server at a local host 
 and port, then pointing your test code to that address. Instead, this library 
diff --git a/dev-python/wsgilog/metadata.xml b/dev-python/wsgilog/metadata.xml
index 9e4c7edfa1c0..ba69ff3b061d 100644
--- a/dev-python/wsgilog/metadata.xml
+++ b/dev-python/wsgilog/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>jo@opteamax.de</email>
     <name>Jens Ott</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-python/wsgiproxy2/metadata.xml b/dev-python/wsgiproxy2/metadata.xml
index e486c156d328..0d13581b80db 100644
--- a/dev-python/wsgiproxy2/metadata.xml
+++ b/dev-python/wsgiproxy2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WSGIProxy2</remote-id>
 	</upstream>
diff --git a/dev-python/wstools/metadata.xml b/dev-python/wstools/metadata.xml
index 34ca344eaee0..b9cae644fb76 100644
--- a/dev-python/wstools/metadata.xml
+++ b/dev-python/wstools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">wstools</remote-id>
     <remote-id type="github">kiorky/wstools</remote-id>
diff --git a/dev-python/wtf-peewee/metadata.xml b/dev-python/wtf-peewee/metadata.xml
index f95712add1aa..963064044b97 100644
--- a/dev-python/wtf-peewee/metadata.xml
+++ b/dev-python/wtf-peewee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">coleifer/wtf-peewee</remote-id>
   </upstream>
diff --git a/dev-python/wtforms/metadata.xml b/dev-python/wtforms/metadata.xml
index e93485a616ed..09daa7c68a86 100644
--- a/dev-python/wtforms/metadata.xml
+++ b/dev-python/wtforms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WTForms</remote-id>
 	</upstream>
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index a9a6cc28e75b..3b171fbd403c 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
 		<flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag>
diff --git a/dev-python/xcffib/metadata.xml b/dev-python/xcffib/metadata.xml
index 51ccadcfeb45..79c003993d49 100644
--- a/dev-python/xcffib/metadata.xml
+++ b/dev-python/xcffib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">xcffib</remote-id>
     <remote-id type="github">tych0/xcffib</remote-id>
diff --git a/dev-python/xhtml2pdf/metadata.xml b/dev-python/xhtml2pdf/metadata.xml
index c670146f07b0..ed371691facc 100644
--- a/dev-python/xhtml2pdf/metadata.xml
+++ b/dev-python/xhtml2pdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">xhtml2pdf</remote-id>
 	</upstream>
diff --git a/dev-python/xlrd/metadata.xml b/dev-python/xlrd/metadata.xml
index 22c6fed2a1b5..cf3eaab84e16 100644
--- a/dev-python/xlrd/metadata.xml
+++ b/dev-python/xlrd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Extract data from new and old Excel spreadsheets on any platform. Pure
 		Python (2.1 to 2.6). Strong support for Excel dates. Unicode-aware.</longdescription>
 	<upstream>
diff --git a/dev-python/xlsxwriter/metadata.xml b/dev-python/xlsxwriter/metadata.xml
index 6955a1f97fe1..a41ec6b530e3 100644
--- a/dev-python/xlsxwriter/metadata.xml
+++ b/dev-python/xlsxwriter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">XlsxWriter</remote-id>
     <remote-id type="github">jmcnamara/XlsxWriter</remote-id>
diff --git a/dev-python/xlutils/metadata.xml b/dev-python/xlutils/metadata.xml
index d9516ac33b1e..9d8e32bb29e5 100644
--- a/dev-python/xlutils/metadata.xml
+++ b/dev-python/xlutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">xlutils</remote-id>
   </upstream>
diff --git a/dev-python/xlwt/metadata.xml b/dev-python/xlwt/metadata.xml
index 2d8cbb1cd756..618524339f01 100644
--- a/dev-python/xlwt/metadata.xml
+++ b/dev-python/xlwt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">xlwt is a library for generating spreadsheet files that are compatible
   with Excel 97/2000/XP/2003, OpenOffice.org Calc, and
   Gnumeric. xlwt has full support for Unicode. Excel spreadsheets can
diff --git a/dev-python/xmltodict/metadata.xml b/dev-python/xmltodict/metadata.xml
index 0ceb52bcca50..61a1fb592854 100644
--- a/dev-python/xmltodict/metadata.xml
+++ b/dev-python/xmltodict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">xmltodict</remote-id>
     <remote-id type="github">martinblech/xmltodict</remote-id>
diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml
index aaf1facdfe82..91b3cf1c8846 100644
--- a/dev-python/xonsh/metadata.xml
+++ b/dev-python/xonsh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">xonsh</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/xvfbwrapper/metadata.xml b/dev-python/xvfbwrapper/metadata.xml
index ea7b0b684364..838ce619b175 100644
--- a/dev-python/xvfbwrapper/metadata.xml
+++ b/dev-python/xvfbwrapper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">xvfbwrapper</remote-id>
     <remote-id type="github">cgoldberg/xvfbwrapper</remote-id>
diff --git a/dev-python/yappi/metadata.xml b/dev-python/yappi/metadata.xml
index 57138e8fbee1..be43b7c7bf1c 100644
--- a/dev-python/yappi/metadata.xml
+++ b/dev-python/yappi/metadata.xml
@@ -5,7 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">yappi</remote-id>
     <remote-id type="bitbucket">sumerc/yappi</remote-id>
diff --git a/dev-python/yapps/metadata.xml b/dev-python/yapps/metadata.xml
index 6c460c309c0d..d842ed31f341 100644
--- a/dev-python/yapps/metadata.xml
+++ b/dev-python/yapps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">Yapps</remote-id>
     <remote-id type="github">smurfix/yapps</remote-id>
diff --git a/dev-python/yapsy/metadata.xml b/dev-python/yapsy/metadata.xml
index 9edc9cdc8ef5..21f948848b5c 100644
--- a/dev-python/yapsy/metadata.xml
+++ b/dev-python/yapsy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yapsy</remote-id>
 	</upstream>
diff --git a/dev-python/yolk-portage/metadata.xml b/dev-python/yolk-portage/metadata.xml
index ceb949fbbb3e..fca839711af6 100644
--- a/dev-python/yolk-portage/metadata.xml
+++ b/dev-python/yolk-portage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 		yolk-portage is a plugin for dev-python/yolk
 		You can use yolk -l --portage to see which Python packages were
diff --git a/dev-python/yolk/metadata.xml b/dev-python/yolk/metadata.xml
index 2e151cd9aaf9..ed3dd9420b22 100644
--- a/dev-python/yolk/metadata.xml
+++ b/dev-python/yolk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 		yolk-portage is a plugin for dev-python/yolk
 		You can use yolk -l --portage to see which Python packages were
diff --git a/dev-python/zake/metadata.xml b/dev-python/zake/metadata.xml
index e02601cd5455..31b2ab75e15d 100644
--- a/dev-python/zake/metadata.xml
+++ b/dev-python/zake/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
   A python package that works to provide a nice set of testing utilities for the kazoo library.
   </longdescription>
diff --git a/dev-python/zc-buildout/metadata.xml b/dev-python/zc-buildout/metadata.xml
index cca1f992b28e..7377d753b2bf 100644
--- a/dev-python/zc-buildout/metadata.xml
+++ b/dev-python/zc-buildout/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>tupone@gentoo.org</email>
 		<name>Alfredo Tupone</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">Buildout is a system for managing development buildouts. While often identified as a Zope project,
 and indeed licensed under the ZPL by Zope creator Jim Fulton, buildout is useful for configurations
 beyond Zope, and even, in rare cases, a few that have nothing to do with Python.
diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
index 18c164308d74..bc65cc451921 100644
--- a/dev-python/zope-component/metadata.xml
+++ b/dev-python/zope-component/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.component</remote-id>
 		<remote-id type="pypi">zope.component</remote-id>
diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
index 3417e57efd77..90e346ecf449 100644
--- a/dev-python/zope-event/metadata.xml
+++ b/dev-python/zope-event/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.event</remote-id>
 		<remote-id type="pypi">zope.event</remote-id>
diff --git a/dev-python/zope-interface/metadata.xml b/dev-python/zope-interface/metadata.xml
index f888d2109858..8863d65fa39c 100644
--- a/dev-python/zope-interface/metadata.xml
+++ b/dev-python/zope-interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">zope.interface</remote-id>
 		<remote-id type="github">zopefoundation/zope.interface</remote-id>
diff --git a/dev-python/zsi/metadata.xml b/dev-python/zsi/metadata.xml
index 3f075e5dae5d..8d873830daac 100644
--- a/dev-python/zsi/metadata.xml
+++ b/dev-python/zsi/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="twisted">add support for <pkg>dev-python/twisted</pkg></flag>
 	</use>
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index d5e349c54759..166c44d4cd65 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="declarative">Build the qdeclarativeview plugin</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
diff --git a/dev-qt/linguist-tools/metadata.xml b/dev-qt/linguist-tools/metadata.xml
index 7fd11f84adca..34f29de11262 100644
--- a/dev-qt/linguist-tools/metadata.xml
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -4,7 +4,10 @@
 	<use>
 		<flag name="qml">Enable QML support in lupdate</flag>
 	</use>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qdbus/metadata.xml
+++ b/dev-qt/qdbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qdoc/metadata.xml
+++ b/dev-qt/qdoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 2f6432bee49b..7229ed9b6d77 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -5,7 +5,10 @@
 	<email>pesa@gentoo.org</email>
 	<name>Davide Pesavento</name>
 </maintainer>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 <use>
 	<flag name="android">Build plugin for Android devices</flag>
 	<flag name="autotools">Enable autotools project manager plugin</flag>
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index b41982b9d583..5f37fb40ab86 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <bugs-to>https://bugreports.qt.io/</bugs-to>
     <doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
index 57efc4651f96..760a1b5ee221 100644
--- a/dev-qt/qt-meta/metadata.xml
+++ b/dev-qt/qt-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
 		<flag name="openvg">Enable the QtOpenVG module</flag>
diff --git a/dev-qt/qt-mobility/metadata.xml b/dev-qt/qt-mobility/metadata.xml
index 557271548b9f..d87fcfd19fc0 100644
--- a/dev-qt/qt-mobility/metadata.xml
+++ b/dev-qt/qt-mobility/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 <use>
 	<flag name="bluetooth">Enable Bluetooth support in QtConnectivity and QtSystemInfo modules</flag>
 	<flag name="connectivity">Build the QtConnectivity module</flag>
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qt3support/metadata.xml
+++ b/dev-qt/qt3support/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qtbearer/metadata.xml
+++ b/dev-qt/qtbearer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtbluetooth/metadata.xml b/dev-qt/qtbluetooth/metadata.xml
index ddad9f75dce8..81d6bae5c3ab 100644
--- a/dev-qt/qtbluetooth/metadata.xml
+++ b/dev-qt/qtbluetooth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 	</use>
diff --git a/dev-qt/qtchooser/metadata.xml b/dev-qt/qtchooser/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-qt/qtchooser/metadata.xml
+++ b/dev-qt/qtchooser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtconcurrent/metadata.xml
+++ b/dev-qt/qtconcurrent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 9b129875cee4..5b52b10306c8 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index f96540a49918..a56e04589314 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 669d73962d56..248e5eb7e17d 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="dbus">Build QtDBus examples and demos</flag>
 		<flag name="declarative">Build QtDeclarative examples and demos</flag>
diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtdiag/metadata.xml
+++ b/dev-qt/qtdiag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtgraphicaleffects/metadata.xml b/dev-qt/qtgraphicaleffects/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtgraphicaleffects/metadata.xml
+++ b/dev-qt/qtgraphicaleffects/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 0cdbb9c9fb06..c9887ccea461 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Enable EGL integration</flag>
 		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 3c78bba70f89..25d3c47641ee 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="compat">Build the extra compatibility layer required by a few packages, see
 			http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtimageformats/metadata.xml
+++ b/dev-qt/qtimageformats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtlockedfile/metadata.xml b/dev-qt/qtlockedfile/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/dev-qt/qtlockedfile/metadata.xml
+++ b/dev-qt/qtlockedfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 536277f05b98..37d6abf8a75c 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 651a7c8a90fb..5c9d9e01583e 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 34cefc306941..d73139ec706f 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Use EGL instead of default GLX to manage OpenGL
 			contexts on the desktop</flag>
diff --git a/dev-qt/qtopenvg/metadata.xml b/dev-qt/qtopenvg/metadata.xml
index ac06367e1c10..7108dc386daa 100644
--- a/dev-qt/qtopenvg/metadata.xml
+++ b/dev-qt/qtopenvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Build with support for exceptions</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtpaths/metadata.xml
+++ b/dev-qt/qtpaths/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
index 81cb7d93d178..024611cec800 100644
--- a/dev-qt/qtphonon/metadata.xml
+++ b/dev-qt/qtphonon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
index 0d64dfddc921..3fb4e2059226 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag>
 		<flag name="qml">Build QML bindings</flag>
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
index 8090c86ce18c..e4427ce3e42d 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 	</use>
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index c4dea83dd0ac..3c12c00c7081 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="designer">Build plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml
index 728463d459e8..30a4ac204280 100644
--- a/dev-qt/qtquickcontrols/metadata.xml
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 9b505e691d02..4d0ca0551814 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml
index bee66c84d291..a2804c1d0155 100644
--- a/dev-qt/qtsensors/metadata.xml
+++ b/dev-qt/qtsensors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="qml">Build QML bindings</flag>
 	</use>
diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtserialport/metadata.xml
+++ b/dev-qt/qtserialport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtsingleapplication/metadata.xml b/dev-qt/qtsingleapplication/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/dev-qt/qtsingleapplication/metadata.xml
+++ b/dev-qt/qtsingleapplication/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index dc8562cfec93..68818f52430c 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index 258aee1d6e0d..17e277e537f0 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qttranslations/metadata.xml
+++ b/dev-qt/qttranslations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 0f135c2d9872..e8335489c7e5 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
diff --git a/dev-qt/qtwebchannel/metadata.xml b/dev-qt/qtwebchannel/metadata.xml
index ddad9f75dce8..81d6bae5c3ab 100644
--- a/dev-qt/qtwebchannel/metadata.xml
+++ b/dev-qt/qtwebchannel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 	</use>
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0aa2516d684f..01a4c1fd926a 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml
index bee66c84d291..a2804c1d0155 100644
--- a/dev-qt/qtwebsockets/metadata.xml
+++ b/dev-qt/qtwebsockets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="qml">Build QML bindings</flag>
 	</use>
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 4727795ad761..331ab27077d6 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtx11extras/metadata.xml
+++ b/dev-qt/qtx11extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtxml/metadata.xml
+++ b/dev-qt/qtxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml
index afb3b434585b..958c545a3fbc 100644
--- a/dev-qt/qtxmlpatterns/metadata.xml
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
index d1ccc1c159da..0451686db8e6 100644
--- a/dev-ros/actionlib/metadata.xml
+++ b/dev-ros/actionlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/actionlib</remote-id>
 	</upstream>
diff --git a/dev-ros/actionlib_msgs/metadata.xml b/dev-ros/actionlib_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/actionlib_msgs/metadata.xml
+++ b/dev-ros/actionlib_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/actionlib_tutorials/metadata.xml b/dev-ros/actionlib_tutorials/metadata.xml
index 9263625c027a..4b10c13858ea 100644
--- a/dev-ros/actionlib_tutorials/metadata.xml
+++ b/dev-ros/actionlib_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/amcl/metadata.xml b/dev-ros/amcl/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/amcl/metadata.xml
+++ b/dev-ros/amcl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/angles/metadata.xml b/dev-ros/angles/metadata.xml
index a00b0c80ebb6..e5384ea96090 100644
--- a/dev-ros/angles/metadata.xml
+++ b/dev-ros/angles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/angles</remote-id>
 	</upstream>
diff --git a/dev-ros/audio_capture/metadata.xml b/dev-ros/audio_capture/metadata.xml
index 052c64d84e8a..24c71d767a85 100644
--- a/dev-ros/audio_capture/metadata.xml
+++ b/dev-ros/audio_capture/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
diff --git a/dev-ros/audio_common_msgs/metadata.xml b/dev-ros/audio_common_msgs/metadata.xml
index 052c64d84e8a..24c71d767a85 100644
--- a/dev-ros/audio_common_msgs/metadata.xml
+++ b/dev-ros/audio_common_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
diff --git a/dev-ros/audio_play/metadata.xml b/dev-ros/audio_play/metadata.xml
index 052c64d84e8a..24c71d767a85 100644
--- a/dev-ros/audio_play/metadata.xml
+++ b/dev-ros/audio_play/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
diff --git a/dev-ros/base_local_planner/metadata.xml b/dev-ros/base_local_planner/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/base_local_planner/metadata.xml
+++ b/dev-ros/base_local_planner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/bond/metadata.xml b/dev-ros/bond/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/dev-ros/bond/metadata.xml
+++ b/dev-ros/bond/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/dev-ros/bondcpp/metadata.xml b/dev-ros/bondcpp/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/dev-ros/bondcpp/metadata.xml
+++ b/dev-ros/bondcpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/dev-ros/bondpy/metadata.xml b/dev-ros/bondpy/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/dev-ros/bondpy/metadata.xml
+++ b/dev-ros/bondpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/calibration_estimation/metadata.xml
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/calibration_launch/metadata.xml
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/calibration_msgs/metadata.xml
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/calibration_setup_helper/metadata.xml
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/camera_calibration/metadata.xml b/dev-ros/camera_calibration/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/camera_calibration/metadata.xml
+++ b/dev-ros/camera_calibration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/camera_calibration_parsers/metadata.xml b/dev-ros/camera_calibration_parsers/metadata.xml
index abd895f35e83..6bae1e541c6a 100644
--- a/dev-ros/camera_calibration_parsers/metadata.xml
+++ b/dev-ros/camera_calibration_parsers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
diff --git a/dev-ros/camera_info_manager/metadata.xml b/dev-ros/camera_info_manager/metadata.xml
index abd895f35e83..6bae1e541c6a 100644
--- a/dev-ros/camera_info_manager/metadata.xml
+++ b/dev-ros/camera_info_manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
diff --git a/dev-ros/carrot_planner/metadata.xml b/dev-ros/carrot_planner/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/carrot_planner/metadata.xml
+++ b/dev-ros/carrot_planner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/class_loader/metadata.xml b/dev-ros/class_loader/metadata.xml
index 7a9b07ed2658..c876c8c20c4b 100644
--- a/dev-ros/class_loader/metadata.xml
+++ b/dev-ros/class_loader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/class_loader</remote-id>
 	</upstream>
diff --git a/dev-ros/clear_costmap_recovery/metadata.xml b/dev-ros/clear_costmap_recovery/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/clear_costmap_recovery/metadata.xml
+++ b/dev-ros/clear_costmap_recovery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/cmake_modules/metadata.xml b/dev-ros/cmake_modules/metadata.xml
index 2b01a481f876..7df92932b7ab 100644
--- a/dev-ros/cmake_modules/metadata.xml
+++ b/dev-ros/cmake_modules/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/cmake_modules</remote-id>
 	</upstream>
diff --git a/dev-ros/collada_parser/metadata.xml b/dev-ros/collada_parser/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/collada_parser/metadata.xml
+++ b/dev-ros/collada_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/collada_urdf/metadata.xml b/dev-ros/collada_urdf/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/collada_urdf/metadata.xml
+++ b/dev-ros/collada_urdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/compressed_depth_image_transport/metadata.xml b/dev-ros/compressed_depth_image_transport/metadata.xml
index 1d01ac483526..1b34d59440d4 100644
--- a/dev-ros/compressed_depth_image_transport/metadata.xml
+++ b/dev-ros/compressed_depth_image_transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/compressed_image_transport/metadata.xml b/dev-ros/compressed_image_transport/metadata.xml
index 1d01ac483526..1b34d59440d4 100644
--- a/dev-ros/compressed_image_transport/metadata.xml
+++ b/dev-ros/compressed_image_transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/control_msgs/metadata.xml b/dev-ros/control_msgs/metadata.xml
index c300a132131c..4e377ed5a206 100644
--- a/dev-ros/control_msgs/metadata.xml
+++ b/dev-ros/control_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/control_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/control_toolbox/metadata.xml b/dev-ros/control_toolbox/metadata.xml
index eca2bde78889..101200d813a9 100644
--- a/dev-ros/control_toolbox/metadata.xml
+++ b/dev-ros/control_toolbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/control_toolbox</remote-id>
 	</upstream>
diff --git a/dev-ros/controller_interface/metadata.xml b/dev-ros/controller_interface/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/controller_interface/metadata.xml
+++ b/dev-ros/controller_interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/controller_manager/metadata.xml b/dev-ros/controller_manager/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/controller_manager/metadata.xml
+++ b/dev-ros/controller_manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/controller_manager_msgs/metadata.xml b/dev-ros/controller_manager_msgs/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/controller_manager_msgs/metadata.xml
+++ b/dev-ros/controller_manager_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/controller_manager_tests/metadata.xml b/dev-ros/controller_manager_tests/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/controller_manager_tests/metadata.xml
+++ b/dev-ros/controller_manager_tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/convex_decomposition/metadata.xml b/dev-ros/convex_decomposition/metadata.xml
index 53eff4850770..7b6e68e01634 100644
--- a/dev-ros/convex_decomposition/metadata.xml
+++ b/dev-ros/convex_decomposition/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/convex_decomposition</remote-id>
 	</upstream>
diff --git a/dev-ros/costmap_2d/metadata.xml b/dev-ros/costmap_2d/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/costmap_2d/metadata.xml
+++ b/dev-ros/costmap_2d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/cpp_common/metadata.xml b/dev-ros/cpp_common/metadata.xml
index c6d73fb2241a..af9090b269e0 100644
--- a/dev-ros/cpp_common/metadata.xml
+++ b/dev-ros/cpp_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
diff --git a/dev-ros/cv_bridge/metadata.xml b/dev-ros/cv_bridge/metadata.xml
index 08c6dc2f42da..63d56aafeb4f 100644
--- a/dev-ros/cv_bridge/metadata.xml
+++ b/dev-ros/cv_bridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
diff --git a/dev-ros/depth_image_proc/metadata.xml b/dev-ros/depth_image_proc/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/depth_image_proc/metadata.xml
+++ b/dev-ros/depth_image_proc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml
index 25b33d391a1d..b848217221f9 100644
--- a/dev-ros/depthimage_to_laserscan/metadata.xml
+++ b/dev-ros/depthimage_to_laserscan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/depthimage_to_laserscan</remote-id>
 	</upstream>
diff --git a/dev-ros/diagnostic_aggregator/metadata.xml b/dev-ros/diagnostic_aggregator/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/diagnostic_aggregator/metadata.xml
+++ b/dev-ros/diagnostic_aggregator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/diagnostic_analysis/metadata.xml b/dev-ros/diagnostic_analysis/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/diagnostic_analysis/metadata.xml
+++ b/dev-ros/diagnostic_analysis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/diagnostic_common_diagnostics/metadata.xml b/dev-ros/diagnostic_common_diagnostics/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/diagnostic_common_diagnostics/metadata.xml
+++ b/dev-ros/diagnostic_common_diagnostics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/diagnostic_msgs/metadata.xml b/dev-ros/diagnostic_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/diagnostic_msgs/metadata.xml
+++ b/dev-ros/diagnostic_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/diagnostic_updater/metadata.xml b/dev-ros/diagnostic_updater/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/diagnostic_updater/metadata.xml
+++ b/dev-ros/diagnostic_updater/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/driver_base/metadata.xml b/dev-ros/driver_base/metadata.xml
index 8b588277cae3..ea953ee614f9 100644
--- a/dev-ros/driver_base/metadata.xml
+++ b/dev-ros/driver_base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/driver_common</remote-id>
 	</upstream>
diff --git a/dev-ros/dwa_local_planner/metadata.xml b/dev-ros/dwa_local_planner/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/dwa_local_planner/metadata.xml
+++ b/dev-ros/dwa_local_planner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/dynamic_reconfigure/metadata.xml b/dev-ros/dynamic_reconfigure/metadata.xml
index a61b04b7f50a..3474354f27a8 100644
--- a/dev-ros/dynamic_reconfigure/metadata.xml
+++ b/dev-ros/dynamic_reconfigure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/dynamic_reconfigure</remote-id>
 	</upstream>
diff --git a/dev-ros/eigen_conversions/metadata.xml b/dev-ros/eigen_conversions/metadata.xml
index 85acac4db1c2..d9b16b225ddc 100644
--- a/dev-ros/eigen_conversions/metadata.xml
+++ b/dev-ros/eigen_conversions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
diff --git a/dev-ros/eigen_stl_containers/metadata.xml b/dev-ros/eigen_stl_containers/metadata.xml
index 232003b7791b..29fd55107ddf 100644
--- a/dev-ros/eigen_stl_containers/metadata.xml
+++ b/dev-ros/eigen_stl_containers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/eigen_stl_containers</remote-id>
 	</upstream>
diff --git a/dev-ros/fake_localization/metadata.xml b/dev-ros/fake_localization/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/fake_localization/metadata.xml
+++ b/dev-ros/fake_localization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/filters/metadata.xml b/dev-ros/filters/metadata.xml
index 1b9228c47016..f4e393bb41bb 100644
--- a/dev-ros/filters/metadata.xml
+++ b/dev-ros/filters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/filters</remote-id>
 	</upstream>
diff --git a/dev-ros/gazebo_msgs/metadata.xml b/dev-ros/gazebo_msgs/metadata.xml
index 4026599733cf..76d01a34f21d 100644
--- a/dev-ros/gazebo_msgs/metadata.xml
+++ b/dev-ros/gazebo_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
diff --git a/dev-ros/gazebo_plugins/metadata.xml b/dev-ros/gazebo_plugins/metadata.xml
index 4026599733cf..76d01a34f21d 100644
--- a/dev-ros/gazebo_plugins/metadata.xml
+++ b/dev-ros/gazebo_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
diff --git a/dev-ros/gazebo_ros/metadata.xml b/dev-ros/gazebo_ros/metadata.xml
index 4026599733cf..76d01a34f21d 100644
--- a/dev-ros/gazebo_ros/metadata.xml
+++ b/dev-ros/gazebo_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
diff --git a/dev-ros/gazebo_ros_control/metadata.xml b/dev-ros/gazebo_ros_control/metadata.xml
index 4026599733cf..76d01a34f21d 100644
--- a/dev-ros/gazebo_ros_control/metadata.xml
+++ b/dev-ros/gazebo_ros_control/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
diff --git a/dev-ros/gencpp/metadata.xml b/dev-ros/gencpp/metadata.xml
index 13a160d26a3a..a3b57312951a 100644
--- a/dev-ros/gencpp/metadata.xml
+++ b/dev-ros/gencpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/gencpp</remote-id>
 	</upstream>
diff --git a/dev-ros/geneus/metadata.xml b/dev-ros/geneus/metadata.xml
index 63bdf5d59c5b..499b933db2ef 100644
--- a/dev-ros/geneus/metadata.xml
+++ b/dev-ros/geneus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jsk-ros-pkg/geneus</remote-id>
 	</upstream>
diff --git a/dev-ros/genlisp/metadata.xml b/dev-ros/genlisp/metadata.xml
index c0309915cfc6..79d7c5c30e40 100644
--- a/dev-ros/genlisp/metadata.xml
+++ b/dev-ros/genlisp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/genlisp</remote-id>
 	</upstream>
diff --git a/dev-ros/genmsg/metadata.xml b/dev-ros/genmsg/metadata.xml
index d7467f956ee3..5312fe1529d8 100644
--- a/dev-ros/genmsg/metadata.xml
+++ b/dev-ros/genmsg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/genmsg</remote-id>
 	</upstream>
diff --git a/dev-ros/genpy/metadata.xml b/dev-ros/genpy/metadata.xml
index 6478b80bad37..7d275390b850 100644
--- a/dev-ros/genpy/metadata.xml
+++ b/dev-ros/genpy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/genpy</remote-id>
 	</upstream>
diff --git a/dev-ros/geodesy/metadata.xml b/dev-ros/geodesy/metadata.xml
index e4634a014583..74c4aa9daf3a 100644
--- a/dev-ros/geodesy/metadata.xml
+++ b/dev-ros/geodesy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
 	</upstream>
diff --git a/dev-ros/geographic_msgs/metadata.xml b/dev-ros/geographic_msgs/metadata.xml
index e4634a014583..74c4aa9daf3a 100644
--- a/dev-ros/geographic_msgs/metadata.xml
+++ b/dev-ros/geographic_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
 	</upstream>
diff --git a/dev-ros/geometric_shapes/metadata.xml b/dev-ros/geometric_shapes/metadata.xml
index 8fade1625142..7c4eef88087b 100644
--- a/dev-ros/geometric_shapes/metadata.xml
+++ b/dev-ros/geometric_shapes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/geometric_shapes</remote-id>
 	</upstream>
diff --git a/dev-ros/geometry_msgs/metadata.xml b/dev-ros/geometry_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/geometry_msgs/metadata.xml
+++ b/dev-ros/geometry_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/global_planner/metadata.xml b/dev-ros/global_planner/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/global_planner/metadata.xml
+++ b/dev-ros/global_planner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/gmapping/metadata.xml b/dev-ros/gmapping/metadata.xml
index 6680cdd4e8a2..df3b2372a08e 100644
--- a/dev-ros/gmapping/metadata.xml
+++ b/dev-ros/gmapping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
 	</upstream>
diff --git a/dev-ros/hardware_interface/metadata.xml b/dev-ros/hardware_interface/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/hardware_interface/metadata.xml
+++ b/dev-ros/hardware_interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_compressed_map_transport/metadata.xml b/dev-ros/hector_compressed_map_transport/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_compressed_map_transport/metadata.xml
+++ b/dev-ros/hector_compressed_map_transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_geotiff/metadata.xml b/dev-ros/hector_geotiff/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_geotiff/metadata.xml
+++ b/dev-ros/hector_geotiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_geotiff_plugins/metadata.xml b/dev-ros/hector_geotiff_plugins/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_geotiff_plugins/metadata.xml
+++ b/dev-ros/hector_geotiff_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_imu_attitude_to_tf/metadata.xml b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_imu_attitude_to_tf/metadata.xml
+++ b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_imu_tools/metadata.xml b/dev-ros/hector_imu_tools/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_imu_tools/metadata.xml
+++ b/dev-ros/hector_imu_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_map_server/metadata.xml b/dev-ros/hector_map_server/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_map_server/metadata.xml
+++ b/dev-ros/hector_map_server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_map_tools/metadata.xml b/dev-ros/hector_map_tools/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_map_tools/metadata.xml
+++ b/dev-ros/hector_map_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_mapping/metadata.xml b/dev-ros/hector_mapping/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_mapping/metadata.xml
+++ b/dev-ros/hector_mapping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_marker_drawing/metadata.xml b/dev-ros/hector_marker_drawing/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_marker_drawing/metadata.xml
+++ b/dev-ros/hector_marker_drawing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_nav_msgs/metadata.xml b/dev-ros/hector_nav_msgs/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_nav_msgs/metadata.xml
+++ b/dev-ros/hector_nav_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_pose_estimation/metadata.xml b/dev-ros/hector_pose_estimation/metadata.xml
index 19aa8eae0479..31497090efe7 100644
--- a/dev-ros/hector_pose_estimation/metadata.xml
+++ b/dev-ros/hector_pose_estimation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_pose_estimation_core/metadata.xml b/dev-ros/hector_pose_estimation_core/metadata.xml
index 19aa8eae0479..31497090efe7 100644
--- a/dev-ros/hector_pose_estimation_core/metadata.xml
+++ b/dev-ros/hector_pose_estimation_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_slam_launch/metadata.xml b/dev-ros/hector_slam_launch/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_slam_launch/metadata.xml
+++ b/dev-ros/hector_slam_launch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/hector_trajectory_server/metadata.xml b/dev-ros/hector_trajectory_server/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/dev-ros/hector_trajectory_server/metadata.xml
+++ b/dev-ros/hector_trajectory_server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/image_cb_detector/metadata.xml
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/image_geometry/metadata.xml b/dev-ros/image_geometry/metadata.xml
index 08c6dc2f42da..63d56aafeb4f 100644
--- a/dev-ros/image_geometry/metadata.xml
+++ b/dev-ros/image_geometry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
diff --git a/dev-ros/image_proc/metadata.xml b/dev-ros/image_proc/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/image_proc/metadata.xml
+++ b/dev-ros/image_proc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/image_rotate/metadata.xml b/dev-ros/image_rotate/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/image_rotate/metadata.xml
+++ b/dev-ros/image_rotate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/image_transport/metadata.xml b/dev-ros/image_transport/metadata.xml
index abd895f35e83..6bae1e541c6a 100644
--- a/dev-ros/image_transport/metadata.xml
+++ b/dev-ros/image_transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
diff --git a/dev-ros/image_view/metadata.xml b/dev-ros/image_view/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/image_view/metadata.xml
+++ b/dev-ros/image_view/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
index c82184313d31..f292f703a1e3 100644
--- a/dev-ros/imu_processors/metadata.xml
+++ b/dev-ros/imu_processors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
index c82184313d31..f292f703a1e3 100644
--- a/dev-ros/imu_transformer/metadata.xml
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/interactive_marker_tutorials/metadata.xml b/dev-ros/interactive_marker_tutorials/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/dev-ros/interactive_marker_tutorials/metadata.xml
+++ b/dev-ros/interactive_marker_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/interactive_markers/metadata.xml b/dev-ros/interactive_markers/metadata.xml
index 910d81d5632b..895b9a5c900a 100644
--- a/dev-ros/interactive_markers/metadata.xml
+++ b/dev-ros/interactive_markers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/interactive_markers</remote-id>
 	</upstream>
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/interval_intersection/metadata.xml
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/ivcon/metadata.xml b/dev-ros/ivcon/metadata.xml
index 32e60698f4ea..7f4e86ba7def 100644
--- a/dev-ros/ivcon/metadata.xml
+++ b/dev-ros/ivcon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ivcon</remote-id>
 	</upstream>
diff --git a/dev-ros/joint_limits_interface/metadata.xml b/dev-ros/joint_limits_interface/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/joint_limits_interface/metadata.xml
+++ b/dev-ros/joint_limits_interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/joint_states_settler/metadata.xml
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/kdl_conversions/metadata.xml b/dev-ros/kdl_conversions/metadata.xml
index 85acac4db1c2..d9b16b225ddc 100644
--- a/dev-ros/kdl_conversions/metadata.xml
+++ b/dev-ros/kdl_conversions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
diff --git a/dev-ros/kdl_parser/metadata.xml b/dev-ros/kdl_parser/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/kdl_parser/metadata.xml
+++ b/dev-ros/kdl_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/laser_assembler/metadata.xml b/dev-ros/laser_assembler/metadata.xml
index 10e666dc2783..ed5217d7d52a 100644
--- a/dev-ros/laser_assembler/metadata.xml
+++ b/dev-ros/laser_assembler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/laser_assembler</remote-id>
 	</upstream>
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/laser_cb_detector/metadata.xml
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/laser_filters/metadata.xml b/dev-ros/laser_filters/metadata.xml
index 8ccd0ce186c5..75638dc1fb75 100644
--- a/dev-ros/laser_filters/metadata.xml
+++ b/dev-ros/laser_filters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/laser_filters</remote-id>
 	</upstream>
diff --git a/dev-ros/laser_geometry/metadata.xml b/dev-ros/laser_geometry/metadata.xml
index 26b75e4c324e..c0f435d75dcc 100644
--- a/dev-ros/laser_geometry/metadata.xml
+++ b/dev-ros/laser_geometry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/laser_geometry</remote-id>
 	</upstream>
diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml
index 5a837b09677d..808f27b0f396 100644
--- a/dev-ros/laser_proc/metadata.xml
+++ b/dev-ros/laser_proc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/laser_proc</remote-id>
 	</upstream>
diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml
index c23624e4e4c6..4ab0d6941c57 100644
--- a/dev-ros/libmavconn/metadata.xml
+++ b/dev-ros/libmavconn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mavlink/mavros</remote-id>
 	</upstream>
diff --git a/dev-ros/librviz_tutorial/metadata.xml b/dev-ros/librviz_tutorial/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/dev-ros/librviz_tutorial/metadata.xml
+++ b/dev-ros/librviz_tutorial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/map_msgs/metadata.xml b/dev-ros/map_msgs/metadata.xml
index d85186f7151a..0d15872f4619 100644
--- a/dev-ros/map_msgs/metadata.xml
+++ b/dev-ros/map_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/map_server/metadata.xml b/dev-ros/map_server/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/map_server/metadata.xml
+++ b/dev-ros/map_server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml
index a803478b7815..6ae90c68697b 100644
--- a/dev-ros/mavlink-gbp-release/metadata.xml
+++ b/dev-ros/mavlink-gbp-release/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mavlink/mavlink-gbp-release</remote-id>
 	</upstream>
diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml
index c23624e4e4c6..4ab0d6941c57 100644
--- a/dev-ros/mavros/metadata.xml
+++ b/dev-ros/mavros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mavlink/mavros</remote-id>
 	</upstream>
diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml
index c23624e4e4c6..4ab0d6941c57 100644
--- a/dev-ros/mavros_extras/metadata.xml
+++ b/dev-ros/mavros_extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mavlink/mavros</remote-id>
 	</upstream>
diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml
index c23624e4e4c6..4ab0d6941c57 100644
--- a/dev-ros/mavros_msgs/metadata.xml
+++ b/dev-ros/mavros_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mavlink/mavros</remote-id>
 	</upstream>
diff --git a/dev-ros/message_filters/metadata.xml b/dev-ros/message_filters/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/message_filters/metadata.xml
+++ b/dev-ros/message_filters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/message_generation/metadata.xml b/dev-ros/message_generation/metadata.xml
index 9c68b1fd2e87..eee4027285ff 100644
--- a/dev-ros/message_generation/metadata.xml
+++ b/dev-ros/message_generation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/message_generation</remote-id>
 	</upstream>
diff --git a/dev-ros/message_runtime/metadata.xml b/dev-ros/message_runtime/metadata.xml
index 938f27fad37e..a436f81c1832 100644
--- a/dev-ros/message_runtime/metadata.xml
+++ b/dev-ros/message_runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/message_runtime</remote-id>
 	</upstream>
diff --git a/dev-ros/message_to_tf/metadata.xml b/dev-ros/message_to_tf/metadata.xml
index 19aa8eae0479..31497090efe7 100644
--- a/dev-ros/message_to_tf/metadata.xml
+++ b/dev-ros/message_to_tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
 	</upstream>
diff --git a/dev-ros/mk/metadata.xml b/dev-ros/mk/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/mk/metadata.xml
+++ b/dev-ros/mk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/monocam_settler/metadata.xml
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/move_base/metadata.xml b/dev-ros/move_base/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/move_base/metadata.xml
+++ b/dev-ros/move_base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/move_base_msgs/metadata.xml b/dev-ros/move_base_msgs/metadata.xml
index d85186f7151a..0d15872f4619 100644
--- a/dev-ros/move_base_msgs/metadata.xml
+++ b/dev-ros/move_base_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/move_slow_and_clear/metadata.xml b/dev-ros/move_slow_and_clear/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/move_slow_and_clear/metadata.xml
+++ b/dev-ros/move_slow_and_clear/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/moveit_msgs/metadata.xml b/dev-ros/moveit_msgs/metadata.xml
index 8030a6043116..5b428548eef2 100644
--- a/dev-ros/moveit_msgs/metadata.xml
+++ b/dev-ros/moveit_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/moveit_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/nav_core/metadata.xml b/dev-ros/nav_core/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/nav_core/metadata.xml
+++ b/dev-ros/nav_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/nav_msgs/metadata.xml b/dev-ros/nav_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/nav_msgs/metadata.xml
+++ b/dev-ros/nav_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/navfn/metadata.xml b/dev-ros/navfn/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/navfn/metadata.xml
+++ b/dev-ros/navfn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/nodelet/metadata.xml b/dev-ros/nodelet/metadata.xml
index 66af76fe4206..8b2112281bbd 100644
--- a/dev-ros/nodelet/metadata.xml
+++ b/dev-ros/nodelet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
diff --git a/dev-ros/nodelet_topic_tools/metadata.xml b/dev-ros/nodelet_topic_tools/metadata.xml
index 66af76fe4206..8b2112281bbd 100644
--- a/dev-ros/nodelet_topic_tools/metadata.xml
+++ b/dev-ros/nodelet_topic_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
diff --git a/dev-ros/nodelet_tutorial_math/metadata.xml b/dev-ros/nodelet_tutorial_math/metadata.xml
index 9263625c027a..4b10c13858ea 100644
--- a/dev-ros/nodelet_tutorial_math/metadata.xml
+++ b/dev-ros/nodelet_tutorial_math/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/object_recognition_msgs/metadata.xml b/dev-ros/object_recognition_msgs/metadata.xml
index 9d3d0c033948..755fdf91b9f4 100644
--- a/dev-ros/object_recognition_msgs/metadata.xml
+++ b/dev-ros/object_recognition_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">wg-perception/object_recognition_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/octomap_msgs/metadata.xml b/dev-ros/octomap_msgs/metadata.xml
index 6fac7ba452ca..f4c020c8705d 100644
--- a/dev-ros/octomap_msgs/metadata.xml
+++ b/dev-ros/octomap_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">OctoMap/octomap_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
index f32fc1d6ff1c..53e71eef9457 100644
--- a/dev-ros/octomap_ros/metadata.xml
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">OctoMap/octomap_ros</remote-id>
 	</upstream>
diff --git a/dev-ros/opencv_apps/metadata.xml b/dev-ros/opencv_apps/metadata.xml
index 08c6dc2f42da..63d56aafeb4f 100644
--- a/dev-ros/opencv_apps/metadata.xml
+++ b/dev-ros/opencv_apps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
diff --git a/dev-ros/opencv_tests/metadata.xml b/dev-ros/opencv_tests/metadata.xml
index 08c6dc2f42da..63d56aafeb4f 100644
--- a/dev-ros/opencv_tests/metadata.xml
+++ b/dev-ros/opencv_tests/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml
index b4a138105945..de7bc5ebc239 100644
--- a/dev-ros/openni2_camera/metadata.xml
+++ b/dev-ros/openni2_camera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/openni2_camera</remote-id>
 	</upstream>
diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml
index 44d9f932d8b6..2f3e96de0356 100644
--- a/dev-ros/openni2_launch/metadata.xml
+++ b/dev-ros/openni2_launch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/openni2_launch</remote-id>
 	</upstream>
diff --git a/dev-ros/openslam_gmapping/metadata.xml b/dev-ros/openslam_gmapping/metadata.xml
index 6fc09ec56e70..85a9ac0ee87a 100644
--- a/dev-ros/openslam_gmapping/metadata.xml
+++ b/dev-ros/openslam_gmapping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/openslam_gmapping</remote-id>
 	</upstream>
diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
index a6fa41f3b9d7..c41c002d2790 100644
--- a/dev-ros/pcl_conversions/metadata.xml
+++ b/dev-ros/pcl_conversions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/pcl_conversions</remote-id>
 	</upstream>
diff --git a/dev-ros/pcl_msgs/metadata.xml b/dev-ros/pcl_msgs/metadata.xml
index 3737cf556a3f..318cdea689e2 100644
--- a/dev-ros/pcl_msgs/metadata.xml
+++ b/dev-ros/pcl_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/pcl_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/pcl_ros/metadata.xml b/dev-ros/pcl_ros/metadata.xml
index a3b5c3df3d44..0946de51e297 100644
--- a/dev-ros/pcl_ros/metadata.xml
+++ b/dev-ros/pcl_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/perception_pcl</remote-id>
 	</upstream>
diff --git a/dev-ros/pluginlib/metadata.xml b/dev-ros/pluginlib/metadata.xml
index 8667ed7a5c14..d0ea2736d0a5 100644
--- a/dev-ros/pluginlib/metadata.xml
+++ b/dev-ros/pluginlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/pluginlib</remote-id>
 	</upstream>
diff --git a/dev-ros/pluginlib_tutorials/metadata.xml b/dev-ros/pluginlib_tutorials/metadata.xml
index 9263625c027a..4b10c13858ea 100644
--- a/dev-ros/pluginlib_tutorials/metadata.xml
+++ b/dev-ros/pluginlib_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/pointcloud_to_laserscan/metadata.xml b/dev-ros/pointcloud_to_laserscan/metadata.xml
index a08d68b8daa2..d51ac50b71ab 100644
--- a/dev-ros/pointcloud_to_laserscan/metadata.xml
+++ b/dev-ros/pointcloud_to_laserscan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/pointcloud_to_laserscan</remote-id>
 	</upstream>
diff --git a/dev-ros/polled_camera/metadata.xml b/dev-ros/polled_camera/metadata.xml
index abd895f35e83..6bae1e541c6a 100644
--- a/dev-ros/polled_camera/metadata.xml
+++ b/dev-ros/polled_camera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
diff --git a/dev-ros/pr2_dashboard_aggregator/metadata.xml b/dev-ros/pr2_dashboard_aggregator/metadata.xml
index 6efd828db26a..9c007ad7a353 100644
--- a/dev-ros/pr2_dashboard_aggregator/metadata.xml
+++ b/dev-ros/pr2_dashboard_aggregator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
diff --git a/dev-ros/pr2_description/metadata.xml b/dev-ros/pr2_description/metadata.xml
index 6efd828db26a..9c007ad7a353 100644
--- a/dev-ros/pr2_description/metadata.xml
+++ b/dev-ros/pr2_description/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
diff --git a/dev-ros/pr2_machine/metadata.xml b/dev-ros/pr2_machine/metadata.xml
index 6efd828db26a..9c007ad7a353 100644
--- a/dev-ros/pr2_machine/metadata.xml
+++ b/dev-ros/pr2_machine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
diff --git a/dev-ros/pr2_msgs/metadata.xml b/dev-ros/pr2_msgs/metadata.xml
index 6efd828db26a..9c007ad7a353 100644
--- a/dev-ros/pr2_msgs/metadata.xml
+++ b/dev-ros/pr2_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
diff --git a/dev-ros/python_qt_binding/metadata.xml b/dev-ros/python_qt_binding/metadata.xml
index b1a12ff60e3d..0e06f1daf3f0 100644
--- a/dev-ros/python_qt_binding/metadata.xml
+++ b/dev-ros/python_qt_binding/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/python_qt_binding</remote-id>
 	</upstream>
diff --git a/dev-ros/qt_dotgraph/metadata.xml b/dev-ros/qt_dotgraph/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/dev-ros/qt_dotgraph/metadata.xml
+++ b/dev-ros/qt_dotgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/dev-ros/qt_gui/metadata.xml b/dev-ros/qt_gui/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/dev-ros/qt_gui/metadata.xml
+++ b/dev-ros/qt_gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/dev-ros/qt_gui_app/metadata.xml b/dev-ros/qt_gui_app/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/dev-ros/qt_gui_app/metadata.xml
+++ b/dev-ros/qt_gui_app/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/dev-ros/qt_gui_cpp/metadata.xml
+++ b/dev-ros/qt_gui_cpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/dev-ros/qt_gui_py_common/metadata.xml b/dev-ros/qt_gui_py_common/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/dev-ros/qt_gui_py_common/metadata.xml
+++ b/dev-ros/qt_gui_py_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/dev-ros/random_numbers/metadata.xml b/dev-ros/random_numbers/metadata.xml
index a8d674113c56..7dc2728cc013 100644
--- a/dev-ros/random_numbers/metadata.xml
+++ b/dev-ros/random_numbers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/random_numbers</remote-id>
 	</upstream>
diff --git a/dev-ros/realtime_tools/metadata.xml b/dev-ros/realtime_tools/metadata.xml
index 29f794636901..e16404e26cae 100644
--- a/dev-ros/realtime_tools/metadata.xml
+++ b/dev-ros/realtime_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/realtime_tools</remote-id>
 	</upstream>
diff --git a/dev-ros/resource_retriever/metadata.xml b/dev-ros/resource_retriever/metadata.xml
index 6a5cbb40c96a..47e01814ee0b 100644
--- a/dev-ros/resource_retriever/metadata.xml
+++ b/dev-ros/resource_retriever/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/resource_retriever</remote-id>
 	</upstream>
diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml
index fbf527338bb2..2172a56d518b 100644
--- a/dev-ros/rgbd_launch/metadata.xml
+++ b/dev-ros/rgbd_launch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rgbd_launch</remote-id>
 	</upstream>
diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ b/dev-ros/robot_pose_ekf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml
index 0affcca3e508..076777f70003 100644
--- a/dev-ros/robot_pose_publisher/metadata.xml
+++ b/dev-ros/robot_pose_publisher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">WPI-RAIL/robot_pose_publisher</remote-id>
 	</upstream>
diff --git a/dev-ros/robot_state_publisher/metadata.xml b/dev-ros/robot_state_publisher/metadata.xml
index d2f0d6c4d505..dbce828e6dc7 100644
--- a/dev-ros/robot_state_publisher/metadata.xml
+++ b/dev-ros/robot_state_publisher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_state_publisher</remote-id>
 	</upstream>
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
index c655f4f6a490..31e9370d6359 100644
--- a/dev-ros/rosapi/metadata.xml
+++ b/dev-ros/rosapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
 	</upstream>
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
index 157822d64fde..e297e5877c59 100644
--- a/dev-ros/rosauth/metadata.xml
+++ b/dev-ros/rosauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">WPI-RAIL/rosauth</remote-id>
 	</upstream>
diff --git a/dev-ros/rosbag/metadata.xml b/dev-ros/rosbag/metadata.xml
index ca2c4cbf9267..f5ac76d60cd8 100644
--- a/dev-ros/rosbag/metadata.xml
+++ b/dev-ros/rosbag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ros</herd>
+  <maintainer>
+    <email>ros@gentoo.org</email>
+    <name>Gentoo ROS Project</name>
+  </maintainer>
   <use>
     <flag name="lz4">Add support for lz4 compressed bags.</flag>
   </use>
diff --git a/dev-ros/rosbag_storage/metadata.xml b/dev-ros/rosbag_storage/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosbag_storage/metadata.xml
+++ b/dev-ros/rosbag_storage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosbash/metadata.xml b/dev-ros/rosbash/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosbash/metadata.xml
+++ b/dev-ros/rosbash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosboost_cfg/metadata.xml b/dev-ros/rosboost_cfg/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosboost_cfg/metadata.xml
+++ b/dev-ros/rosboost_cfg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
index c655f4f6a490..31e9370d6359 100644
--- a/dev-ros/rosbridge_library/metadata.xml
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
 	</upstream>
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
index c655f4f6a490..31e9370d6359 100644
--- a/dev-ros/rosbridge_server/metadata.xml
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
 	</upstream>
diff --git a/dev-ros/rosbuild/metadata.xml b/dev-ros/rosbuild/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosbuild/metadata.xml
+++ b/dev-ros/rosbuild/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosclean/metadata.xml b/dev-ros/rosclean/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosclean/metadata.xml
+++ b/dev-ros/rosclean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
index 85d3ccd1f8f7..08c18007fd7c 100644
--- a/dev-ros/rosconsole/metadata.xml
+++ b/dev-ros/rosconsole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ros</herd>
+  <maintainer>
+    <email>ros@gentoo.org</email>
+    <name>Gentoo ROS Project</name>
+  </maintainer>
   <use>
     <flag name="glog">Use <pkg>dev-cpp/glog</pkg> as log backend.</flag>
     <flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
diff --git a/dev-ros/rosconsole_bridge/metadata.xml b/dev-ros/rosconsole_bridge/metadata.xml
index 62e3f0ff75b1..5c162d2006b3 100644
--- a/dev-ros/rosconsole_bridge/metadata.xml
+++ b/dev-ros/rosconsole_bridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/rosconsole_bridge</remote-id>
 	</upstream>
diff --git a/dev-ros/roscpp/metadata.xml b/dev-ros/roscpp/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/roscpp/metadata.xml
+++ b/dev-ros/roscpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/roscpp_serialization/metadata.xml b/dev-ros/roscpp_serialization/metadata.xml
index c6d73fb2241a..af9090b269e0 100644
--- a/dev-ros/roscpp_serialization/metadata.xml
+++ b/dev-ros/roscpp_serialization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
diff --git a/dev-ros/roscpp_traits/metadata.xml b/dev-ros/roscpp_traits/metadata.xml
index c6d73fb2241a..af9090b269e0 100644
--- a/dev-ros/roscpp_traits/metadata.xml
+++ b/dev-ros/roscpp_traits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
diff --git a/dev-ros/roscpp_tutorials/metadata.xml b/dev-ros/roscpp_tutorials/metadata.xml
index 53c74b5b3685..2a518bc3a134 100644
--- a/dev-ros/roscpp_tutorials/metadata.xml
+++ b/dev-ros/roscpp_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/roscreate/metadata.xml b/dev-ros/roscreate/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/roscreate/metadata.xml
+++ b/dev-ros/roscreate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosgraph/metadata.xml b/dev-ros/rosgraph/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosgraph/metadata.xml
+++ b/dev-ros/rosgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosgraph_msgs/metadata.xml b/dev-ros/rosgraph_msgs/metadata.xml
index c50f0d81d2f5..d7cff2ac2ae3 100644
--- a/dev-ros/rosgraph_msgs/metadata.xml
+++ b/dev-ros/rosgraph_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/roslang/metadata.xml b/dev-ros/roslang/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/roslang/metadata.xml
+++ b/dev-ros/roslang/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/roslaunch/metadata.xml b/dev-ros/roslaunch/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/roslaunch/metadata.xml
+++ b/dev-ros/roslaunch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/roslib/metadata.xml b/dev-ros/roslib/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/roslib/metadata.xml
+++ b/dev-ros/roslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/roslint/metadata.xml b/dev-ros/roslint/metadata.xml
index d472a9a01274..fe98615c19a3 100644
--- a/dev-ros/roslint/metadata.xml
+++ b/dev-ros/roslint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roslint</remote-id>
 	</upstream>
diff --git a/dev-ros/roslisp/metadata.xml b/dev-ros/roslisp/metadata.xml
index 34f48dffcfff..f9fc4d111b4f 100644
--- a/dev-ros/roslisp/metadata.xml
+++ b/dev-ros/roslisp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roslisp</remote-id>
 	</upstream>
diff --git a/dev-ros/roslz4/metadata.xml b/dev-ros/roslz4/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/roslz4/metadata.xml
+++ b/dev-ros/roslz4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosmake/metadata.xml b/dev-ros/rosmake/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosmake/metadata.xml
+++ b/dev-ros/rosmake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/rosmaster/metadata.xml b/dev-ros/rosmaster/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosmaster/metadata.xml
+++ b/dev-ros/rosmaster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosmsg/metadata.xml b/dev-ros/rosmsg/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosmsg/metadata.xml
+++ b/dev-ros/rosmsg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosnode/metadata.xml b/dev-ros/rosnode/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosnode/metadata.xml
+++ b/dev-ros/rosnode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosout/metadata.xml b/dev-ros/rosout/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosout/metadata.xml
+++ b/dev-ros/rosout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rospack/metadata.xml b/dev-ros/rospack/metadata.xml
index f10ed76a8fe6..21a3feefd5e9 100644
--- a/dev-ros/rospack/metadata.xml
+++ b/dev-ros/rospack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/rospack</remote-id>
 	</upstream>
diff --git a/dev-ros/rosparam/metadata.xml b/dev-ros/rosparam/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosparam/metadata.xml
+++ b/dev-ros/rosparam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rospy/metadata.xml b/dev-ros/rospy/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rospy/metadata.xml
+++ b/dev-ros/rospy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rospy_tutorials/metadata.xml b/dev-ros/rospy_tutorials/metadata.xml
index 53c74b5b3685..2a518bc3a134 100644
--- a/dev-ros/rospy_tutorials/metadata.xml
+++ b/dev-ros/rospy_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_arduino/metadata.xml
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_client/metadata.xml
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_embeddedlinux/metadata.xml
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_msgs/metadata.xml
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_python/metadata.xml
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_server/metadata.xml
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_windows/metadata.xml
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/dev-ros/rosserial_xbee/metadata.xml
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/dev-ros/rosservice/metadata.xml b/dev-ros/rosservice/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rosservice/metadata.xml
+++ b/dev-ros/rosservice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rostest/metadata.xml b/dev-ros/rostest/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rostest/metadata.xml
+++ b/dev-ros/rostest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rostime/metadata.xml b/dev-ros/rostime/metadata.xml
index c6d73fb2241a..af9090b269e0 100644
--- a/dev-ros/rostime/metadata.xml
+++ b/dev-ros/rostime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
diff --git a/dev-ros/rostopic/metadata.xml b/dev-ros/rostopic/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/rostopic/metadata.xml
+++ b/dev-ros/rostopic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rosunit/metadata.xml b/dev-ros/rosunit/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/dev-ros/rosunit/metadata.xml
+++ b/dev-ros/rosunit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/dev-ros/roswtf/metadata.xml b/dev-ros/roswtf/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/roswtf/metadata.xml
+++ b/dev-ros/roswtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/rotate_recovery/metadata.xml b/dev-ros/rotate_recovery/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/rotate_recovery/metadata.xml
+++ b/dev-ros/rotate_recovery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_action/metadata.xml b/dev-ros/rqt_action/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_action/metadata.xml
+++ b/dev-ros/rqt_action/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_bag/metadata.xml b/dev-ros/rqt_bag/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_bag/metadata.xml
+++ b/dev-ros/rqt_bag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_bag_plugins/metadata.xml b/dev-ros/rqt_bag_plugins/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_bag_plugins/metadata.xml
+++ b/dev-ros/rqt_bag_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_console/metadata.xml b/dev-ros/rqt_console/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_console/metadata.xml
+++ b/dev-ros/rqt_console/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_controller_manager/metadata.xml b/dev-ros/rqt_controller_manager/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/rqt_controller_manager/metadata.xml
+++ b/dev-ros/rqt_controller_manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_dep/metadata.xml b/dev-ros/rqt_dep/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_dep/metadata.xml
+++ b/dev-ros/rqt_dep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_graph/metadata.xml b/dev-ros/rqt_graph/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_graph/metadata.xml
+++ b/dev-ros/rqt_graph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_gui/metadata.xml b/dev-ros/rqt_gui/metadata.xml
index 1590eb6cfcd4..017a00d947db 100644
--- a/dev-ros/rqt_gui/metadata.xml
+++ b/dev-ros/rqt_gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_gui_cpp/metadata.xml b/dev-ros/rqt_gui_cpp/metadata.xml
index 1590eb6cfcd4..017a00d947db 100644
--- a/dev-ros/rqt_gui_cpp/metadata.xml
+++ b/dev-ros/rqt_gui_cpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_gui_py/metadata.xml b/dev-ros/rqt_gui_py/metadata.xml
index 1590eb6cfcd4..017a00d947db 100644
--- a/dev-ros/rqt_gui_py/metadata.xml
+++ b/dev-ros/rqt_gui_py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_image_view/metadata.xml b/dev-ros/rqt_image_view/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_image_view/metadata.xml
+++ b/dev-ros/rqt_image_view/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_launch/metadata.xml b/dev-ros/rqt_launch/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_launch/metadata.xml
+++ b/dev-ros/rqt_launch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_logger_level/metadata.xml b/dev-ros/rqt_logger_level/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_logger_level/metadata.xml
+++ b/dev-ros/rqt_logger_level/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_moveit/metadata.xml b/dev-ros/rqt_moveit/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_moveit/metadata.xml
+++ b/dev-ros/rqt_moveit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_msg/metadata.xml b/dev-ros/rqt_msg/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_msg/metadata.xml
+++ b/dev-ros/rqt_msg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_nav_view/metadata.xml b/dev-ros/rqt_nav_view/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_nav_view/metadata.xml
+++ b/dev-ros/rqt_nav_view/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_plot/metadata.xml b/dev-ros/rqt_plot/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_plot/metadata.xml
+++ b/dev-ros/rqt_plot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_pose_view/metadata.xml b/dev-ros/rqt_pose_view/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_pose_view/metadata.xml
+++ b/dev-ros/rqt_pose_view/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_publisher/metadata.xml b/dev-ros/rqt_publisher/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_publisher/metadata.xml
+++ b/dev-ros/rqt_publisher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_py_common/metadata.xml b/dev-ros/rqt_py_common/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_py_common/metadata.xml
+++ b/dev-ros/rqt_py_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_py_console/metadata.xml b/dev-ros/rqt_py_console/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_py_console/metadata.xml
+++ b/dev-ros/rqt_py_console/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_reconfigure/metadata.xml b/dev-ros/rqt_reconfigure/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_reconfigure/metadata.xml
+++ b/dev-ros/rqt_reconfigure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_robot_dashboard/metadata.xml b/dev-ros/rqt_robot_dashboard/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_robot_dashboard/metadata.xml
+++ b/dev-ros/rqt_robot_dashboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_robot_monitor/metadata.xml b/dev-ros/rqt_robot_monitor/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_robot_monitor/metadata.xml
+++ b/dev-ros/rqt_robot_monitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ b/dev-ros/rqt_robot_steering/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_runtime_monitor/metadata.xml b/dev-ros/rqt_runtime_monitor/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_runtime_monitor/metadata.xml
+++ b/dev-ros/rqt_runtime_monitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_rviz/metadata.xml b/dev-ros/rqt_rviz/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_rviz/metadata.xml
+++ b/dev-ros/rqt_rviz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_service_caller/metadata.xml b/dev-ros/rqt_service_caller/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_service_caller/metadata.xml
+++ b/dev-ros/rqt_service_caller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_shell/metadata.xml b/dev-ros/rqt_shell/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_shell/metadata.xml
+++ b/dev-ros/rqt_shell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_srv/metadata.xml b/dev-ros/rqt_srv/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_srv/metadata.xml
+++ b/dev-ros/rqt_srv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_tf_tree/metadata.xml b/dev-ros/rqt_tf_tree/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/dev-ros/rqt_tf_tree/metadata.xml
+++ b/dev-ros/rqt_tf_tree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_top/metadata.xml b/dev-ros/rqt_top/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_top/metadata.xml
+++ b/dev-ros/rqt_top/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_topic/metadata.xml b/dev-ros/rqt_topic/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_topic/metadata.xml
+++ b/dev-ros/rqt_topic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rqt_web/metadata.xml b/dev-ros/rqt_web/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/dev-ros/rqt_web/metadata.xml
+++ b/dev-ros/rqt_web/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/rviz/metadata.xml b/dev-ros/rviz/metadata.xml
index 2ddef280d7a2..435f48d2333e 100644
--- a/dev-ros/rviz/metadata.xml
+++ b/dev-ros/rviz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rviz</remote-id>
 	</upstream>
diff --git a/dev-ros/rviz_plugin_tutorials/metadata.xml b/dev-ros/rviz_plugin_tutorials/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/dev-ros/rviz_plugin_tutorials/metadata.xml
+++ b/dev-ros/rviz_plugin_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/rviz_python_tutorial/metadata.xml b/dev-ros/rviz_python_tutorial/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/dev-ros/rviz_python_tutorial/metadata.xml
+++ b/dev-ros/rviz_python_tutorial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/self_test/metadata.xml b/dev-ros/self_test/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/self_test/metadata.xml
+++ b/dev-ros/self_test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/sensor_msgs/metadata.xml b/dev-ros/sensor_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/sensor_msgs/metadata.xml
+++ b/dev-ros/sensor_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/dev-ros/settlerlib/metadata.xml
+++ b/dev-ros/settlerlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/dev-ros/shape_msgs/metadata.xml b/dev-ros/shape_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/shape_msgs/metadata.xml
+++ b/dev-ros/shape_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml
index 49ea21f458fd..bfdca4b156cc 100644
--- a/dev-ros/shape_tools/metadata.xml
+++ b/dev-ros/shape_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/shape_tools</remote-id>
 	</upstream>
diff --git a/dev-ros/smach/metadata.xml b/dev-ros/smach/metadata.xml
index cad98c82b3c0..6c84cf0cbc0d 100644
--- a/dev-ros/smach/metadata.xml
+++ b/dev-ros/smach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/executive_smach</remote-id>
 	</upstream>
diff --git a/dev-ros/smach_msgs/metadata.xml b/dev-ros/smach_msgs/metadata.xml
index cad98c82b3c0..6c84cf0cbc0d 100644
--- a/dev-ros/smach_msgs/metadata.xml
+++ b/dev-ros/smach_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/executive_smach</remote-id>
 	</upstream>
diff --git a/dev-ros/smach_ros/metadata.xml b/dev-ros/smach_ros/metadata.xml
index cad98c82b3c0..6c84cf0cbc0d 100644
--- a/dev-ros/smach_ros/metadata.xml
+++ b/dev-ros/smach_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/executive_smach</remote-id>
 	</upstream>
diff --git a/dev-ros/smclib/metadata.xml b/dev-ros/smclib/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/dev-ros/smclib/metadata.xml
+++ b/dev-ros/smclib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
index 052c64d84e8a..24c71d767a85 100644
--- a/dev-ros/sound_play/metadata.xml
+++ b/dev-ros/sound_play/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml
index 8c1d038144ed..cd8bd8f67ba9 100644
--- a/dev-ros/stage_ros/metadata.xml
+++ b/dev-ros/stage_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/stage_ros</remote-id>
 	</upstream>
diff --git a/dev-ros/std_msgs/metadata.xml b/dev-ros/std_msgs/metadata.xml
index 56e22171ab6c..2569264a406b 100644
--- a/dev-ros/std_msgs/metadata.xml
+++ b/dev-ros/std_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/std_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/std_srvs/metadata.xml b/dev-ros/std_srvs/metadata.xml
index c50f0d81d2f5..d7cff2ac2ae3 100644
--- a/dev-ros/std_srvs/metadata.xml
+++ b/dev-ros/std_srvs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/stereo_image_proc/metadata.xml b/dev-ros/stereo_image_proc/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/dev-ros/stereo_image_proc/metadata.xml
+++ b/dev-ros/stereo_image_proc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/dev-ros/stereo_msgs/metadata.xml b/dev-ros/stereo_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/stereo_msgs/metadata.xml
+++ b/dev-ros/stereo_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/test_bond/metadata.xml b/dev-ros/test_bond/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/dev-ros/test_bond/metadata.xml
+++ b/dev-ros/test_bond/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/dev-ros/test_diagnostic_aggregator/metadata.xml b/dev-ros/test_diagnostic_aggregator/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/dev-ros/test_diagnostic_aggregator/metadata.xml
+++ b/dev-ros/test_diagnostic_aggregator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/dev-ros/test_nodelet/metadata.xml b/dev-ros/test_nodelet/metadata.xml
index 66af76fe4206..8b2112281bbd 100644
--- a/dev-ros/test_nodelet/metadata.xml
+++ b/dev-ros/test_nodelet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
diff --git a/dev-ros/test_nodelet_topic_tools/metadata.xml b/dev-ros/test_nodelet_topic_tools/metadata.xml
index 66af76fe4206..8b2112281bbd 100644
--- a/dev-ros/test_nodelet_topic_tools/metadata.xml
+++ b/dev-ros/test_nodelet_topic_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosbag/metadata.xml b/dev-ros/test_rosbag/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosbag/metadata.xml
+++ b/dev-ros/test_rosbag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosbag_storage/metadata.xml b/dev-ros/test_rosbag_storage/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosbag_storage/metadata.xml
+++ b/dev-ros/test_rosbag_storage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_roscpp/metadata.xml b/dev-ros/test_roscpp/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_roscpp/metadata.xml
+++ b/dev-ros/test_roscpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosgraph/metadata.xml b/dev-ros/test_rosgraph/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosgraph/metadata.xml
+++ b/dev-ros/test_rosgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_roslaunch/metadata.xml b/dev-ros/test_roslaunch/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_roslaunch/metadata.xml
+++ b/dev-ros/test_roslaunch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_roslib_comm/metadata.xml b/dev-ros/test_roslib_comm/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_roslib_comm/metadata.xml
+++ b/dev-ros/test_roslib_comm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosmaster/metadata.xml b/dev-ros/test_rosmaster/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosmaster/metadata.xml
+++ b/dev-ros/test_rosmaster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosparam/metadata.xml b/dev-ros/test_rosparam/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosparam/metadata.xml
+++ b/dev-ros/test_rosparam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rospy/metadata.xml b/dev-ros/test_rospy/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rospy/metadata.xml
+++ b/dev-ros/test_rospy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_rosservice/metadata.xml b/dev-ros/test_rosservice/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/test_rosservice/metadata.xml
+++ b/dev-ros/test_rosservice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf/metadata.xml b/dev-ros/tf/metadata.xml
index 85acac4db1c2..d9b16b225ddc 100644
--- a/dev-ros/tf/metadata.xml
+++ b/dev-ros/tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/dev-ros/tf_conversions/metadata.xml b/dev-ros/tf_conversions/metadata.xml
index 85acac4db1c2..d9b16b225ddc 100644
--- a/dev-ros/tf_conversions/metadata.xml
+++ b/dev-ros/tf_conversions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
diff --git a/dev-ros/theora_image_transport/metadata.xml b/dev-ros/theora_image_transport/metadata.xml
index 1d01ac483526..1b34d59440d4 100644
--- a/dev-ros/theora_image_transport/metadata.xml
+++ b/dev-ros/theora_image_transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
 	</upstream>
diff --git a/dev-ros/timestamp_tools/metadata.xml b/dev-ros/timestamp_tools/metadata.xml
index 8b588277cae3..ea953ee614f9 100644
--- a/dev-ros/timestamp_tools/metadata.xml
+++ b/dev-ros/timestamp_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/driver_common</remote-id>
 	</upstream>
diff --git a/dev-ros/topic_tools/metadata.xml b/dev-ros/topic_tools/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/topic_tools/metadata.xml
+++ b/dev-ros/topic_tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ros/trajectory_msgs/metadata.xml b/dev-ros/trajectory_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/trajectory_msgs/metadata.xml
+++ b/dev-ros/trajectory_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/transmission_interface/metadata.xml b/dev-ros/transmission_interface/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/dev-ros/transmission_interface/metadata.xml
+++ b/dev-ros/transmission_interface/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/dev-ros/turtle_actionlib/metadata.xml b/dev-ros/turtle_actionlib/metadata.xml
index 9263625c027a..4b10c13858ea 100644
--- a/dev-ros/turtle_actionlib/metadata.xml
+++ b/dev-ros/turtle_actionlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
index 00483fcf6ceb..4f4e9afa1030 100644
--- a/dev-ros/turtle_tf/metadata.xml
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
index 00483fcf6ceb..4f4e9afa1030 100644
--- a/dev-ros/turtle_tf2/metadata.xml
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/turtlesim/metadata.xml b/dev-ros/turtlesim/metadata.xml
index 53c74b5b3685..2a518bc3a134 100644
--- a/dev-ros/turtlesim/metadata.xml
+++ b/dev-ros/turtlesim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/unique_id/metadata.xml b/dev-ros/unique_id/metadata.xml
index 709a6b508f6e..7e113d11e73d 100644
--- a/dev-ros/unique_id/metadata.xml
+++ b/dev-ros/unique_id/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
 	</upstream>
diff --git a/dev-ros/urdf/metadata.xml b/dev-ros/urdf/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/urdf/metadata.xml
+++ b/dev-ros/urdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/urdf_parser_plugin/metadata.xml b/dev-ros/urdf_parser_plugin/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/dev-ros/urdf_parser_plugin/metadata.xml
+++ b/dev-ros/urdf_parser_plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/dev-ros/urdf_tutorial/metadata.xml b/dev-ros/urdf_tutorial/metadata.xml
index fbefffe211c7..fc02784bf002 100644
--- a/dev-ros/urdf_tutorial/metadata.xml
+++ b/dev-ros/urdf_tutorial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/urdf_tutorial</remote-id>
 	</upstream>
diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml
index c44c37120601..00ba075da419 100644
--- a/dev-ros/urg_c/metadata.xml
+++ b/dev-ros/urg_c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/urg_c</remote-id>
 	</upstream>
diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml
index 737327adb7ed..ead0d231ec3b 100644
--- a/dev-ros/urg_node/metadata.xml
+++ b/dev-ros/urg_node/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/urg_node</remote-id>
 	</upstream>
diff --git a/dev-ros/uuid_msgs/metadata.xml b/dev-ros/uuid_msgs/metadata.xml
index 709a6b508f6e..7e113d11e73d 100644
--- a/dev-ros/uuid_msgs/metadata.xml
+++ b/dev-ros/uuid_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
 	</upstream>
diff --git a/dev-ros/visp_auto_tracker/metadata.xml b/dev-ros/visp_auto_tracker/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/dev-ros/visp_auto_tracker/metadata.xml
+++ b/dev-ros/visp_auto_tracker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/dev-ros/visp_bridge/metadata.xml b/dev-ros/visp_bridge/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/dev-ros/visp_bridge/metadata.xml
+++ b/dev-ros/visp_bridge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/dev-ros/visp_camera_calibration/metadata.xml b/dev-ros/visp_camera_calibration/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/dev-ros/visp_camera_calibration/metadata.xml
+++ b/dev-ros/visp_camera_calibration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/dev-ros/visp_hand2eye_calibration/metadata.xml b/dev-ros/visp_hand2eye_calibration/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/dev-ros/visp_hand2eye_calibration/metadata.xml
+++ b/dev-ros/visp_hand2eye_calibration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/dev-ros/visp_tracker/metadata.xml b/dev-ros/visp_tracker/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/dev-ros/visp_tracker/metadata.xml
+++ b/dev-ros/visp_tracker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/dev-ros/visualization_marker_tutorials/metadata.xml b/dev-ros/visualization_marker_tutorials/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/dev-ros/visualization_marker_tutorials/metadata.xml
+++ b/dev-ros/visualization_marker_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/dev-ros/visualization_msgs/metadata.xml b/dev-ros/visualization_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/dev-ros/visualization_msgs/metadata.xml
+++ b/dev-ros/visualization_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/dev-ros/voxel_grid/metadata.xml b/dev-ros/voxel_grid/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/dev-ros/voxel_grid/metadata.xml
+++ b/dev-ros/voxel_grid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/dev-ros/xacro/metadata.xml b/dev-ros/xacro/metadata.xml
index d7b592418f26..5993c3a48690 100644
--- a/dev-ros/xacro/metadata.xml
+++ b/dev-ros/xacro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/xacro</remote-id>
 	</upstream>
diff --git a/dev-ros/xmlrpcpp/metadata.xml b/dev-ros/xmlrpcpp/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/dev-ros/xmlrpcpp/metadata.xml
+++ b/dev-ros/xmlrpcpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/dev-ruby/GeoRuby/metadata.xml b/dev-ruby/GeoRuby/metadata.xml
index cfa7a97dc160..26cad1ae7099 100644
--- a/dev-ruby/GeoRuby/metadata.xml
+++ b/dev-ruby/GeoRuby/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nofxx/georuby</remote-id>
   </upstream>
diff --git a/dev-ruby/RubyInline/metadata.xml b/dev-ruby/RubyInline/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/RubyInline/metadata.xml
+++ b/dev-ruby/RubyInline/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/abstract/metadata.xml b/dev-ruby/abstract/metadata.xml
index 40e0fa203d31..e66b7bec1512 100644
--- a/dev-ruby/abstract/metadata.xml
+++ b/dev-ruby/abstract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">abstract</remote-id>
 	</upstream>
diff --git a/dev-ruby/actionmailer/metadata.xml b/dev-ruby/actionmailer/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/actionmailer/metadata.xml
+++ b/dev-ruby/actionmailer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/actionpack-action_caching/metadata.xml b/dev-ruby/actionpack-action_caching/metadata.xml
index 9380edb67b4d..e0d22691629f 100644
--- a/dev-ruby/actionpack-action_caching/metadata.xml
+++ b/dev-ruby/actionpack-action_caching/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rails/actionpack-action_caching</remote-id>
 	</upstream>
diff --git a/dev-ruby/actionpack-xml_parser/metadata.xml b/dev-ruby/actionpack-xml_parser/metadata.xml
index 99b8abeb0966..472854eef571 100644
--- a/dev-ruby/actionpack-xml_parser/metadata.xml
+++ b/dev-ruby/actionpack-xml_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rails/actionpack-xml_parser</remote-id>
 	</upstream>
diff --git a/dev-ruby/actionpack/metadata.xml b/dev-ruby/actionpack/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/actionpack/metadata.xml
+++ b/dev-ruby/actionpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/actionview/metadata.xml b/dev-ruby/actionview/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/actionview/metadata.xml
+++ b/dev-ruby/actionview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/activejob/metadata.xml b/dev-ruby/activejob/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/activejob/metadata.xml
+++ b/dev-ruby/activejob/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/activeldap/metadata.xml b/dev-ruby/activeldap/metadata.xml
index cfce92669cd9..e24c929a79a6 100644
--- a/dev-ruby/activeldap/metadata.xml
+++ b/dev-ruby/activeldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">activeldap/activeldap</remote-id>
   </upstream>
diff --git a/dev-ruby/activemodel/metadata.xml b/dev-ruby/activemodel/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/activemodel/metadata.xml
+++ b/dev-ruby/activemodel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/activerecord-deprecated_finders/metadata.xml b/dev-ruby/activerecord-deprecated_finders/metadata.xml
index 279518a56085..204898dde877 100644
--- a/dev-ruby/activerecord-deprecated_finders/metadata.xml
+++ b/dev-ruby/activerecord-deprecated_finders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/activerecord-deprecated_finders</remote-id>
   </upstream>
diff --git a/dev-ruby/activerecord/metadata.xml b/dev-ruby/activerecord/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/activerecord/metadata.xml
+++ b/dev-ruby/activerecord/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/activeresource/metadata.xml b/dev-ruby/activeresource/metadata.xml
index b7b7a6aa1d83..d5b4a0635069 100644
--- a/dev-ruby/activeresource/metadata.xml
+++ b/dev-ruby/activeresource/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/activeresource</remote-id>
   </upstream>
diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/acts_as_list/metadata.xml b/dev-ruby/acts_as_list/metadata.xml
index 347325695013..7faa940878ea 100644
--- a/dev-ruby/acts_as_list/metadata.xml
+++ b/dev-ruby/acts_as_list/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">swanandp/acts_as_list</remote-id>
   </upstream>
diff --git a/dev-ruby/addressable/metadata.xml b/dev-ruby/addressable/metadata.xml
index 23a4fd9c3b3d..010a827f63dc 100644
--- a/dev-ruby/addressable/metadata.xml
+++ b/dev-ruby/addressable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sporkmonger/addressable</remote-id>
     <remote-id type="rubygems">addressable</remote-id>
diff --git a/dev-ruby/ae/metadata.xml b/dev-ruby/ae/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ae/metadata.xml
+++ b/dev-ruby/ae/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/afm/metadata.xml b/dev-ruby/afm/metadata.xml
index 8cb0a148975f..99900b807bd3 100644
--- a/dev-ruby/afm/metadata.xml
+++ b/dev-ruby/afm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halfbyte/afm</remote-id>
   </upstream>
diff --git a/dev-ruby/akismet/metadata.xml b/dev-ruby/akismet/metadata.xml
index fb80028858a0..4b42d0654ba2 100644
--- a/dev-ruby/akismet/metadata.xml
+++ b/dev-ruby/akismet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jonahb/akismet</remote-id>
   </upstream>
diff --git a/dev-ruby/allison/metadata.xml b/dev-ruby/allison/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/allison/metadata.xml
+++ b/dev-ruby/allison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/amatch/metadata.xml b/dev-ruby/amatch/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/amatch/metadata.xml
+++ b/dev-ruby/amatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ammeter/metadata.xml b/dev-ruby/ammeter/metadata.xml
index 9a04f42106bd..b274648e3fd4 100644
--- a/dev-ruby/ammeter/metadata.xml
+++ b/dev-ruby/ammeter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">alexrothenberg/ammeter</remote-id>
   </upstream>
diff --git a/dev-ruby/amq-client/metadata.xml b/dev-ruby/amq-client/metadata.xml
index 81f12f072740..61ee853f12f9 100644
--- a/dev-ruby/amq-client/metadata.xml
+++ b/dev-ruby/amq-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-amqp/amq-client</remote-id>
   </upstream>
diff --git a/dev-ruby/amq-protocol/metadata.xml b/dev-ruby/amq-protocol/metadata.xml
index b682934d3016..3c683551b213 100644
--- a/dev-ruby/amq-protocol/metadata.xml
+++ b/dev-ruby/amq-protocol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-amqp/amq-protocol</remote-id>
   </upstream>
diff --git a/dev-ruby/amqp/metadata.xml b/dev-ruby/amqp/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/amqp/metadata.xml
+++ b/dev-ruby/amqp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/annoy/metadata.xml b/dev-ruby/annoy/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/annoy/metadata.xml
+++ b/dev-ruby/annoy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ansi/metadata.xml b/dev-ruby/ansi/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ansi/metadata.xml
+++ b/dev-ruby/ansi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/archive-tar-minitar/metadata.xml b/dev-ruby/archive-tar-minitar/metadata.xml
index 601d5079754e..293af57d872a 100644
--- a/dev-ruby/archive-tar-minitar/metadata.xml
+++ b/dev-ruby/archive-tar-minitar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halostatue/minitar</remote-id>
   </upstream>
diff --git a/dev-ruby/arel/metadata.xml b/dev-ruby/arel/metadata.xml
index 243328ae6ebe..bf3f5a35b9cf 100644
--- a/dev-ruby/arel/metadata.xml
+++ b/dev-ruby/arel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/arel</remote-id>
   </upstream>
diff --git a/dev-ruby/ascii85/metadata.xml b/dev-ruby/ascii85/metadata.xml
index b90d5f4823a9..105aeadf3960 100644
--- a/dev-ruby/ascii85/metadata.xml
+++ b/dev-ruby/ascii85/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">datawraith/ascii85gem</remote-id>
   </upstream>
diff --git a/dev-ruby/asciidoctor/metadata.xml b/dev-ruby/asciidoctor/metadata.xml
index d457e6ab10f2..ecf6bc85a4cb 100644
--- a/dev-ruby/asciidoctor/metadata.xml
+++ b/dev-ruby/asciidoctor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">asciidoctor/asciidoctor</remote-id>
   </upstream>
diff --git a/dev-ruby/asciimath/metadata.xml b/dev-ruby/asciimath/metadata.xml
index 6e2907d1a894..a1c96d3431ea 100644
--- a/dev-ruby/asciimath/metadata.xml
+++ b/dev-ruby/asciimath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pepijnve/asciimath</remote-id>
   </upstream>
diff --git a/dev-ruby/ast/metadata.xml b/dev-ruby/ast/metadata.xml
index 24ff8f28c2ef..7f7088f1d833 100644
--- a/dev-ruby/ast/metadata.xml
+++ b/dev-ruby/ast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">whitequark/ast</remote-id>
   </upstream>
diff --git a/dev-ruby/astrolabe/metadata.xml b/dev-ruby/astrolabe/metadata.xml
index 65d9054e3ab4..d754a6da2bf1 100644
--- a/dev-ruby/astrolabe/metadata.xml
+++ b/dev-ruby/astrolabe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yujinakayama/astrolabe</remote-id>
   </upstream>
diff --git a/dev-ruby/async_sinatra/metadata.xml b/dev-ruby/async_sinatra/metadata.xml
index 7e09827d8d80..5ec0597c9321 100644
--- a/dev-ruby/async_sinatra/metadata.xml
+++ b/dev-ruby/async_sinatra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">raggi/async_sinatra</remote-id>
   </upstream>
diff --git a/dev-ruby/atomic/metadata.xml b/dev-ruby/atomic/metadata.xml
index 12c94a00c0fd..08fadb940710 100644
--- a/dev-ruby/atomic/metadata.xml
+++ b/dev-ruby/atomic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">headius/ruby-atomic</remote-id>
   </upstream>
diff --git a/dev-ruby/awesome_print/metadata.xml b/dev-ruby/awesome_print/metadata.xml
index eed93068e38f..6044ba5a75ff 100644
--- a/dev-ruby/awesome_print/metadata.xml
+++ b/dev-ruby/awesome_print/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">michaeldv/awesome_print</remote-id>
   </upstream>
diff --git a/dev-ruby/aws-s3/metadata.xml b/dev-ruby/aws-s3/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/aws-s3/metadata.xml
+++ b/dev-ruby/aws-s3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/aws-sdk-core/metadata.xml b/dev-ruby/aws-sdk-core/metadata.xml
index eb9a6f7cf849..6ec5c27ee005 100644
--- a/dev-ruby/aws-sdk-core/metadata.xml
+++ b/dev-ruby/aws-sdk-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">aws/aws-sdk-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/aws-sdk-resources/metadata.xml b/dev-ruby/aws-sdk-resources/metadata.xml
index eb9a6f7cf849..6ec5c27ee005 100644
--- a/dev-ruby/aws-sdk-resources/metadata.xml
+++ b/dev-ruby/aws-sdk-resources/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">aws/aws-sdk-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/aws-sdk/metadata.xml b/dev-ruby/aws-sdk/metadata.xml
index eb9a6f7cf849..6ec5c27ee005 100644
--- a/dev-ruby/aws-sdk/metadata.xml
+++ b/dev-ruby/aws-sdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">aws/aws-sdk-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/bacon/metadata.xml b/dev-ruby/bacon/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/bacon/metadata.xml
+++ b/dev-ruby/bacon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/barby/metadata.xml b/dev-ruby/barby/metadata.xml
index 8adfddf6d0b3..8080945ceb31 100644
--- a/dev-ruby/barby/metadata.xml
+++ b/dev-ruby/barby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="qrcode">
       Add support for QRCode 2D codes using
diff --git a/dev-ruby/bcat/metadata.xml b/dev-ruby/bcat/metadata.xml
index c573d38e2994..fb17f6a53965 100644
--- a/dev-ruby/bcat/metadata.xml
+++ b/dev-ruby/bcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/bcat</remote-id>
   </upstream>
diff --git a/dev-ruby/bcrypt-ruby/metadata.xml b/dev-ruby/bcrypt-ruby/metadata.xml
index a1fa63e7c289..7314213dd584 100644
--- a/dev-ruby/bcrypt-ruby/metadata.xml
+++ b/dev-ruby/bcrypt-ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">codahale/bcrypt-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/best_in_place/metadata.xml b/dev-ruby/best_in_place/metadata.xml
index 97e8f142291f..9525bb45a5c5 100644
--- a/dev-ruby/best_in_place/metadata.xml
+++ b/dev-ruby/best_in_place/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bernat/best_in_place</remote-id>
   </upstream>
diff --git a/dev-ruby/binding_of_caller/metadata.xml b/dev-ruby/binding_of_caller/metadata.xml
index 337647c7094a..580c6dd677a3 100644
--- a/dev-ruby/binding_of_caller/metadata.xml
+++ b/dev-ruby/binding_of_caller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">banister/binding_of_caller</remote-id>
   </upstream>
diff --git a/dev-ruby/bitescript/metadata.xml b/dev-ruby/bitescript/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/bitescript/metadata.xml
+++ b/dev-ruby/bitescript/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/blankslate/metadata.xml b/dev-ruby/blankslate/metadata.xml
index a8f99ac7d59e..88afdfe4f493 100644
--- a/dev-ruby/blankslate/metadata.xml
+++ b/dev-ruby/blankslate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">blankslate</remote-id>
 	</upstream>
diff --git a/dev-ruby/bluecloth/metadata.xml b/dev-ruby/bluecloth/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/bluecloth/metadata.xml
+++ b/dev-ruby/bluecloth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/bones/metadata.xml b/dev-ruby/bones/metadata.xml
index 14004b7f8d5a..7545198c1f5c 100644
--- a/dev-ruby/bones/metadata.xml
+++ b/dev-ruby/bones/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">TwP/bones</remote-id>
   </upstream>
diff --git a/dev-ruby/bouncy-castle-java/metadata.xml b/dev-ruby/bouncy-castle-java/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/dev-ruby/bouncy-castle-java/metadata.xml
+++ b/dev-ruby/bouncy-castle-java/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/bourne/metadata.xml b/dev-ruby/bourne/metadata.xml
index b086ae5fe9ed..421ffcba1300 100644
--- a/dev-ruby/bourne/metadata.xml
+++ b/dev-ruby/bourne/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thoughtbot/bourne</remote-id>
   </upstream>
diff --git a/dev-ruby/brass/metadata.xml b/dev-ruby/brass/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/brass/metadata.xml
+++ b/dev-ruby/brass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/bsearch/metadata.xml b/dev-ruby/bsearch/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/bsearch/metadata.xml
+++ b/dev-ruby/bsearch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/bson/metadata.xml b/dev-ruby/bson/metadata.xml
index 35d895fd5ffc..6a15e841f23c 100644
--- a/dev-ruby/bson/metadata.xml
+++ b/dev-ruby/bson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mongodb/bson-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/buftok/metadata.xml b/dev-ruby/buftok/metadata.xml
index 7a558a285622..4f810adf8178 100644
--- a/dev-ruby/buftok/metadata.xml
+++ b/dev-ruby/buftok/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sferik/buftok</remote-id>
   </upstream>
diff --git a/dev-ruby/builder/metadata.xml b/dev-ruby/builder/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/builder/metadata.xml
+++ b/dev-ruby/builder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/bundler-audit/metadata.xml b/dev-ruby/bundler-audit/metadata.xml
index c31d97eb2e6a..48beb227b8f3 100644
--- a/dev-ruby/bundler-audit/metadata.xml
+++ b/dev-ruby/bundler-audit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/dev-ruby/bundler/metadata.xml b/dev-ruby/bundler/metadata.xml
index a75043301b18..cad74d8102f2 100644
--- a/dev-ruby/bundler/metadata.xml
+++ b/dev-ruby/bundler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">carlhuda/bundler</remote-id>
   </upstream>
diff --git a/dev-ruby/bunny/metadata.xml b/dev-ruby/bunny/metadata.xml
index 466c68cf10e5..089a3231f34e 100644
--- a/dev-ruby/bunny/metadata.xml
+++ b/dev-ruby/bunny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celldee/bunny</remote-id>
   </upstream>
diff --git a/dev-ruby/calendar_date_select/metadata.xml b/dev-ruby/calendar_date_select/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/calendar_date_select/metadata.xml
+++ b/dev-ruby/calendar_date_select/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/camping/metadata.xml b/dev-ruby/camping/metadata.xml
index ed77b4f90bcb..055fcc834a3b 100644
--- a/dev-ruby/camping/metadata.xml
+++ b/dev-ruby/camping/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/capistrano-stats/metadata.xml b/dev-ruby/capistrano-stats/metadata.xml
index dbb6fb764591..28e2e612c291 100644
--- a/dev-ruby/capistrano-stats/metadata.xml
+++ b/dev-ruby/capistrano-stats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription>
 Capistrano is a utility and framework for executing commands in parallel on
 multiple remote machines, via SSH.
diff --git a/dev-ruby/capistrano/metadata.xml b/dev-ruby/capistrano/metadata.xml
index dbb6fb764591..28e2e612c291 100644
--- a/dev-ruby/capistrano/metadata.xml
+++ b/dev-ruby/capistrano/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription>
 Capistrano is a utility and framework for executing commands in parallel on
 multiple remote machines, via SSH.
diff --git a/dev-ruby/capybara/metadata.xml b/dev-ruby/capybara/metadata.xml
index 4c0ce61d2a94..a419bddb2d97 100644
--- a/dev-ruby/capybara/metadata.xml
+++ b/dev-ruby/capybara/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnicklas/capybara</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-essentials/metadata.xml b/dev-ruby/celluloid-essentials/metadata.xml
index 38e154faba40..ae601b9fdadf 100644
--- a/dev-ruby/celluloid-essentials/metadata.xml
+++ b/dev-ruby/celluloid-essentials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-essentials</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-extras/metadata.xml b/dev-ruby/celluloid-extras/metadata.xml
index 20200115ae18..c6dc0db64f37 100644
--- a/dev-ruby/celluloid-extras/metadata.xml
+++ b/dev-ruby/celluloid-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-extras</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-fsm/metadata.xml b/dev-ruby/celluloid-fsm/metadata.xml
index 50d71109e95f..2a70c3b42fc5 100644
--- a/dev-ruby/celluloid-fsm/metadata.xml
+++ b/dev-ruby/celluloid-fsm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-fsm</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-io/metadata.xml b/dev-ruby/celluloid-io/metadata.xml
index 56afb24f900f..aefce2fc809d 100644
--- a/dev-ruby/celluloid-io/metadata.xml
+++ b/dev-ruby/celluloid-io/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-io</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-pool/metadata.xml b/dev-ruby/celluloid-pool/metadata.xml
index 8f11e10b9436..50f6e735585b 100644
--- a/dev-ruby/celluloid-pool/metadata.xml
+++ b/dev-ruby/celluloid-pool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-pool</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid-supervision/metadata.xml b/dev-ruby/celluloid-supervision/metadata.xml
index c996e6b738eb..c961953bf522 100644
--- a/dev-ruby/celluloid-supervision/metadata.xml
+++ b/dev-ruby/celluloid-supervision/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid-supervision</remote-id>
   </upstream>
diff --git a/dev-ruby/celluloid/metadata.xml b/dev-ruby/celluloid/metadata.xml
index 50e2f62e8070..91dd16d07606 100644
--- a/dev-ruby/celluloid/metadata.xml
+++ b/dev-ruby/celluloid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/celluloid</remote-id>
   </upstream>
diff --git a/dev-ruby/certificate_authority/metadata.xml b/dev-ruby/certificate_authority/metadata.xml
index 244799e69407..6e7a240c0103 100644
--- a/dev-ruby/certificate_authority/metadata.xml
+++ b/dev-ruby/certificate_authority/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cchandler/certificate_authority</remote-id>
   </upstream>
diff --git a/dev-ruby/charlock_holmes/metadata.xml b/dev-ruby/charlock_holmes/metadata.xml
index 026dbd9ea0f3..ebd4cf72328e 100644
--- a/dev-ruby/charlock_holmes/metadata.xml
+++ b/dev-ruby/charlock_holmes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brianmario/charlock_holmes</remote-id>
   </upstream>
diff --git a/dev-ruby/childlabor/metadata.xml b/dev-ruby/childlabor/metadata.xml
index b931aaca399c..6117c806bb4c 100644
--- a/dev-ruby/childlabor/metadata.xml
+++ b/dev-ruby/childlabor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">carllerche/childlabor</remote-id>
   </upstream>
diff --git a/dev-ruby/childprocess/metadata.xml b/dev-ruby/childprocess/metadata.xml
index 57700e2d3d45..bdd6b76807a2 100644
--- a/dev-ruby/childprocess/metadata.xml
+++ b/dev-ruby/childprocess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jarib/childprocess</remote-id>
   </upstream>
diff --git a/dev-ruby/chronic/metadata.xml b/dev-ruby/chronic/metadata.xml
index 4e0b304531c4..6be2708a88ec 100644
--- a/dev-ruby/chronic/metadata.xml
+++ b/dev-ruby/chronic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mojombo/chronic</remote-id>
   </upstream>
diff --git a/dev-ruby/chunky_png/metadata.xml b/dev-ruby/chunky_png/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/chunky_png/metadata.xml
+++ b/dev-ruby/chunky_png/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/classifier-reborn/metadata.xml b/dev-ruby/classifier-reborn/metadata.xml
index 2a647b31e380..11b032b42e92 100644
--- a/dev-ruby/classifier-reborn/metadata.xml
+++ b/dev-ruby/classifier-reborn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jekyll/classifier-reborn</remote-id>
   </upstream>
diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
index 471aa439f6a3..c6d78ddd9cb7 100644
--- a/dev-ruby/classifier/metadata.xml
+++ b/dev-ruby/classifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cardmagic/classifier</remote-id>
   </upstream>
diff --git a/dev-ruby/climate_control/metadata.xml b/dev-ruby/climate_control/metadata.xml
index 3908d6af940c..fd347fb76af2 100644
--- a/dev-ruby/climate_control/metadata.xml
+++ b/dev-ruby/climate_control/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thoughtbot/climate_control</remote-id>
   </upstream>
diff --git a/dev-ruby/cliver/metadata.xml b/dev-ruby/cliver/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/cliver/metadata.xml
+++ b/dev-ruby/cliver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/cmdparse/metadata.xml b/dev-ruby/cmdparse/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/cmdparse/metadata.xml
+++ b/dev-ruby/cmdparse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/cocaine/metadata.xml b/dev-ruby/cocaine/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/cocaine/metadata.xml
+++ b/dev-ruby/cocaine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/coderay/metadata.xml b/dev-ruby/coderay/metadata.xml
index 300b306c329f..a4176a397510 100644
--- a/dev-ruby/coderay/metadata.xml
+++ b/dev-ruby/coderay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rubychan/coderay</remote-id>
   </upstream>
diff --git a/dev-ruby/coffee-rails/metadata.xml b/dev-ruby/coffee-rails/metadata.xml
index f312fb9d28cc..c8cfa7c1d494 100644
--- a/dev-ruby/coffee-rails/metadata.xml
+++ b/dev-ruby/coffee-rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/coffee-rails</remote-id>
   </upstream>
diff --git a/dev-ruby/coffee-script-source/metadata.xml b/dev-ruby/coffee-script-source/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/coffee-script-source/metadata.xml
+++ b/dev-ruby/coffee-script-source/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/coffee-script/metadata.xml b/dev-ruby/coffee-script/metadata.xml
index f312fb9d28cc..c8cfa7c1d494 100644
--- a/dev-ruby/coffee-script/metadata.xml
+++ b/dev-ruby/coffee-script/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/coffee-rails</remote-id>
   </upstream>
diff --git a/dev-ruby/color/metadata.xml b/dev-ruby/color/metadata.xml
index 57a269e7a16e..a04bb5726304 100644
--- a/dev-ruby/color/metadata.xml
+++ b/dev-ruby/color/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halostatue/color</remote-id>
   </upstream>
diff --git a/dev-ruby/colorator/metadata.xml b/dev-ruby/colorator/metadata.xml
index 598553a84713..10c02753875e 100644
--- a/dev-ruby/colorator/metadata.xml
+++ b/dev-ruby/colorator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">octopress/colorator</remote-id>
   </upstream>
diff --git a/dev-ruby/colored/metadata.xml b/dev-ruby/colored/metadata.xml
index b74777743173..db1ff56c2d6d 100644
--- a/dev-ruby/colored/metadata.xml
+++ b/dev-ruby/colored/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">defunkt/colored</remote-id>
   </upstream>
diff --git a/dev-ruby/colorize/metadata.xml b/dev-ruby/colorize/metadata.xml
index f3a32c65e567..01fde781d52f 100644
--- a/dev-ruby/colorize/metadata.xml
+++ b/dev-ruby/colorize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fazibear/colorize</remote-id>
   </upstream>
diff --git a/dev-ruby/columnize/metadata.xml b/dev-ruby/columnize/metadata.xml
index 3d7a0a21f58a..084639ac9083 100644
--- a/dev-ruby/columnize/metadata.xml
+++ b/dev-ruby/columnize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rocky/columnize</remote-id>
   </upstream>
diff --git a/dev-ruby/combustion/metadata.xml b/dev-ruby/combustion/metadata.xml
index fa48dea65524..db6fb444ea6b 100644
--- a/dev-ruby/combustion/metadata.xml
+++ b/dev-ruby/combustion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pat/combustion</remote-id>
   </upstream>
diff --git a/dev-ruby/commander/metadata.xml b/dev-ruby/commander/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/commander/metadata.xml
+++ b/dev-ruby/commander/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/compass-core/metadata.xml b/dev-ruby/compass-core/metadata.xml
index ba11df1021de..1a845293acef 100644
--- a/dev-ruby/compass-core/metadata.xml
+++ b/dev-ruby/compass-core/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>vikraman@gentoo.org</email>
 		<name>Vikraman Choudhury (vikraman)</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Compass is a Sass-based Stylesheet Framework that streamlines the
 		creation and maintenance of CSS.
diff --git a/dev-ruby/compass-import-once/metadata.xml b/dev-ruby/compass-import-once/metadata.xml
index ba11df1021de..1a845293acef 100644
--- a/dev-ruby/compass-import-once/metadata.xml
+++ b/dev-ruby/compass-import-once/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>vikraman@gentoo.org</email>
 		<name>Vikraman Choudhury (vikraman)</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Compass is a Sass-based Stylesheet Framework that streamlines the
 		creation and maintenance of CSS.
diff --git a/dev-ruby/compass/metadata.xml b/dev-ruby/compass/metadata.xml
index ba11df1021de..1a845293acef 100644
--- a/dev-ruby/compass/metadata.xml
+++ b/dev-ruby/compass/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>vikraman@gentoo.org</email>
 		<name>Vikraman Choudhury (vikraman)</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Compass is a Sass-based Stylesheet Framework that streamlines the
 		creation and maintenance of CSS.
diff --git a/dev-ruby/configliere/metadata.xml b/dev-ruby/configliere/metadata.xml
index 882af0e6de5c..21dd6677f49b 100644
--- a/dev-ruby/configliere/metadata.xml
+++ b/dev-ruby/configliere/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">infochimps-labs/configliere</remote-id>
   </upstream>
diff --git a/dev-ruby/connection_pool/metadata.xml b/dev-ruby/connection_pool/metadata.xml
index c61ff5b6174f..1761b68fdb5c 100644
--- a/dev-ruby/connection_pool/metadata.xml
+++ b/dev-ruby/connection_pool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mperham/connection_pool</remote-id>
   </upstream>
diff --git a/dev-ruby/contracts/metadata.xml b/dev-ruby/contracts/metadata.xml
index e371439df5ec..18bfa02b0f3b 100644
--- a/dev-ruby/contracts/metadata.xml
+++ b/dev-ruby/contracts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">egonSchiele/contracts.ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/coolio/metadata.xml b/dev-ruby/coolio/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/coolio/metadata.xml
+++ b/dev-ruby/coolio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/countdownlatch/metadata.xml b/dev-ruby/countdownlatch/metadata.xml
index 053d84fd43f1..93b6ae6ad43b 100644
--- a/dev-ruby/countdownlatch/metadata.xml
+++ b/dev-ruby/countdownlatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">benlangfeld/countdownlatch</remote-id>
   </upstream>
diff --git a/dev-ruby/crack/metadata.xml b/dev-ruby/crack/metadata.xml
index 148eb0573454..224694b86f8d 100644
--- a/dev-ruby/crack/metadata.xml
+++ b/dev-ruby/crack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnunemaker/crack</remote-id>
   </upstream>
diff --git a/dev-ruby/crass/metadata.xml b/dev-ruby/crass/metadata.xml
index 2bdb4544de34..cbdd75cef570 100644
--- a/dev-ruby/crass/metadata.xml
+++ b/dev-ruby/crass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rgrove/crass</remote-id>
   </upstream>
diff --git a/dev-ruby/creole/metadata.xml b/dev-ruby/creole/metadata.xml
index 24f10aae2909..fc44c4416e93 100644
--- a/dev-ruby/creole/metadata.xml
+++ b/dev-ruby/creole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">minad/creole</remote-id>
   </upstream>
diff --git a/dev-ruby/cri/metadata.xml b/dev-ruby/cri/metadata.xml
index a42b2e4f201f..a582c1b4cc78 100644
--- a/dev-ruby/cri/metadata.xml
+++ b/dev-ruby/cri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">cri</remote-id>
 	</upstream>
diff --git a/dev-ruby/css_parser/metadata.xml b/dev-ruby/css_parser/metadata.xml
index 059c0ea95d4c..afce86222542 100644
--- a/dev-ruby/css_parser/metadata.xml
+++ b/dev-ruby/css_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">premailer/css_parser</remote-id>
   </upstream>
diff --git a/dev-ruby/curb/metadata.xml b/dev-ruby/curb/metadata.xml
index e98a2caac68a..e87e3dbe3997 100644
--- a/dev-ruby/curb/metadata.xml
+++ b/dev-ruby/curb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">taf2/curb</remote-id>
   </upstream>
diff --git a/dev-ruby/d3_rails/metadata.xml b/dev-ruby/d3_rails/metadata.xml
index 5f42f9a30b30..67cf86be7a7a 100644
--- a/dev-ruby/d3_rails/metadata.xml
+++ b/dev-ruby/d3_rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">logical42/d3_rails</remote-id>
   </upstream>
diff --git a/dev-ruby/daemon_controller/metadata.xml b/dev-ruby/daemon_controller/metadata.xml
index 69455f42dc06..a8a57abc6133 100644
--- a/dev-ruby/daemon_controller/metadata.xml
+++ b/dev-ruby/daemon_controller/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">FooBarWidget/daemon_controller</remote-id>
   </upstream>
diff --git a/dev-ruby/daemons/metadata.xml b/dev-ruby/daemons/metadata.xml
index 6579fc77631b..d2fcbba7e814 100644
--- a/dev-ruby/daemons/metadata.xml
+++ b/dev-ruby/daemons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thuehlinger/daemons</remote-id>
   </upstream>
diff --git a/dev-ruby/dalli/metadata.xml b/dev-ruby/dalli/metadata.xml
index c7d720a7d3a3..1c4322459618 100644
--- a/dev-ruby/dalli/metadata.xml
+++ b/dev-ruby/dalli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">petergoldstein/dalli</remote-id>
   </upstream>
diff --git a/dev-ruby/database_cleaner/metadata.xml b/dev-ruby/database_cleaner/metadata.xml
index ec6841a6f855..e40035051175 100644
--- a/dev-ruby/database_cleaner/metadata.xml
+++ b/dev-ruby/database_cleaner/metadata.xml
@@ -5,7 +5,10 @@
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-ruby/date_validator/metadata.xml b/dev-ruby/date_validator/metadata.xml
index c7e5ea5f4a45..d55a6e55fe59 100644
--- a/dev-ruby/date_validator/metadata.xml
+++ b/dev-ruby/date_validator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">codegram/date_validator</remote-id>
   </upstream>
diff --git a/dev-ruby/dbf/metadata.xml b/dev-ruby/dbf/metadata.xml
index 45d8409c65c2..d1e492bfe9f8 100644
--- a/dev-ruby/dbf/metadata.xml
+++ b/dev-ruby/dbf/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">infused/dbf</remote-id>
   </upstream>
diff --git a/dev-ruby/debug_inspector/metadata.xml b/dev-ruby/debug_inspector/metadata.xml
index 02f168fc5801..fe295dbfb4b1 100644
--- a/dev-ruby/debug_inspector/metadata.xml
+++ b/dev-ruby/debug_inspector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">banister/debug_inspector</remote-id>
   </upstream>
diff --git a/dev-ruby/debugger-linecache/metadata.xml b/dev-ruby/debugger-linecache/metadata.xml
index 0109169118a1..e42cc962dd4f 100644
--- a/dev-ruby/debugger-linecache/metadata.xml
+++ b/dev-ruby/debugger-linecache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cldwalker/debugger-linecache</remote-id>
   </upstream>
diff --git a/dev-ruby/deep_merge/metadata.xml b/dev-ruby/deep_merge/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/deep_merge/metadata.xml
+++ b/dev-ruby/deep_merge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/delayer-deferred/metadata.xml b/dev-ruby/delayer-deferred/metadata.xml
index 88ccded3a69a..aa6b10a92a0d 100644
--- a/dev-ruby/delayer-deferred/metadata.xml
+++ b/dev-ruby/delayer-deferred/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">delayer-deferred</remote-id>
 	</upstream>
diff --git a/dev-ruby/delayer/metadata.xml b/dev-ruby/delayer/metadata.xml
index 12fdd331ff07..db1366335c03 100644
--- a/dev-ruby/delayer/metadata.xml
+++ b/dev-ruby/delayer/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">delayer</remote-id>
 	</upstream>
diff --git a/dev-ruby/dep_selector/metadata.xml b/dev-ruby/dep_selector/metadata.xml
index bff62ed8f4ef..2ec3b65a5850 100644
--- a/dev-ruby/dep_selector/metadata.xml
+++ b/dev-ruby/dep_selector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">opscode/dep-selector</remote-id>
   </upstream>
diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
index 94dafa4d7648..b5d79860bfde 100644
--- a/dev-ruby/deprecated/metadata.xml
+++ b/dev-ruby/deprecated/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">erikh/deprecated</remote-id>
   </upstream>
diff --git a/dev-ruby/descendants_tracker/metadata.xml b/dev-ruby/descendants_tracker/metadata.xml
index 5ee6ba630c2d..1bd59b9be81c 100644
--- a/dev-ruby/descendants_tracker/metadata.xml
+++ b/dev-ruby/descendants_tracker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dkubb/descendants_tracker</remote-id>
   </upstream>
diff --git a/dev-ruby/did_you_mean/metadata.xml b/dev-ruby/did_you_mean/metadata.xml
index 6d3e7a1525ed..9a8448b5d5c5 100644
--- a/dev-ruby/did_you_mean/metadata.xml
+++ b/dev-ruby/did_you_mean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yuki24/did_you_mean</remote-id>
   </upstream>
diff --git a/dev-ruby/diff-lcs/metadata.xml b/dev-ruby/diff-lcs/metadata.xml
index 2c88a8640f00..16b8c41f18a2 100644
--- a/dev-ruby/diff-lcs/metadata.xml
+++ b/dev-ruby/diff-lcs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halostatue/diff-lcs</remote-id>
   </upstream>
diff --git a/dev-ruby/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml
index 06e6ac4fa2df..85ddeb2d7269 100644
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">alexdalitz/dnsruby</remote-id>
 	</upstream>
diff --git a/dev-ruby/docile/metadata.xml b/dev-ruby/docile/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/docile/metadata.xml
+++ b/dev-ruby/docile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/domain_name/metadata.xml b/dev-ruby/domain_name/metadata.xml
index d18d5f3abccf..8d0e4fa51a99 100644
--- a/dev-ruby/domain_name/metadata.xml
+++ b/dev-ruby/domain_name/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">knu/ruby-domain_name</remote-id>
   </upstream>
diff --git a/dev-ruby/dotenv/metadata.xml b/dev-ruby/dotenv/metadata.xml
index 93b932334586..4d782bf43d2e 100644
--- a/dev-ruby/dotenv/metadata.xml
+++ b/dev-ruby/dotenv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bkeepers/dotenv</remote-id>
   </upstream>
diff --git a/dev-ruby/duby/metadata.xml b/dev-ruby/duby/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/duby/metadata.xml
+++ b/dev-ruby/duby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/dust/metadata.xml b/dev-ruby/dust/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/dust/metadata.xml
+++ b/dev-ruby/dust/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/equalizer/metadata.xml b/dev-ruby/equalizer/metadata.xml
index 61b210649a9a..72adf88578cf 100644
--- a/dev-ruby/equalizer/metadata.xml
+++ b/dev-ruby/equalizer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dkubb/equalizer</remote-id>
   </upstream>
diff --git a/dev-ruby/erubis/metadata.xml b/dev-ruby/erubis/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/erubis/metadata.xml
+++ b/dev-ruby/erubis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/escape_utils/metadata.xml b/dev-ruby/escape_utils/metadata.xml
index e0500aceca5b..5b196a4a4328 100644
--- a/dev-ruby/escape_utils/metadata.xml
+++ b/dev-ruby/escape_utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">brianmario/escape_utils</remote-id>
 	</upstream>
diff --git a/dev-ruby/ethon/metadata.xml b/dev-ruby/ethon/metadata.xml
index 3e9dad2cc171..3d82490ab036 100644
--- a/dev-ruby/ethon/metadata.xml
+++ b/dev-ruby/ethon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">typhoeus/ethon</remote-id>
   </upstream>
diff --git a/dev-ruby/evented-spec/metadata.xml b/dev-ruby/evented-spec/metadata.xml
index 85989b664a30..062da44e5cbb 100644
--- a/dev-ruby/evented-spec/metadata.xml
+++ b/dev-ruby/evented-spec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-amqp/evented-spec</remote-id>
   </upstream>
diff --git a/dev-ruby/eventmachine/metadata.xml b/dev-ruby/eventmachine/metadata.xml
index 090e1e223d75..a27dec3bd27b 100644
--- a/dev-ruby/eventmachine/metadata.xml
+++ b/dev-ruby/eventmachine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription>
 Ruby/EventMachine is a fast, simple event-processing library for Ruby programs. It lets you write network clients and servers without handling sockets- all you do is send and receive data. Single-threaded socket engine- scalable and FAST!
 </longdescription>
diff --git a/dev-ruby/execjs/metadata.xml b/dev-ruby/execjs/metadata.xml
index 0126fe7b8326..d7efa0f52dbd 100644
--- a/dev-ruby/execjs/metadata.xml
+++ b/dev-ruby/execjs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/execjs</remote-id>
   </upstream>
diff --git a/dev-ruby/exifr/metadata.xml b/dev-ruby/exifr/metadata.xml
index 237fa65776e8..09d40dddfe4d 100644
--- a/dev-ruby/exifr/metadata.xml
+++ b/dev-ruby/exifr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">remvee/exifr</remote-id>
   </upstream>
diff --git a/dev-ruby/expression_parser/metadata.xml b/dev-ruby/expression_parser/metadata.xml
index 9508d6bb7f60..6bb415c8615d 100644
--- a/dev-ruby/expression_parser/metadata.xml
+++ b/dev-ruby/expression_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nricciar/expression_parser</remote-id>
   </upstream>
diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/extlib/metadata.xml
+++ b/dev-ruby/extlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/facets/metadata.xml b/dev-ruby/facets/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/facets/metadata.xml
+++ b/dev-ruby/facets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index 857dff27d870..3827e748c882 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -4,8 +4,14 @@
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
-	<herd>sysadmin</herd>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<use>
 		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
 		<flag name="virt">Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag>
diff --git a/dev-ruby/fakefs/metadata.xml b/dev-ruby/fakefs/metadata.xml
index 7b7164296d36..d8483ec218cf 100644
--- a/dev-ruby/fakefs/metadata.xml
+++ b/dev-ruby/fakefs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">defunkt/fakefs</remote-id>
   </upstream>
diff --git a/dev-ruby/fakeweb/metadata.xml b/dev-ruby/fakeweb/metadata.xml
index 9e2b9ac5e25d..ab7e57323c07 100644
--- a/dev-ruby/fakeweb/metadata.xml
+++ b/dev-ruby/fakeweb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chrisk/fakeweb</remote-id>
   </upstream>
diff --git a/dev-ruby/faraday/metadata.xml b/dev-ruby/faraday/metadata.xml
index ab8be285a1f8..4d2f77d48767 100644
--- a/dev-ruby/faraday/metadata.xml
+++ b/dev-ruby/faraday/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lostisland/faraday</remote-id>
   </upstream>
diff --git a/dev-ruby/faraday_middleware-multi_json/metadata.xml b/dev-ruby/faraday_middleware-multi_json/metadata.xml
index 2cb5f9dca9e8..115e49af78ef 100644
--- a/dev-ruby/faraday_middleware-multi_json/metadata.xml
+++ b/dev-ruby/faraday_middleware-multi_json/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Simple Faraday middleware that uses MultiJson to unobtrusively encode JSON requests and parse JSON responses.
 	</longdescription>
diff --git a/dev-ruby/faraday_middleware/metadata.xml b/dev-ruby/faraday_middleware/metadata.xml
index f99e06e800b3..7286e979c70d 100644
--- a/dev-ruby/faraday_middleware/metadata.xml
+++ b/dev-ruby/faraday_middleware/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A collection of useful Faraday middleware.
 	</longdescription>
diff --git a/dev-ruby/fast-stemmer/metadata.xml b/dev-ruby/fast-stemmer/metadata.xml
index 5b995e056db6..bff3729bd612 100644
--- a/dev-ruby/fast-stemmer/metadata.xml
+++ b/dev-ruby/fast-stemmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">romanbsd/fast-stemmer</remote-id>
   </upstream>
diff --git a/dev-ruby/fast_gettext/metadata.xml b/dev-ruby/fast_gettext/metadata.xml
index 40aa9618736c..7ee79ffb49e4 100644
--- a/dev-ruby/fast_gettext/metadata.xml
+++ b/dev-ruby/fast_gettext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">grosser/fast_gettext</remote-id>
   </upstream>
diff --git a/dev-ruby/fast_xs/metadata.xml b/dev-ruby/fast_xs/metadata.xml
index 1c84f7c90983..48156fe797c3 100644
--- a/dev-ruby/fast_xs/metadata.xml
+++ b/dev-ruby/fast_xs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brianmario/fast_xs</remote-id>
   </upstream>
diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/fcgi/metadata.xml b/dev-ruby/fcgi/metadata.xml
index 5c7bcbb69f47..3775afe9ec19 100644
--- a/dev-ruby/fcgi/metadata.xml
+++ b/dev-ruby/fcgi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">alphallc/ruby-fcgi-ng</remote-id>
   </upstream>
diff --git a/dev-ruby/ferret/metadata.xml b/dev-ruby/ferret/metadata.xml
index 1630c78653c3..95388cfa94b9 100644
--- a/dev-ruby/ferret/metadata.xml
+++ b/dev-ruby/ferret/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jkraemer/ferret</remote-id>
   </upstream>
diff --git a/dev-ruby/ffaker/metadata.xml b/dev-ruby/ffaker/metadata.xml
index cb8e85674520..4ac8f87578cf 100644
--- a/dev-ruby/ffaker/metadata.xml
+++ b/dev-ruby/ffaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">emmanueloga/ffaker</remote-id>
   </upstream>
diff --git a/dev-ruby/ffi/metadata.xml b/dev-ruby/ffi/metadata.xml
index 1c92cfa58444..59d9f46cf7b6 100644
--- a/dev-ruby/ffi/metadata.xml
+++ b/dev-ruby/ffi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ffi/ffi</remote-id>
   </upstream>
diff --git a/dev-ruby/file-tail/metadata.xml b/dev-ruby/file-tail/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/file-tail/metadata.xml
+++ b/dev-ruby/file-tail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/fivemat/metadata.xml b/dev-ruby/fivemat/metadata.xml
index f3d9b93f26e2..db3bf00be9b2 100644
--- a/dev-ruby/fivemat/metadata.xml
+++ b/dev-ruby/fivemat/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-ruby/flexmock/metadata.xml b/dev-ruby/flexmock/metadata.xml
index f04f476570ae..b9a3b9726e65 100644
--- a/dev-ruby/flexmock/metadata.xml
+++ b/dev-ruby/flexmock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jimweirich/flexmock</remote-id>
   </upstream>
diff --git a/dev-ruby/flickraw/metadata.xml b/dev-ruby/flickraw/metadata.xml
index e6ca19a724ce..11975229c995 100644
--- a/dev-ruby/flickraw/metadata.xml
+++ b/dev-ruby/flickraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hanklords/flickraw</remote-id>
   </upstream>
diff --git a/dev-ruby/flog/metadata.xml b/dev-ruby/flog/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/flog/metadata.xml
+++ b/dev-ruby/flog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/forgery/metadata.xml b/dev-ruby/forgery/metadata.xml
index 2afb51372769..8881d612548d 100644
--- a/dev-ruby/forgery/metadata.xml
+++ b/dev-ruby/forgery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sevenwire/forgery</remote-id>
   </upstream>
diff --git a/dev-ruby/fuubar/metadata.xml b/dev-ruby/fuubar/metadata.xml
index 9b646687f818..53a88e941a50 100644
--- a/dev-ruby/fuubar/metadata.xml
+++ b/dev-ruby/fuubar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jeffkreeftmeijer/fuubar</remote-id>
   </upstream>
diff --git a/dev-ruby/fxruby/metadata.xml b/dev-ruby/fxruby/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/fxruby/metadata.xml
+++ b/dev-ruby/fxruby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/gettext_i18n_rails/metadata.xml b/dev-ruby/gettext_i18n_rails/metadata.xml
index 9df2f553e8e4..1d9795ee2369 100644
--- a/dev-ruby/gettext_i18n_rails/metadata.xml
+++ b/dev-ruby/gettext_i18n_rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">grosser/gettext_i18n_rails</remote-id>
   </upstream>
diff --git a/dev-ruby/gherkin/metadata.xml b/dev-ruby/gherkin/metadata.xml
index 610f535de352..7ce2bbe4555e 100644
--- a/dev-ruby/gherkin/metadata.xml
+++ b/dev-ruby/gherkin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cucumber/gherkin</remote-id>
   </upstream>
diff --git a/dev-ruby/gherkin3/metadata.xml b/dev-ruby/gherkin3/metadata.xml
index 270f0aa2c89c..e0ea9aba02c8 100644
--- a/dev-ruby/gherkin3/metadata.xml
+++ b/dev-ruby/gherkin3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cucumber/gherkin3</remote-id>
   </upstream>
diff --git a/dev-ruby/git/metadata.xml b/dev-ruby/git/metadata.xml
index be56a9286982..3329f6e03bcd 100644
--- a/dev-ruby/git/metadata.xml
+++ b/dev-ruby/git/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">schacon/ruby-git</remote-id>
   </upstream>
diff --git a/dev-ruby/github_api/metadata.xml b/dev-ruby/github_api/metadata.xml
index 63fecefad566..d94b664b23a7 100644
--- a/dev-ruby/github_api/metadata.xml
+++ b/dev-ruby/github_api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">peter-murach/github</remote-id>
   </upstream>
diff --git a/dev-ruby/globalid/metadata.xml b/dev-ruby/globalid/metadata.xml
index a350320d09b4..ae010114f822 100644
--- a/dev-ruby/globalid/metadata.xml
+++ b/dev-ruby/globalid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/globalid</remote-id>
   </upstream>
diff --git a/dev-ruby/gnuplot/metadata.xml b/dev-ruby/gnuplot/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/gnuplot/metadata.xml
+++ b/dev-ruby/gnuplot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/gpgme/metadata.xml b/dev-ruby/gpgme/metadata.xml
index 7a8a11258786..28185fdeeac1 100644
--- a/dev-ruby/gpgme/metadata.xml
+++ b/dev-ruby/gpgme/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ueno/ruby-gpgme</remote-id>
   </upstream>
diff --git a/dev-ruby/gruff/metadata.xml b/dev-ruby/gruff/metadata.xml
index 4b85f6d12c5b..d971e4366770 100644
--- a/dev-ruby/gruff/metadata.xml
+++ b/dev-ruby/gruff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">topfunky/gruff</remote-id>
   </upstream>
diff --git a/dev-ruby/haml/metadata.xml b/dev-ruby/haml/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/haml/metadata.xml
+++ b/dev-ruby/haml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hashdiff/metadata.xml b/dev-ruby/hashdiff/metadata.xml
index 853fa27f831d..26bbb3caa93d 100644
--- a/dev-ruby/hashdiff/metadata.xml
+++ b/dev-ruby/hashdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">liufengyun/hashdiff</remote-id>
   </upstream>
diff --git a/dev-ruby/hashery/metadata.xml b/dev-ruby/hashery/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/hashery/metadata.xml
+++ b/dev-ruby/hashery/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hashicorp-checkpoint/metadata.xml b/dev-ruby/hashicorp-checkpoint/metadata.xml
index fe6f9ccf1a7e..e782c4f79125 100644
--- a/dev-ruby/hashicorp-checkpoint/metadata.xml
+++ b/dev-ruby/hashicorp-checkpoint/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hashie/metadata.xml b/dev-ruby/hashie/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/hashie/metadata.xml
+++ b/dev-ruby/hashie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hashr/metadata.xml b/dev-ruby/hashr/metadata.xml
index 1901b699fa77..0ca64b1b14a2 100644
--- a/dev-ruby/hashr/metadata.xml
+++ b/dev-ruby/hashr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">svenfuchs/hashr</remote-id>
   </upstream>
diff --git a/dev-ruby/heredoc_unindent/metadata.xml b/dev-ruby/heredoc_unindent/metadata.xml
index 1c25cd8d3dc9..623e4576204e 100644
--- a/dev-ruby/heredoc_unindent/metadata.xml
+++ b/dev-ruby/heredoc_unindent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">adrianomitre/heredoc_unindent</remote-id>
   </upstream>
diff --git a/dev-ruby/hiera-eyaml-gpg/metadata.xml b/dev-ruby/hiera-eyaml-gpg/metadata.xml
index d67b199a5a5d..b7fec7e2878d 100644
--- a/dev-ruby/hiera-eyaml-gpg/metadata.xml
+++ b/dev-ruby/hiera-eyaml-gpg/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sihil/hiera-eyaml-gpg</remote-id>
   </upstream>
diff --git a/dev-ruby/hiera-eyaml-plaintext/metadata.xml b/dev-ruby/hiera-eyaml-plaintext/metadata.xml
index 4d7e197b0804..1d34728ee35e 100644
--- a/dev-ruby/hiera-eyaml-plaintext/metadata.xml
+++ b/dev-ruby/hiera-eyaml-plaintext/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gtmtechltd/hiera-eyaml-plaintext</remote-id>
   </upstream>
diff --git a/dev-ruby/hiera-eyaml/metadata.xml b/dev-ruby/hiera-eyaml/metadata.xml
index 879dce61332c..11021d21dc4a 100644
--- a/dev-ruby/hiera-eyaml/metadata.xml
+++ b/dev-ruby/hiera-eyaml/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">TomPoulton/hiera-eyaml</remote-id>
   </upstream>
diff --git a/dev-ruby/hiera/metadata.xml b/dev-ruby/hiera/metadata.xml
index 7f9678c1dfef..849756a4e6d9 100644
--- a/dev-ruby/hiera/metadata.xml
+++ b/dev-ruby/hiera/metadata.xml
@@ -4,6 +4,12 @@
 <maintainer>
 <email>prometheanfire@gentoo.org</email>
 </maintainer>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+<maintainer>
+<email>sysadmin@gentoo.org</email>
+<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/highline/metadata.xml b/dev-ruby/highline/metadata.xml
index 45266ec88a75..c6e0f4bc8c5b 100644
--- a/dev-ruby/highline/metadata.xml
+++ b/dev-ruby/highline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">JEG2/highline</remote-id>
   </upstream>
diff --git a/dev-ruby/hike/metadata.xml b/dev-ruby/hike/metadata.xml
index dd46ca7bbdc9..da7678cee3d4 100644
--- a/dev-ruby/hike/metadata.xml
+++ b/dev-ruby/hike/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sstephenson/hike</remote-id>
   </upstream>
diff --git a/dev-ruby/hipchat/metadata.xml b/dev-ruby/hipchat/metadata.xml
index eb4036af7861..191728f3dded 100644
--- a/dev-ruby/hipchat/metadata.xml
+++ b/dev-ruby/hipchat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hipchat/hipchat-rb</remote-id>
   </upstream>
diff --git a/dev-ruby/hitimes/metadata.xml b/dev-ruby/hitimes/metadata.xml
index cfa70c53b1d9..2def23b39f78 100644
--- a/dev-ruby/hitimes/metadata.xml
+++ b/dev-ruby/hitimes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">copiousfreetime/hitimes</remote-id>
   </upstream>
diff --git a/dev-ruby/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/hpricot/metadata.xml b/dev-ruby/hpricot/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/hpricot/metadata.xml
+++ b/dev-ruby/hpricot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/html2haml/metadata.xml b/dev-ruby/html2haml/metadata.xml
index eafe596330df..da17a598e110 100644
--- a/dev-ruby/html2haml/metadata.xml
+++ b/dev-ruby/html2haml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">haml/html2haml</remote-id>
 	</upstream>
diff --git a/dev-ruby/htmlentities/metadata.xml b/dev-ruby/htmlentities/metadata.xml
index b0f408dc12f4..3cc5516ff3fc 100644
--- a/dev-ruby/htmlentities/metadata.xml
+++ b/dev-ruby/htmlentities/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">threedaymonk/htmlentities</remote-id>
   </upstream>
diff --git a/dev-ruby/http-cookie/metadata.xml b/dev-ruby/http-cookie/metadata.xml
index ac8e414b9af6..89179b8ce0eb 100644
--- a/dev-ruby/http-cookie/metadata.xml
+++ b/dev-ruby/http-cookie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sparklemotion/http-cookie</remote-id>
   </upstream>
diff --git a/dev-ruby/http-form_data/metadata.xml b/dev-ruby/http-form_data/metadata.xml
index 7d5c541b7f33..82022d793d08 100644
--- a/dev-ruby/http-form_data/metadata.xml
+++ b/dev-ruby/http-form_data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">httprb/form_data.rb</remote-id>
   </upstream>
diff --git a/dev-ruby/http/metadata.xml b/dev-ruby/http/metadata.xml
index f48b570c1473..3bbfb644969c 100644
--- a/dev-ruby/http/metadata.xml
+++ b/dev-ruby/http/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tarcieri/http</remote-id>
   </upstream>
diff --git a/dev-ruby/http_parser_rb/metadata.xml b/dev-ruby/http_parser_rb/metadata.xml
index 0b03cf857be0..32941749b2cd 100644
--- a/dev-ruby/http_parser_rb/metadata.xml
+++ b/dev-ruby/http_parser_rb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tmm1/http_parser.rb</remote-id>
   </upstream>
diff --git a/dev-ruby/httparty/metadata.xml b/dev-ruby/httparty/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/httparty/metadata.xml
+++ b/dev-ruby/httparty/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/httpauth/metadata.xml b/dev-ruby/httpauth/metadata.xml
index 645a0ce17391..a3deaa62196b 100644
--- a/dev-ruby/httpauth/metadata.xml
+++ b/dev-ruby/httpauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Manfred/HTTPauth</remote-id>
   </upstream>
diff --git a/dev-ruby/httpclient/metadata.xml b/dev-ruby/httpclient/metadata.xml
index 206cc26cac5e..f10da761ad83 100644
--- a/dev-ruby/httpclient/metadata.xml
+++ b/dev-ruby/httpclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nahi/httpclient</remote-id>
   </upstream>
diff --git a/dev-ruby/i18n/metadata.xml b/dev-ruby/i18n/metadata.xml
index 8d537b080660..cd4a0d88ac78 100644
--- a/dev-ruby/i18n/metadata.xml
+++ b/dev-ruby/i18n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">svenfuchs/i18n</remote-id>
   </upstream>
diff --git a/dev-ruby/imagesize/metadata.xml b/dev-ruby/imagesize/metadata.xml
index 81d46ef55ae8..1d2359dd0e2b 100644
--- a/dev-ruby/imagesize/metadata.xml
+++ b/dev-ruby/imagesize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mattheworiordan/imagesize</remote-id>
   </upstream>
diff --git a/dev-ruby/inifile/metadata.xml b/dev-ruby/inifile/metadata.xml
index aea488bb9c0c..0dcb618c3924 100644
--- a/dev-ruby/inifile/metadata.xml
+++ b/dev-ruby/inifile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">TwP/inifile</remote-id>
   </upstream>
diff --git a/dev-ruby/instance_storage/metadata.xml b/dev-ruby/instance_storage/metadata.xml
index 873276e7384f..ba1a19bba924 100644
--- a/dev-ruby/instance_storage/metadata.xml
+++ b/dev-ruby/instance_storage/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">instance_storage</remote-id>
 	</upstream>
diff --git a/dev-ruby/instantiator/metadata.xml b/dev-ruby/instantiator/metadata.xml
index adcdeedd46a0..d158e970be1a 100644
--- a/dev-ruby/instantiator/metadata.xml
+++ b/dev-ruby/instantiator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">floehopper/introspection</remote-id>
   </upstream>
diff --git a/dev-ruby/introspection/metadata.xml b/dev-ruby/introspection/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/introspection/metadata.xml
+++ b/dev-ruby/introspection/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/iobuffer/metadata.xml b/dev-ruby/iobuffer/metadata.xml
index b59e1dda0b4c..e21c283e1e80 100644
--- a/dev-ruby/iobuffer/metadata.xml
+++ b/dev-ruby/iobuffer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tarcieri/iobuffer</remote-id>
   </upstream>
diff --git a/dev-ruby/itextomml/metadata.xml b/dev-ruby/itextomml/metadata.xml
index ed77b4f90bcb..055fcc834a3b 100644
--- a/dev-ruby/itextomml/metadata.xml
+++ b/dev-ruby/itextomml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/jeweler/metadata.xml b/dev-ruby/jeweler/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/jeweler/metadata.xml
+++ b/dev-ruby/jeweler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/jmespath/metadata.xml b/dev-ruby/jmespath/metadata.xml
index 8f1ede85d22d..51b97db42538 100644
--- a/dev-ruby/jmespath/metadata.xml
+++ b/dev-ruby/jmespath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jmespath/jmespath.rb</remote-id>
   </upstream>
diff --git a/dev-ruby/journey/metadata.xml b/dev-ruby/journey/metadata.xml
index ae09d2af7185..f737cad60570 100644
--- a/dev-ruby/journey/metadata.xml
+++ b/dev-ruby/journey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/journey</remote-id>
   </upstream>
diff --git a/dev-ruby/jquery-rails/metadata.xml b/dev-ruby/jquery-rails/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/jquery-rails/metadata.xml
+++ b/dev-ruby/jquery-rails/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/jquery-ui-rails/metadata.xml b/dev-ruby/jquery-ui-rails/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/jquery-ui-rails/metadata.xml
+++ b/dev-ruby/jquery-ui-rails/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index 02148320a5a2..157fea064d3d 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/jsobfu/metadata.xml b/dev-ruby/jsobfu/metadata.xml
index 51de677eb567..a91888376807 100644
--- a/dev-ruby/jsobfu/metadata.xml
+++ b/dev-ruby/jsobfu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rapid7/jsobfu</remote-id>
   </upstream>
diff --git a/dev-ruby/json/metadata.xml b/dev-ruby/json/metadata.xml
index 836873ba804a..5647926be3dd 100644
--- a/dev-ruby/json/metadata.xml
+++ b/dev-ruby/json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">flori/json</remote-id>
   </upstream>
diff --git a/dev-ruby/jwt/metadata.xml b/dev-ruby/jwt/metadata.xml
index b18dbe23253b..bc70c355785f 100644
--- a/dev-ruby/jwt/metadata.xml
+++ b/dev-ruby/jwt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jwt/ruby-jwt</remote-id>
   </upstream>
diff --git a/dev-ruby/kirbybase/metadata.xml b/dev-ruby/kirbybase/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/kirbybase/metadata.xml
+++ b/dev-ruby/kirbybase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/kissfft/metadata.xml b/dev-ruby/kissfft/metadata.xml
index adca29af60c8..f58d45c2a8ff 100644
--- a/dev-ruby/kissfft/metadata.xml
+++ b/dev-ruby/kissfft/metadata.xml
@@ -5,7 +5,10 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/lemon/metadata.xml b/dev-ruby/lemon/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/lemon/metadata.xml
+++ b/dev-ruby/lemon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/letter_opener/metadata.xml b/dev-ruby/letter_opener/metadata.xml
index 57585514e97e..149cd4bccd7e 100644
--- a/dev-ruby/letter_opener/metadata.xml
+++ b/dev-ruby/letter_opener/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ryanb/letter_opener</remote-id>
   </upstream>
diff --git a/dev-ruby/levenshtein/metadata.xml b/dev-ruby/levenshtein/metadata.xml
index b4c662990153..ca5b5e88d12e 100644
--- a/dev-ruby/levenshtein/metadata.xml
+++ b/dev-ruby/levenshtein/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mbleigh/mash</remote-id>
   </upstream>
diff --git a/dev-ruby/libxml/metadata.xml b/dev-ruby/libxml/metadata.xml
index ee10e6e2ad67..f70a88e3b42d 100644
--- a/dev-ruby/libxml/metadata.xml
+++ b/dev-ruby/libxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">xml4r/libxml-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/liquid-c/metadata.xml b/dev-ruby/liquid-c/metadata.xml
index 76486962b2d2..383a1bfc2df9 100644
--- a/dev-ruby/liquid-c/metadata.xml
+++ b/dev-ruby/liquid-c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Shopify/liquid-c</remote-id>
   </upstream>
diff --git a/dev-ruby/liquid/metadata.xml b/dev-ruby/liquid/metadata.xml
index b3fb12e15b96..96dd1b8a6226 100644
--- a/dev-ruby/liquid/metadata.xml
+++ b/dev-ruby/liquid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Shopify/liquid</remote-id>
   </upstream>
diff --git a/dev-ruby/listen/metadata.xml b/dev-ruby/listen/metadata.xml
index 22a347182655..62a61297882d 100644
--- a/dev-ruby/listen/metadata.xml
+++ b/dev-ruby/listen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">guard/listen</remote-id>
   </upstream>
diff --git a/dev-ruby/litc/metadata.xml b/dev-ruby/litc/metadata.xml
index 6e2b50a86701..58157c75ef17 100644
--- a/dev-ruby/litc/metadata.xml
+++ b/dev-ruby/litc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bkaney/litc</remote-id>
   </upstream>
diff --git a/dev-ruby/little-plugger/metadata.xml b/dev-ruby/little-plugger/metadata.xml
index 15e105c467e9..84138a2e24d5 100644
--- a/dev-ruby/little-plugger/metadata.xml
+++ b/dev-ruby/little-plugger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">TwP/little-plugger</remote-id>
   </upstream>
diff --git a/dev-ruby/locale/metadata.xml b/dev-ruby/locale/metadata.xml
index 082058b23a24..2ca101ce6e64 100644
--- a/dev-ruby/locale/metadata.xml
+++ b/dev-ruby/locale/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-gettext/locale</remote-id>
   </upstream>
diff --git a/dev-ruby/lockfile/metadata.xml b/dev-ruby/lockfile/metadata.xml
index bb49a54e4844..d711da8e2099 100644
--- a/dev-ruby/lockfile/metadata.xml
+++ b/dev-ruby/lockfile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ahoward/lockfile</remote-id>
   </upstream>
diff --git a/dev-ruby/log4r/metadata.xml b/dev-ruby/log4r/metadata.xml
index 53e8f48b75c0..0ba7d0a5e8ff 100644
--- a/dev-ruby/log4r/metadata.xml
+++ b/dev-ruby/log4r/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">log4r</remote-id>
 	</upstream>
diff --git a/dev-ruby/log_buddy/metadata.xml b/dev-ruby/log_buddy/metadata.xml
index 7e6dc42297c2..810c687762a0 100644
--- a/dev-ruby/log_buddy/metadata.xml
+++ b/dev-ruby/log_buddy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">relevance/log_buddy</remote-id>
   </upstream>
diff --git a/dev-ruby/logging/metadata.xml b/dev-ruby/logging/metadata.xml
index 1dc56ac637f7..b09ec098023e 100644
--- a/dev-ruby/logging/metadata.xml
+++ b/dev-ruby/logging/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">logging</remote-id>
 	</upstream>
diff --git a/dev-ruby/logue/metadata.xml b/dev-ruby/logue/metadata.xml
index 55a249775505..88947c78ce97 100644
--- a/dev-ruby/logue/metadata.xml
+++ b/dev-ruby/logue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jpace/logue</remote-id>
   </upstream>
diff --git a/dev-ruby/loofah/metadata.xml b/dev-ruby/loofah/metadata.xml
index a80394fe7ba9..4e30ff301cda 100644
--- a/dev-ruby/loofah/metadata.xml
+++ b/dev-ruby/loofah/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">flavorjones/loofah</remote-id>
   </upstream>
diff --git a/dev-ruby/loquacious/metadata.xml b/dev-ruby/loquacious/metadata.xml
index 3c86a4506b91..6bcd9f79e127 100644
--- a/dev-ruby/loquacious/metadata.xml
+++ b/dev-ruby/loquacious/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">TwP/loquacious</remote-id>
   </upstream>
diff --git a/dev-ruby/lumberjack/metadata.xml b/dev-ruby/lumberjack/metadata.xml
index d6e123b83c4b..0355f562ad63 100644
--- a/dev-ruby/lumberjack/metadata.xml
+++ b/dev-ruby/lumberjack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bdurand/lumberjack</remote-id>
   </upstream>
diff --git a/dev-ruby/mab/metadata.xml b/dev-ruby/mab/metadata.xml
index 47befba2b513..7dd1a8342503 100644
--- a/dev-ruby/mab/metadata.xml
+++ b/dev-ruby/mab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">camping/mab</remote-id>
   </upstream>
diff --git a/dev-ruby/magic/metadata.xml b/dev-ruby/magic/metadata.xml
index 44ecb3d5293f..77350be86173 100644
--- a/dev-ruby/magic/metadata.xml
+++ b/dev-ruby/magic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">qoobaa/magic</remote-id>
   </upstream>
diff --git a/dev-ruby/mail/metadata.xml b/dev-ruby/mail/metadata.xml
index c3f3bd3eecbd..a5c81f2a3bf9 100644
--- a/dev-ruby/mail/metadata.xml
+++ b/dev-ruby/mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mikel/mail</remote-id>
   </upstream>
diff --git a/dev-ruby/map/metadata.xml b/dev-ruby/map/metadata.xml
index d85550de8a70..3285506257ea 100644
--- a/dev-ruby/map/metadata.xml
+++ b/dev-ruby/map/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ahoward/map</remote-id>
   </upstream>
diff --git a/dev-ruby/maruku/metadata.xml b/dev-ruby/maruku/metadata.xml
index 123f6e3177fb..6017f1973ebd 100644
--- a/dev-ruby/maruku/metadata.xml
+++ b/dev-ruby/maruku/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="highlight">Enable source code highlighting via <pkg>dev-ruby/syntax</pkg></flag>
   </use>
diff --git a/dev-ruby/mash/metadata.xml b/dev-ruby/mash/metadata.xml
index b4c662990153..ca5b5e88d12e 100644
--- a/dev-ruby/mash/metadata.xml
+++ b/dev-ruby/mash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mbleigh/mash</remote-id>
   </upstream>
diff --git a/dev-ruby/matchy/metadata.xml b/dev-ruby/matchy/metadata.xml
index bcd12b0fcd21..caf60d017465 100644
--- a/dev-ruby/matchy/metadata.xml
+++ b/dev-ruby/matchy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mcmire/matchy</remote-id>
   </upstream>
diff --git a/dev-ruby/maxitest/metadata.xml b/dev-ruby/maxitest/metadata.xml
index 61976dd26ccf..a8cd5dd58557 100644
--- a/dev-ruby/maxitest/metadata.xml
+++ b/dev-ruby/maxitest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">grosser/maxitest</remote-id>
 	</upstream>
diff --git a/dev-ruby/mecab-ruby/metadata.xml b/dev-ruby/mecab-ruby/metadata.xml
index ed7f2d4ce9af..3fa5e363aed3 100644
--- a/dev-ruby/mecab-ruby/metadata.xml
+++ b/dev-ruby/mecab-ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
diff --git a/dev-ruby/mechanize/metadata.xml b/dev-ruby/mechanize/metadata.xml
index b6474c747797..8f55e48fa0b8 100644
--- a/dev-ruby/mechanize/metadata.xml
+++ b/dev-ruby/mechanize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sparklemotion/mechanize</remote-id>
   </upstream>
diff --git a/dev-ruby/memcache-client/metadata.xml b/dev-ruby/memcache-client/metadata.xml
index 48cb01b6958b..3365ae5b9d03 100644
--- a/dev-ruby/memcache-client/metadata.xml
+++ b/dev-ruby/memcache-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mperham/memcache-client</remote-id>
   </upstream>
diff --git a/dev-ruby/memoist/metadata.xml b/dev-ruby/memoist/metadata.xml
index a2d9b67217b9..ef9794c49e6d 100644
--- a/dev-ruby/memoist/metadata.xml
+++ b/dev-ruby/memoist/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="rubygems">memoist</remote-id>
   </upstream>
diff --git a/dev-ruby/memoizable/metadata.xml b/dev-ruby/memoizable/metadata.xml
index 0ce3a519be49..bbd449387753 100644
--- a/dev-ruby/memoizable/metadata.xml
+++ b/dev-ruby/memoizable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dkubb/memoizable</remote-id>
   </upstream>
diff --git a/dev-ruby/memoize/metadata.xml b/dev-ruby/memoize/metadata.xml
index d871c56c744e..2aee4ffda9d7 100644
--- a/dev-ruby/memoize/metadata.xml
+++ b/dev-ruby/memoize/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">djberg96/memoize</remote-id>
   </upstream>
diff --git a/dev-ruby/mercenary/metadata.xml b/dev-ruby/mercenary/metadata.xml
index c25d37f5d0d7..5db82fecad4f 100644
--- a/dev-ruby/mercenary/metadata.xml
+++ b/dev-ruby/mercenary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jekyll/mercenary</remote-id>
   </upstream>
diff --git a/dev-ruby/metaclass/metadata.xml b/dev-ruby/metaclass/metadata.xml
index 1a2f81d00976..23a586056761 100644
--- a/dev-ruby/metaclass/metadata.xml
+++ b/dev-ruby/metaclass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">floehopper/metaclass</remote-id>
   </upstream>
diff --git a/dev-ruby/metaid/metadata.xml b/dev-ruby/metaid/metadata.xml
index cccdef724d1b..3c0a82c193cd 100644
--- a/dev-ruby/metaid/metadata.xml
+++ b/dev-ruby/metaid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">metaid</remote-id>
 	</upstream>
diff --git a/dev-ruby/method_source/metadata.xml b/dev-ruby/method_source/metadata.xml
index ad021576dea2..15167f7b5837 100644
--- a/dev-ruby/method_source/metadata.xml
+++ b/dev-ruby/method_source/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">banister/method_source</remote-id>
   </upstream>
diff --git a/dev-ruby/mime-types-data/metadata.xml b/dev-ruby/mime-types-data/metadata.xml
index 0cf2f92ddee2..7220408cc594 100644
--- a/dev-ruby/mime-types-data/metadata.xml
+++ b/dev-ruby/mime-types-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mime-types/mime-types-data</remote-id>
   </upstream>
diff --git a/dev-ruby/mime-types/metadata.xml b/dev-ruby/mime-types/metadata.xml
index 75986d9fabed..59e0105dd1a4 100644
--- a/dev-ruby/mime-types/metadata.xml
+++ b/dev-ruby/mime-types/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mime-types/ruby-mime-types</remote-id>
   </upstream>
diff --git a/dev-ruby/mimemagic/metadata.xml b/dev-ruby/mimemagic/metadata.xml
index 9617d6abb1b1..45077951e64d 100644
--- a/dev-ruby/mimemagic/metadata.xml
+++ b/dev-ruby/mimemagic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">minad/mimemagic</remote-id>
   </upstream>
diff --git a/dev-ruby/mini_magick/metadata.xml b/dev-ruby/mini_magick/metadata.xml
index 6c62a349f105..afebe91a788e 100644
--- a/dev-ruby/mini_magick/metadata.xml
+++ b/dev-ruby/mini_magick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">minimagick/minimagick</remote-id>
   </upstream>
diff --git a/dev-ruby/mini_shoulda/metadata.xml b/dev-ruby/mini_shoulda/metadata.xml
index 24f01fb004f5..92ed91781b59 100644
--- a/dev-ruby/mini_shoulda/metadata.xml
+++ b/dev-ruby/mini_shoulda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seattlerb/minitest</remote-id>
   </upstream>
diff --git a/dev-ruby/minitest-bonus-assertions/metadata.xml b/dev-ruby/minitest-bonus-assertions/metadata.xml
index ba9b95ec20c6..4925b5adaf40 100644
--- a/dev-ruby/minitest-bonus-assertions/metadata.xml
+++ b/dev-ruby/minitest-bonus-assertions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halostatue/minitest-bonus-assertions</remote-id>
   </upstream>
diff --git a/dev-ruby/minitest-pretty_diff/metadata.xml b/dev-ruby/minitest-pretty_diff/metadata.xml
index 1dae83c57b16..7a1e3385ee3f 100644
--- a/dev-ruby/minitest-pretty_diff/metadata.xml
+++ b/dev-ruby/minitest-pretty_diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">adammck/minitest-pretty_diff</remote-id>
   </upstream>
diff --git a/dev-ruby/minitest/metadata.xml b/dev-ruby/minitest/metadata.xml
index 24f01fb004f5..92ed91781b59 100644
--- a/dev-ruby/minitest/metadata.xml
+++ b/dev-ruby/minitest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seattlerb/minitest</remote-id>
   </upstream>
diff --git a/dev-ruby/mixlib-shellout/metadata.xml b/dev-ruby/mixlib-shellout/metadata.xml
index 7d58544aed1e..992f6f69f703 100644
--- a/dev-ruby/mixlib-shellout/metadata.xml
+++ b/dev-ruby/mixlib-shellout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">opscode/mixlib-shellout</remote-id>
   </upstream>
diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/modernizr/metadata.xml b/dev-ruby/modernizr/metadata.xml
index 4fdecb06b42e..708113b730dc 100644
--- a/dev-ruby/modernizr/metadata.xml
+++ b/dev-ruby/modernizr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">josh/ruby-modernizr</remote-id>
   </upstream>
diff --git a/dev-ruby/moneta/metadata.xml b/dev-ruby/moneta/metadata.xml
index bd61ffb66fe6..16af1e809849 100644
--- a/dev-ruby/moneta/metadata.xml
+++ b/dev-ruby/moneta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">minad/moneta</remote-id>
   </upstream>
diff --git a/dev-ruby/mongo/metadata.xml b/dev-ruby/mongo/metadata.xml
index fdcb13295195..7bfa45047fe3 100644
--- a/dev-ruby/mongo/metadata.xml
+++ b/dev-ruby/mongo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mongodb/mongo-ruby-driver</remote-id>
   </upstream>
diff --git a/dev-ruby/mongoid/metadata.xml b/dev-ruby/mongoid/metadata.xml
index 12cd7d2dfb7f..06e96ea88e04 100644
--- a/dev-ruby/mongoid/metadata.xml
+++ b/dev-ruby/mongoid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mongoid/mongoid</remote-id>
   </upstream>
diff --git a/dev-ruby/msgpack/metadata.xml b/dev-ruby/msgpack/metadata.xml
index 0e4a7ec34c23..7959d262b445 100644
--- a/dev-ruby/msgpack/metadata.xml
+++ b/dev-ruby/msgpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">msgpack</remote-id>
 	</upstream>
diff --git a/dev-ruby/multi_json/metadata.xml b/dev-ruby/multi_json/metadata.xml
index f3d76da5811d..05fbed6ff403 100644
--- a/dev-ruby/multi_json/metadata.xml
+++ b/dev-ruby/multi_json/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">intridea/multi_json</remote-id>
   </upstream>
diff --git a/dev-ruby/multi_test/metadata.xml b/dev-ruby/multi_test/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/multi_test/metadata.xml
+++ b/dev-ruby/multi_test/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/multi_xml/metadata.xml b/dev-ruby/multi_xml/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/multi_xml/metadata.xml
+++ b/dev-ruby/multi_xml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/multipart-post/metadata.xml b/dev-ruby/multipart-post/metadata.xml
index 148a4c6e85da..606881573bf9 100644
--- a/dev-ruby/multipart-post/metadata.xml
+++ b/dev-ruby/multipart-post/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nicksieger/multipart-post</remote-id>
   </upstream>
diff --git a/dev-ruby/mustache/metadata.xml b/dev-ruby/mustache/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/mustache/metadata.xml
+++ b/dev-ruby/mustache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/mysql2/metadata.xml b/dev-ruby/mysql2/metadata.xml
index 7bff423b39a2..e1ae2a1fead7 100644
--- a/dev-ruby/mysql2/metadata.xml
+++ b/dev-ruby/mysql2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brianmario/mysql2</remote-id>
   </upstream>
diff --git a/dev-ruby/nagios/metadata.xml b/dev-ruby/nagios/metadata.xml
index 72bdf7130fba..2840f5fae5f8 100644
--- a/dev-ruby/nagios/metadata.xml
+++ b/dev-ruby/nagios/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jcsalterego/nagios-rb</remote-id>
   </upstream>
diff --git a/dev-ruby/nagios_analyzer/metadata.xml b/dev-ruby/nagios_analyzer/metadata.xml
index efdbf8146284..7c236fc4918d 100644
--- a/dev-ruby/nagios_analyzer/metadata.xml
+++ b/dev-ruby/nagios_analyzer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jbbarth/nagios_analyzer</remote-id>
   </upstream>
diff --git a/dev-ruby/nanotest/metadata.xml b/dev-ruby/nanotest/metadata.xml
index 7e0a678c271a..97a5a5543ac1 100644
--- a/dev-ruby/nanotest/metadata.xml
+++ b/dev-ruby/nanotest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mynyml/nanotest</remote-id>
   </upstream>
diff --git a/dev-ruby/narray/metadata.xml b/dev-ruby/narray/metadata.xml
index 470930ac1bc0..7cc9baf8276a 100644
--- a/dev-ruby/narray/metadata.xml
+++ b/dev-ruby/narray/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">masa16/narray</remote-id>
   </upstream>
diff --git a/dev-ruby/naught/metadata.xml b/dev-ruby/naught/metadata.xml
index 3691a56fa532..b960944adc9c 100644
--- a/dev-ruby/naught/metadata.xml
+++ b/dev-ruby/naught/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">avdi/naught</remote-id>
   </upstream>
diff --git a/dev-ruby/nenv/metadata.xml b/dev-ruby/nenv/metadata.xml
index 9b2e9617b8d7..e12fe9cd0f44 100644
--- a/dev-ruby/nenv/metadata.xml
+++ b/dev-ruby/nenv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">e2/nenv</remote-id>
   </upstream>
diff --git a/dev-ruby/net-http-digest_auth/metadata.xml b/dev-ruby/net-http-digest_auth/metadata.xml
index 524e0f5e1b1a..adb4d1c73a7a 100644
--- a/dev-ruby/net-http-digest_auth/metadata.xml
+++ b/dev-ruby/net-http-digest_auth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">drbrain/net-http-digest_auth</remote-id>
   </upstream>
diff --git a/dev-ruby/net-http-persistent/metadata.xml b/dev-ruby/net-http-persistent/metadata.xml
index 54cb69843c34..aa4ecbf28ae9 100644
--- a/dev-ruby/net-http-persistent/metadata.xml
+++ b/dev-ruby/net-http-persistent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">drbrain/net-http-persistent</remote-id>
   </upstream>
diff --git a/dev-ruby/net-scp/metadata.xml b/dev-ruby/net-scp/metadata.xml
index be5f4778d303..e37ad2896679 100644
--- a/dev-ruby/net-scp/metadata.xml
+++ b/dev-ruby/net-scp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">net-ssh/net-scp</remote-id>
   </upstream>
diff --git a/dev-ruby/net-sftp/metadata.xml b/dev-ruby/net-sftp/metadata.xml
index 64690fa25a6c..2a761f2f09df 100644
--- a/dev-ruby/net-sftp/metadata.xml
+++ b/dev-ruby/net-sftp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">net-ssh/net-sftp</remote-id>
   </upstream>
diff --git a/dev-ruby/net-ssh-gateway/metadata.xml b/dev-ruby/net-ssh-gateway/metadata.xml
index 6187ddb476d8..0abde71f0baa 100644
--- a/dev-ruby/net-ssh-gateway/metadata.xml
+++ b/dev-ruby/net-ssh-gateway/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">net-ssh/net-scp</remote-id>
 	</upstream>
diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
index 7c6a3e034b65..77e550eca27c 100644
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ b/dev-ruby/net-ssh-multi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh-multi</remote-id>
   </upstream>
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index b917e6262722..b2c0b339591e 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh</remote-id>
   </upstream>
diff --git a/dev-ruby/net-telnet/metadata.xml b/dev-ruby/net-telnet/metadata.xml
index 066bbd2805df..72b94ffb6936 100644
--- a/dev-ruby/net-telnet/metadata.xml
+++ b/dev-ruby/net-telnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby/net-telnet</remote-id>
   </upstream>
diff --git a/dev-ruby/netrc/metadata.xml b/dev-ruby/netrc/metadata.xml
index 55f8eba3623c..0672cb990b64 100644
--- a/dev-ruby/netrc/metadata.xml
+++ b/dev-ruby/netrc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">geemus/netrc</remote-id>
   </upstream>
diff --git a/dev-ruby/niceogiri/metadata.xml b/dev-ruby/niceogiri/metadata.xml
index 2b6c2f1e1a14..96bfc6f2ee57 100644
--- a/dev-ruby/niceogiri/metadata.xml
+++ b/dev-ruby/niceogiri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">benlangfeld/Niceogiri</remote-id>
   </upstream>
diff --git a/dev-ruby/nio4r/metadata.xml b/dev-ruby/nio4r/metadata.xml
index 7b48234fe416..8deed537d38a 100644
--- a/dev-ruby/nio4r/metadata.xml
+++ b/dev-ruby/nio4r/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">celluloid/nio4r</remote-id>
   </upstream>
diff --git a/dev-ruby/nokogiri-diff/metadata.xml b/dev-ruby/nokogiri-diff/metadata.xml
index 4353ea5ac7bd..75a4b64b351c 100644
--- a/dev-ruby/nokogiri-diff/metadata.xml
+++ b/dev-ruby/nokogiri-diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">postmodern/nokogiri-diff</remote-id>
   </upstream>
diff --git a/dev-ruby/nokogiri/metadata.xml b/dev-ruby/nokogiri/metadata.xml
index ac1c602a3030..eb2873384eaf 100644
--- a/dev-ruby/nokogiri/metadata.xml
+++ b/dev-ruby/nokogiri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sparklemotion/nokogiri</remote-id>
   </upstream>
diff --git a/dev-ruby/nokogumbo/metadata.xml b/dev-ruby/nokogumbo/metadata.xml
index 61aa0aa44464..4bab286afb22 100644
--- a/dev-ruby/nokogumbo/metadata.xml
+++ b/dev-ruby/nokogumbo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rubys/nokogumbo</remote-id>
   </upstream>
diff --git a/dev-ruby/notify/metadata.xml b/dev-ruby/notify/metadata.xml
index ee01a76bafde..1a495baed85c 100644
--- a/dev-ruby/notify/metadata.xml
+++ b/dev-ruby/notify/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jugyo/notify</remote-id>
   </upstream>
diff --git a/dev-ruby/ntlm-http/metadata.xml b/dev-ruby/ntlm-http/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ntlm-http/metadata.xml
+++ b/dev-ruby/ntlm-http/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/oauth2/metadata.xml b/dev-ruby/oauth2/metadata.xml
index ee2e2cbb6b66..3c1c504b92c3 100644
--- a/dev-ruby/oauth2/metadata.xml
+++ b/dev-ruby/oauth2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">intridea/oauth2</remote-id>
   </upstream>
diff --git a/dev-ruby/omniauth/metadata.xml b/dev-ruby/omniauth/metadata.xml
index df5a6cd9d02b..35c210e378cb 100644
--- a/dev-ruby/omniauth/metadata.xml
+++ b/dev-ruby/omniauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">intridea/omniauth</remote-id>
   </upstream>
diff --git a/dev-ruby/open4/metadata.xml b/dev-ruby/open4/metadata.xml
index deab39452001..7fa3a8ee7d8f 100644
--- a/dev-ruby/open4/metadata.xml
+++ b/dev-ruby/open4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ahoward/open4</remote-id>
   </upstream>
diff --git a/dev-ruby/optionable/metadata.xml b/dev-ruby/optionable/metadata.xml
index 822a9ae69c79..2c0d98a703f2 100644
--- a/dev-ruby/optionable/metadata.xml
+++ b/dev-ruby/optionable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">durran/optionable</remote-id>
   </upstream>
diff --git a/dev-ruby/org-ruby/metadata.xml b/dev-ruby/org-ruby/metadata.xml
index 3c5f35f0f3cf..56d2d2787916 100644
--- a/dev-ruby/org-ruby/metadata.xml
+++ b/dev-ruby/org-ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">wallyqs/org-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/origin/metadata.xml b/dev-ruby/origin/metadata.xml
index 0fcfcc7bd9a0..99b56c27e8d6 100644
--- a/dev-ruby/origin/metadata.xml
+++ b/dev-ruby/origin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mongoid/origin</remote-id>
   </upstream>
diff --git a/dev-ruby/ox/metadata.xml b/dev-ruby/ox/metadata.xml
index 38c9d79e0a3a..5b24e2ee3b70 100644
--- a/dev-ruby/ox/metadata.xml
+++ b/dev-ruby/ox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ohler55/ox</remote-id>
   </upstream>
diff --git a/dev-ruby/packetfu/metadata.xml b/dev-ruby/packetfu/metadata.xml
index 6e4144fa1b32..62f2c3845f89 100644
--- a/dev-ruby/packetfu/metadata.xml
+++ b/dev-ruby/packetfu/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/paint/metadata.xml b/dev-ruby/paint/metadata.xml
index e578ed34c163..393e5536ee56 100644
--- a/dev-ruby/paint/metadata.xml
+++ b/dev-ruby/paint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">janlelis/paint</remote-id>
   </upstream>
diff --git a/dev-ruby/parser/metadata.xml b/dev-ruby/parser/metadata.xml
index 9373f39393aa..9e8a003bdb4d 100644
--- a/dev-ruby/parser/metadata.xml
+++ b/dev-ruby/parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">whitequark/parser</remote-id>
   </upstream>
diff --git a/dev-ruby/parslet/metadata.xml b/dev-ruby/parslet/metadata.xml
index 9d67314a70ac..184ff0588381 100644
--- a/dev-ruby/parslet/metadata.xml
+++ b/dev-ruby/parslet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kschiess/parslet</remote-id>
   </upstream>
diff --git a/dev-ruby/patron/metadata.xml b/dev-ruby/patron/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/patron/metadata.xml
+++ b/dev-ruby/patron/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/pcaprub/metadata.xml b/dev-ruby/pcaprub/metadata.xml
index 6136d426e512..4eb3aa829971 100644
--- a/dev-ruby/pcaprub/metadata.xml
+++ b/dev-ruby/pcaprub/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/pdf-core/metadata.xml b/dev-ruby/pdf-core/metadata.xml
index d73bab461028..89b103c828e7 100644
--- a/dev-ruby/pdf-core/metadata.xml
+++ b/dev-ruby/pdf-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">prawnpdf/pdf-core</remote-id>
   </upstream>
diff --git a/dev-ruby/pdf-inspector/metadata.xml b/dev-ruby/pdf-inspector/metadata.xml
index 3e146952110d..7df5dffc46e2 100644
--- a/dev-ruby/pdf-inspector/metadata.xml
+++ b/dev-ruby/pdf-inspector/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">prawnpdf/pdf-inspector</remote-id>
   </upstream>
diff --git a/dev-ruby/pdf-reader/metadata.xml b/dev-ruby/pdf-reader/metadata.xml
index 58620d4fc0c7..c7653b0e5fb7 100644
--- a/dev-ruby/pdf-reader/metadata.xml
+++ b/dev-ruby/pdf-reader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yob/pdf-reader</remote-id>
   </upstream>
diff --git a/dev-ruby/permutation/metadata.xml b/dev-ruby/permutation/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/permutation/metadata.xml
+++ b/dev-ruby/permutation/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/pg/metadata.xml b/dev-ruby/pg/metadata.xml
index 65d40a7a9fa2..3075bf608b65 100644
--- a/dev-ruby/pg/metadata.xml
+++ b/dev-ruby/pg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">ged/ruby-pg</remote-id>
   </upstream>
diff --git a/dev-ruby/pkg-config/metadata.xml b/dev-ruby/pkg-config/metadata.xml
index 83a8f2600154..1a4c547ba40b 100644
--- a/dev-ruby/pkg-config/metadata.xml
+++ b/dev-ruby/pkg-config/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rcairo/pkg-config</remote-id>
   </upstream>
diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/pluggaloid/metadata.xml b/dev-ruby/pluggaloid/metadata.xml
index 88ccded3a69a..aa6b10a92a0d 100644
--- a/dev-ruby/pluggaloid/metadata.xml
+++ b/dev-ruby/pluggaloid/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">delayer-deferred</remote-id>
 	</upstream>
diff --git a/dev-ruby/png/metadata.xml b/dev-ruby/png/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/png/metadata.xml
+++ b/dev-ruby/png/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/poltergeist/metadata.xml b/dev-ruby/poltergeist/metadata.xml
index da30dce96a05..bc9a385dcf50 100644
--- a/dev-ruby/poltergeist/metadata.xml
+++ b/dev-ruby/poltergeist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jonleighton/poltergeist</remote-id>
   </upstream>
diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index 959e1f18f8f1..432f2a3feacb 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription>
 Polyglot provides support for fully-custom DSLs by providing a
 registry of file types that can be loaded by its improved version of
diff --git a/dev-ruby/posix-spawn/metadata.xml b/dev-ruby/posix-spawn/metadata.xml
index 82a798903bd3..0800826ac980 100644
--- a/dev-ruby/posix-spawn/metadata.xml
+++ b/dev-ruby/posix-spawn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/posix-spawn</remote-id>
   </upstream>
diff --git a/dev-ruby/power_assert/metadata.xml b/dev-ruby/power_assert/metadata.xml
index 4d93411b119d..50c2e61d52c3 100644
--- a/dev-ruby/power_assert/metadata.xml
+++ b/dev-ruby/power_assert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">k-tsj/power_assert</remote-id>
   </upstream>
diff --git a/dev-ruby/prawn-table/metadata.xml b/dev-ruby/prawn-table/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/prawn-table/metadata.xml
+++ b/dev-ruby/prawn-table/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/prawn/metadata.xml b/dev-ruby/prawn/metadata.xml
index f05fefb5eeca..385a631f694a 100644
--- a/dev-ruby/prawn/metadata.xml
+++ b/dev-ruby/prawn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">prawnpdf/prawn</remote-id>
   </upstream>
diff --git a/dev-ruby/priorityqueue/metadata.xml b/dev-ruby/priorityqueue/metadata.xml
index 41710161b990..ad81f696539a 100644
--- a/dev-ruby/priorityqueue/metadata.xml
+++ b/dev-ruby/priorityqueue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">PriorityQueue</remote-id>
 	</upstream>
diff --git a/dev-ruby/protected_attributes/metadata.xml b/dev-ruby/protected_attributes/metadata.xml
index a49623c4ff72..acd601acda3f 100644
--- a/dev-ruby/protected_attributes/metadata.xml
+++ b/dev-ruby/protected_attributes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/protected_attributes</remote-id>
   </upstream>
diff --git a/dev-ruby/pry/metadata.xml b/dev-ruby/pry/metadata.xml
index 83b59f446893..98796d41b7b9 100644
--- a/dev-ruby/pry/metadata.xml
+++ b/dev-ruby/pry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pry/pry</remote-id>
   </upstream>
diff --git a/dev-ruby/psych/metadata.xml b/dev-ruby/psych/metadata.xml
index e17f016cf0af..accedd476223 100644
--- a/dev-ruby/psych/metadata.xml
+++ b/dev-ruby/psych/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tenderlove/psych</remote-id>
   </upstream>
diff --git a/dev-ruby/puppetdb-termini/metadata.xml b/dev-ruby/puppetdb-termini/metadata.xml
index b7587fac6fe0..8f08c9ccfb90 100644
--- a/dev-ruby/puppetdb-termini/metadata.xml
+++ b/dev-ruby/puppetdb-termini/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		puppet plugin used to connect to puppetdb
 	</longdescription>
diff --git a/dev-ruby/pygments_rb/metadata.xml b/dev-ruby/pygments_rb/metadata.xml
index c5a2937fe773..78912bbe4396 100644
--- a/dev-ruby/pygments_rb/metadata.xml
+++ b/dev-ruby/pygments_rb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tmm1/pygments.rb</remote-id>
   </upstream>
diff --git a/dev-ruby/qed/metadata.xml b/dev-ruby/qed/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/qed/metadata.xml
+++ b/dev-ruby/qed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/racc/metadata.xml b/dev-ruby/racc/metadata.xml
index febc99fee63d..43f15ff5faca 100644
--- a/dev-ruby/racc/metadata.xml
+++ b/dev-ruby/racc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tenderlove/racc</remote-id>
 	</upstream>
diff --git a/dev-ruby/rack-attack/metadata.xml b/dev-ruby/rack-attack/metadata.xml
index b7a0f2c2ffd3..d02e2e21e727 100644
--- a/dev-ruby/rack-attack/metadata.xml
+++ b/dev-ruby/rack-attack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kickstarter/rack-attack</remote-id>
   </upstream>
diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index d56fe2a23791..69e4339d566f 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rtomayko/rack-cache</remote-id>
 	</upstream>
diff --git a/dev-ruby/rack-mount/metadata.xml b/dev-ruby/rack-mount/metadata.xml
index e9d62a8cad90..67e134310f90 100644
--- a/dev-ruby/rack-mount/metadata.xml
+++ b/dev-ruby/rack-mount/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription>
 Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.
diff --git a/dev-ruby/rack-openid/metadata.xml b/dev-ruby/rack-openid/metadata.xml
index e58b8cfdd9d1..e39010b67c3f 100644
--- a/dev-ruby/rack-openid/metadata.xml
+++ b/dev-ruby/rack-openid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">grosser/rack-openid</remote-id>
   </upstream>
diff --git a/dev-ruby/rack-protection/metadata.xml b/dev-ruby/rack-protection/metadata.xml
index a5d28ce40210..29581f1af25c 100644
--- a/dev-ruby/rack-protection/metadata.xml
+++ b/dev-ruby/rack-protection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription>
 Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.
diff --git a/dev-ruby/rack-ssl/metadata.xml b/dev-ruby/rack-ssl/metadata.xml
index 054395e73378..6b9b98527667 100644
--- a/dev-ruby/rack-ssl/metadata.xml
+++ b/dev-ruby/rack-ssl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription>
 Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.
diff --git a/dev-ruby/rack-test/metadata.xml b/dev-ruby/rack-test/metadata.xml
index b79f1cb19cc7..f61a59306f5f 100644
--- a/dev-ruby/rack-test/metadata.xml
+++ b/dev-ruby/rack-test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brynary/rack-test</remote-id>
   </upstream>
diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index 4cf96e303570..649c648b09ff 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription>Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.</longdescription>
 </pkgmetadata>
diff --git a/dev-ruby/radius/metadata.xml b/dev-ruby/radius/metadata.xml
index e400d036035b..9514c5317abf 100644
--- a/dev-ruby/radius/metadata.xml
+++ b/dev-ruby/radius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jlong/radius</remote-id>
   </upstream>
diff --git a/dev-ruby/ragol/metadata.xml b/dev-ruby/ragol/metadata.xml
index a56adbd92e03..99ba841b871b 100644
--- a/dev-ruby/ragol/metadata.xml
+++ b/dev-ruby/ragol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jpace/ragol</remote-id>
   </upstream>
diff --git a/dev-ruby/rails-deprecated_sanitizer/metadata.xml b/dev-ruby/rails-deprecated_sanitizer/metadata.xml
index 881a8d24f015..862bd72d3362 100644
--- a/dev-ruby/rails-deprecated_sanitizer/metadata.xml
+++ b/dev-ruby/rails-deprecated_sanitizer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails-deprecated_sanitizer</remote-id>
   </upstream>
diff --git a/dev-ruby/rails-dom-testing/metadata.xml b/dev-ruby/rails-dom-testing/metadata.xml
index c26fcb42a341..f12cf56ce3a6 100644
--- a/dev-ruby/rails-dom-testing/metadata.xml
+++ b/dev-ruby/rails-dom-testing/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">kaspth/rails-dom-testing</remote-id>
   </upstream>
diff --git a/dev-ruby/rails-html-sanitizer/metadata.xml b/dev-ruby/rails-html-sanitizer/metadata.xml
index 74d503427bef..e16037097c6a 100644
--- a/dev-ruby/rails-html-sanitizer/metadata.xml
+++ b/dev-ruby/rails-html-sanitizer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rafaelfranca/rails-html-sanitizer</remote-id>
   </upstream>
diff --git a/dev-ruby/rails-observers/metadata.xml b/dev-ruby/rails-observers/metadata.xml
index 15d7698c35da..d8c5331d066d 100644
--- a/dev-ruby/rails-observers/metadata.xml
+++ b/dev-ruby/rails-observers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails-observers</remote-id>
   </upstream>
diff --git a/dev-ruby/rails/metadata.xml b/dev-ruby/rails/metadata.xml
index c021e57a32b7..1996762af9c8 100644
--- a/dev-ruby/rails/metadata.xml
+++ b/dev-ruby/rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="asset-pipeline">
       Also install the default components for the asset pipeline.
diff --git a/dev-ruby/rails_autolink/metadata.xml b/dev-ruby/rails_autolink/metadata.xml
index db78cfab98e3..af5d991cf2e9 100644
--- a/dev-ruby/rails_autolink/metadata.xml
+++ b/dev-ruby/rails_autolink/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tenderlove/rails_autolink</remote-id>
   </upstream>
diff --git a/dev-ruby/railties/metadata.xml b/dev-ruby/railties/metadata.xml
index 73034e5a17a2..aa5b14dc822c 100644
--- a/dev-ruby/railties/metadata.xml
+++ b/dev-ruby/railties/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/rainbow/metadata.xml b/dev-ruby/rainbow/metadata.xml
index ed3b7ff62afe..524855dc614f 100644
--- a/dev-ruby/rainbow/metadata.xml
+++ b/dev-ruby/rainbow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sickill/rainbow</remote-id>
   </upstream>
diff --git a/dev-ruby/rake-compiler/metadata.xml b/dev-ruby/rake-compiler/metadata.xml
index 861a496b3d04..cf62b349a583 100644
--- a/dev-ruby/rake-compiler/metadata.xml
+++ b/dev-ruby/rake-compiler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">luislavena/rake-compiler</remote-id>
   </upstream>
diff --git a/dev-ruby/rake-remote_task/metadata.xml b/dev-ruby/rake-remote_task/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rake-remote_task/metadata.xml
+++ b/dev-ruby/rake-remote_task/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rake/metadata.xml b/dev-ruby/rake/metadata.xml
index 67d4dd305fae..1b3fcc112712 100644
--- a/dev-ruby/rake/metadata.xml
+++ b/dev-ruby/rake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jimweirich/rake</remote-id>
   </upstream>
diff --git a/dev-ruby/rash/metadata.xml b/dev-ruby/rash/metadata.xml
index 5c41208d7567..7f5e9e3eea88 100644
--- a/dev-ruby/rash/metadata.xml
+++ b/dev-ruby/rash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tcocca/rash</remote-id>
   </upstream>
diff --git a/dev-ruby/rb-gsl/metadata.xml b/dev-ruby/rb-gsl/metadata.xml
index 370cbd7a5111..8a82c903b6bc 100644
--- a/dev-ruby/rb-gsl/metadata.xml
+++ b/dev-ruby/rb-gsl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">david-macmahon/rb-gsl</remote-id>
   </upstream>
diff --git a/dev-ruby/rb-inotify/metadata.xml b/dev-ruby/rb-inotify/metadata.xml
index ec3d5107a1e8..ff98db16f1e2 100644
--- a/dev-ruby/rb-inotify/metadata.xml
+++ b/dev-ruby/rb-inotify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nex3/rb-inotify</remote-id>
   </upstream>
diff --git a/dev-ruby/rb-readline/metadata.xml b/dev-ruby/rb-readline/metadata.xml
index ccb4c8988d6b..76c5284191da 100644
--- a/dev-ruby/rb-readline/metadata.xml
+++ b/dev-ruby/rb-readline/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/rbpdf-font/metadata.xml b/dev-ruby/rbpdf-font/metadata.xml
index 108f2edbea98..bf018b3b8efc 100644
--- a/dev-ruby/rbpdf-font/metadata.xml
+++ b/dev-ruby/rbpdf-font/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">naitoh/rbpdf</remote-id>
   </upstream>
diff --git a/dev-ruby/rbpdf/metadata.xml b/dev-ruby/rbpdf/metadata.xml
index eb4d92014860..8f099cb94e33 100644
--- a/dev-ruby/rbpdf/metadata.xml
+++ b/dev-ruby/rbpdf/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">naitoh/rbpdf</remote-id>
   </upstream>
diff --git a/dev-ruby/rbtree/metadata.xml b/dev-ruby/rbtree/metadata.xml
index 837254783903..d3df77e33886 100644
--- a/dev-ruby/rbtree/metadata.xml
+++ b/dev-ruby/rbtree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription lang="en">
 RBTree is a sorted associative collection that is implemented with Red-Black Tree. The elements of RBTree are ordered and its interface is the almost same as Hash, so simply you can consider RBTree sorted Hash.
 </longdescription>
diff --git a/dev-ruby/rcairo/metadata.xml b/dev-ruby/rcairo/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rcairo/metadata.xml
+++ b/dev-ruby/rcairo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rdiscount/metadata.xml b/dev-ruby/rdiscount/metadata.xml
index fb36b2bf20ee..788439195e7c 100644
--- a/dev-ruby/rdiscount/metadata.xml
+++ b/dev-ruby/rdiscount/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/rdiscount</remote-id>
   </upstream>
diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index cf6c25dd1d95..7902079665f4 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rdoc/rdoc</remote-id>
   </upstream>
diff --git a/dev-ruby/rdtool/metadata.xml b/dev-ruby/rdtool/metadata.xml
index 1a3dd95bd5b3..7b56e5139837 100644
--- a/dev-ruby/rdtool/metadata.xml
+++ b/dev-ruby/rdtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">uwabami/rdtool</remote-id>
   </upstream>
diff --git a/dev-ruby/redcarpet/metadata.xml b/dev-ruby/redcarpet/metadata.xml
index 90efba4f3233..165cd716a9e6 100644
--- a/dev-ruby/redcarpet/metadata.xml
+++ b/dev-ruby/redcarpet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vmg/redcarpet</remote-id>
   </upstream>
diff --git a/dev-ruby/redcloth/metadata.xml b/dev-ruby/redcloth/metadata.xml
index 068994807fdb..115ff51cc817 100644
--- a/dev-ruby/redcloth/metadata.xml
+++ b/dev-ruby/redcloth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jgarber/redcloth</remote-id>
   </upstream>
diff --git a/dev-ruby/redis/metadata.xml b/dev-ruby/redis/metadata.xml
index cca102e42718..ec5c5dcdbf26 100644
--- a/dev-ruby/redis/metadata.xml
+++ b/dev-ruby/redis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">redis/redis-rb</remote-id>
   </upstream>
diff --git a/dev-ruby/regexp_parser/metadata.xml b/dev-ruby/regexp_parser/metadata.xml
index b31afff6e67f..49bf7f18f7a8 100644
--- a/dev-ruby/regexp_parser/metadata.xml
+++ b/dev-ruby/regexp_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ammar/regexp_parser</remote-id>
   </upstream>
diff --git a/dev-ruby/request_store/metadata.xml b/dev-ruby/request_store/metadata.xml
index bd8130ea8a74..f7c1e8ac0c6c 100644
--- a/dev-ruby/request_store/metadata.xml
+++ b/dev-ruby/request_store/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">steveklabnik/request_store</remote-id>
   </upstream>
diff --git a/dev-ruby/rest-client/metadata.xml b/dev-ruby/rest-client/metadata.xml
index 4d4e2f610ec7..1ca8268d9a66 100644
--- a/dev-ruby/rest-client/metadata.xml
+++ b/dev-ruby/rest-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">archiloque/rest-client</remote-id>
   </upstream>
diff --git a/dev-ruby/rev/metadata.xml b/dev-ruby/rev/metadata.xml
index fa20b28480d0..01a18a148932 100644
--- a/dev-ruby/rev/metadata.xml
+++ b/dev-ruby/rev/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">rev</remote-id>
 	</upstream>
diff --git a/dev-ruby/rexical/metadata.xml b/dev-ruby/rexical/metadata.xml
index 0a9449d2de26..d9956160d45b 100644
--- a/dev-ruby/rexical/metadata.xml
+++ b/dev-ruby/rexical/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tenderlove/rexical</remote-id>
   </upstream>
diff --git a/dev-ruby/rgen/metadata.xml b/dev-ruby/rgen/metadata.xml
index 87c905b63d91..f17aaa13e3fd 100644
--- a/dev-ruby/rgen/metadata.xml
+++ b/dev-ruby/rgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mthiede/rgen</remote-id>
   </upstream>
diff --git a/dev-ruby/riel/metadata.xml b/dev-ruby/riel/metadata.xml
index db088b77a51c..dea6d8778f2e 100644
--- a/dev-ruby/riel/metadata.xml
+++ b/dev-ruby/riel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jpace/riel</remote-id>
   </upstream>
diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
index 59dcc28effb0..b52012df41b3 100644
--- a/dev-ruby/right_http_connection/metadata.xml
+++ b/dev-ruby/right_http_connection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rightscale/right_http_connection</remote-id>
   </upstream>
diff --git a/dev-ruby/rinku/metadata.xml b/dev-ruby/rinku/metadata.xml
index c5b801be96ba..8a77d47b2739 100644
--- a/dev-ruby/rinku/metadata.xml
+++ b/dev-ruby/rinku/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vmg/rinku</remote-id>
   </upstream>
diff --git a/dev-ruby/ritex/metadata.xml b/dev-ruby/ritex/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ritex/metadata.xml
+++ b/dev-ruby/ritex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 4c49d39af1c9..5d50d6d3a92f 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/rkelly-remix/metadata.xml b/dev-ruby/rkelly-remix/metadata.xml
index 4d2c785cf3f6..163f9cdd5fe5 100644
--- a/dev-ruby/rkelly-remix/metadata.xml
+++ b/dev-ruby/rkelly-remix/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 55cc31eb0bfc..25000dea67d6 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gemhome/rmagick</remote-id>
   </upstream>
diff --git a/dev-ruby/robots/metadata.xml b/dev-ruby/robots/metadata.xml
index 48e893e533eb..0c40af98f3c5 100644
--- a/dev-ruby/robots/metadata.xml
+++ b/dev-ruby/robots/metadata.xml
@@ -5,7 +5,10 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/rouge/metadata.xml b/dev-ruby/rouge/metadata.xml
index f4ce5d5ee7e3..4c20450c3de1 100644
--- a/dev-ruby/rouge/metadata.xml
+++ b/dev-ruby/rouge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jneen/rouge</remote-id>
   </upstream>
diff --git a/dev-ruby/rqrcode/metadata.xml b/dev-ruby/rqrcode/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rqrcode/metadata.xml
+++ b/dev-ruby/rqrcode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rr/metadata.xml b/dev-ruby/rr/metadata.xml
index 7ae5dac9cf38..d1c255ba705f 100644
--- a/dev-ruby/rr/metadata.xml
+++ b/dev-ruby/rr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rr/rr</remote-id>
   </upstream>
diff --git a/dev-ruby/rrdtool-bindings/metadata.xml b/dev-ruby/rrdtool-bindings/metadata.xml
index 17640aa0cb68..886566b11ace 100644
--- a/dev-ruby/rrdtool-bindings/metadata.xml
+++ b/dev-ruby/rrdtool-bindings/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
-  <herd>netmon</herd>
+  <maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+  </maintainer>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 <use>
 <flag name="graph">Enable support for graphing functions</flag>
 </use>
diff --git a/dev-ruby/rspec-collection_matchers/metadata.xml b/dev-ruby/rspec-collection_matchers/metadata.xml
index 8a2802fc640b..bd68912a5b49 100644
--- a/dev-ruby/rspec-collection_matchers/metadata.xml
+++ b/dev-ruby/rspec-collection_matchers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-collection_matchers</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index c749bc2b2d54..47c5cc68178d 100644
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="highlight">
     Enable source code highlighting via <pkg>dev-ruby/coderay</pkg>
diff --git a/dev-ruby/rspec-expectations/metadata.xml b/dev-ruby/rspec-expectations/metadata.xml
index af071c482187..4fa77469a526 100644
--- a/dev-ruby/rspec-expectations/metadata.xml
+++ b/dev-ruby/rspec-expectations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-expectations</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-its/metadata.xml b/dev-ruby/rspec-its/metadata.xml
index c881469176e0..d1dd73804f5d 100644
--- a/dev-ruby/rspec-its/metadata.xml
+++ b/dev-ruby/rspec-its/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-its</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-mocks/metadata.xml b/dev-ruby/rspec-mocks/metadata.xml
index 86132d101460..eb490a60f988 100644
--- a/dev-ruby/rspec-mocks/metadata.xml
+++ b/dev-ruby/rspec-mocks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-mocks</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-rails/metadata.xml b/dev-ruby/rspec-rails/metadata.xml
index b9c20eabc4da..4f4efa2ae6c7 100644
--- a/dev-ruby/rspec-rails/metadata.xml
+++ b/dev-ruby/rspec-rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-rails</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-retry/metadata.xml b/dev-ruby/rspec-retry/metadata.xml
index 3465d97aef2b..2876a7c019a9 100644
--- a/dev-ruby/rspec-retry/metadata.xml
+++ b/dev-ruby/rspec-retry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">NoRedInk/rspec-retry</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec-support/metadata.xml b/dev-ruby/rspec-support/metadata.xml
index c26f7310ae09..a334be28936e 100644
--- a/dev-ruby/rspec-support/metadata.xml
+++ b/dev-ruby/rspec-support/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec-support</remote-id>
   </upstream>
diff --git a/dev-ruby/rspec/metadata.xml b/dev-ruby/rspec/metadata.xml
index c71df7c3b9db..8e1588efb400 100644
--- a/dev-ruby/rspec/metadata.xml
+++ b/dev-ruby/rspec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rspec/rspec</remote-id>
   </upstream>
diff --git a/dev-ruby/rspectacular/metadata.xml b/dev-ruby/rspectacular/metadata.xml
index f915835062d4..186ca219effa 100644
--- a/dev-ruby/rspectacular/metadata.xml
+++ b/dev-ruby/rspectacular/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thekompanee/rspectacular</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-atk/metadata.xml b/dev-ruby/ruby-atk/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-atk/metadata.xml
+++ b/dev-ruby/ruby-atk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-augeas/metadata.xml b/dev-ruby/ruby-augeas/metadata.xml
index 5551b5a0d8f3..8251b937130f 100644
--- a/dev-ruby/ruby-augeas/metadata.xml
+++ b/dev-ruby/ruby-augeas/metadata.xml
@@ -4,7 +4,10 @@
 <maintainer>
 <email>prometheanfire@gentoo.org</email>
 </maintainer>
-<herd>ruby</herd>
+<maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription lang="en">
 ruby-augeas is a set of Ruby bindings around augeas.
 </longdescription>
diff --git a/dev-ruby/ruby-beautify/metadata.xml b/dev-ruby/ruby-beautify/metadata.xml
index fd7d4ed7bfb4..c5a31723f9fe 100644
--- a/dev-ruby/ruby-beautify/metadata.xml
+++ b/dev-ruby/ruby-beautify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">erniebrodeur/ruby-beautify</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-cairo-gobject/metadata.xml b/dev-ruby/ruby-cairo-gobject/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-cairo-gobject/metadata.xml
+++ b/dev-ruby/ruby-cairo-gobject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ b/dev-ruby/ruby-clutter-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ b/dev-ruby/ruby-clutter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-dict/metadata.xml b/dev-ruby/ruby-dict/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-dict/metadata.xml
+++ b/dev-ruby/ruby-dict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-feedparser/metadata.xml b/dev-ruby/ruby-feedparser/metadata.xml
index 7081df69bfcb..7d15a79c4ea8 100644
--- a/dev-ruby/ruby-feedparser/metadata.xml
+++ b/dev-ruby/ruby-feedparser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">feed2imap/ruby-feedparser</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-filemagic/metadata.xml b/dev-ruby/ruby-filemagic/metadata.xml
index 2dfbc2efe8e7..7306adad7dd2 100644
--- a/dev-ruby/ruby-filemagic/metadata.xml
+++ b/dev-ruby/ruby-filemagic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">blackwinter/ruby-filemagic</remote-id>
 	</upstream>
diff --git a/dev-ruby/ruby-gdk3/metadata.xml b/dev-ruby/ruby-gdk3/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gdk3/metadata.xml
+++ b/dev-ruby/ruby-gdk3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gdkpixbuf2/metadata.xml b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gdkpixbuf2/metadata.xml
+++ b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gettext/metadata.xml b/dev-ruby/ruby-gettext/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-gettext/metadata.xml
+++ b/dev-ruby/ruby-gettext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gio2/metadata.xml b/dev-ruby/ruby-gio2/metadata.xml
index 639c32b834e2..9fc731b81de9 100644
--- a/dev-ruby/ruby-gio2/metadata.xml
+++ b/dev-ruby/ruby-gio2/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
     <remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gnome2/metadata.xml b/dev-ruby/ruby-gnome2/metadata.xml
index 73c58011ad15..a370f196c3ee 100644
--- a/dev-ruby/ruby-gnome2/metadata.xml
+++ b/dev-ruby/ruby-gnome2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 	</upstream>
diff --git a/dev-ruby/ruby-gobject-introspection/metadata.xml b/dev-ruby/ruby-gobject-introspection/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gobject-introspection/metadata.xml
+++ b/dev-ruby/ruby-gobject-introspection/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
index 5af6804b0148..1b7510727b8b 100644
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-gstreamer/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ b/dev-ruby/ruby-gtk2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gtk3/metadata.xml b/dev-ruby/ruby-gtk3/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gtk3/metadata.xml
+++ b/dev-ruby/ruby-gtk3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-hmac/metadata.xml b/dev-ruby/ruby-hmac/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/ruby-hmac/metadata.xml
+++ b/dev-ruby/ruby-hmac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-inifile/metadata.xml b/dev-ruby/ruby-inifile/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-inifile/metadata.xml
+++ b/dev-ruby/ruby-inifile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-ldap/metadata.xml b/dev-ruby/ruby-ldap/metadata.xml
index f289c1f51cb6..4c7453ed7312 100644
--- a/dev-ruby/ruby-ldap/metadata.xml
+++ b/dev-ruby/ruby-ldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ruby-activeldap</remote-id>
 		<remote-id type="sourceforge">ruby-ldap</remote-id>
diff --git a/dev-ruby/ruby-mp3info/metadata.xml b/dev-ruby/ruby-mp3info/metadata.xml
index c9241406f2ed..b50c7a0d32f1 100644
--- a/dev-ruby/ruby-mp3info/metadata.xml
+++ b/dev-ruby/ruby-mp3info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">moumar/ruby-mp3info</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-net-ldap/metadata.xml b/dev-ruby/ruby-net-ldap/metadata.xml
index ea68e18056a2..f8c0f7d345ba 100644
--- a/dev-ruby/ruby-net-ldap/metadata.xml
+++ b/dev-ruby/ruby-net-ldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-ldap/ruby-net-ldap</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index 707e0948292a..25fa39b7f02c 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>troy@lump.net</email>
 		<name>Troy Bowman</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Oracle Interface for Ruby, compatible with oracle 8, 9i, 10g and 11g.</longdescription>
 	<upstream>
 		<remote-id type="rubygems">ruby-oci8</remote-id>
diff --git a/dev-ruby/ruby-odbc/metadata.xml b/dev-ruby/ruby-odbc/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-odbc/metadata.xml
+++ b/dev-ruby/ruby-odbc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-oembed/metadata.xml b/dev-ruby/ruby-oembed/metadata.xml
index 7c23246d9cf4..f2b0f15f4e80 100644
--- a/dev-ruby/ruby-oembed/metadata.xml
+++ b/dev-ruby/ruby-oembed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">judofyr/ruby-oembed</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-ole/metadata.xml b/dev-ruby/ruby-ole/metadata.xml
index 1ae2a1f1cd8e..14e93d26dfc4 100644
--- a/dev-ruby/ruby-ole/metadata.xml
+++ b/dev-ruby/ruby-ole/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">aquasync/ruby-ole</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-opengl/metadata.xml b/dev-ruby/ruby-opengl/metadata.xml
index 5939aded1f8a..d8374c76f39f 100644
--- a/dev-ruby/ruby-opengl/metadata.xml
+++ b/dev-ruby/ruby-opengl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">larskanis/opengl</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-openid/metadata.xml b/dev-ruby/ruby-openid/metadata.xml
index 316cfe27830c..81bbab3938e1 100644
--- a/dev-ruby/ruby-openid/metadata.xml
+++ b/dev-ruby/ruby-openid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">openid/ruby-openid</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-pango/metadata.xml b/dev-ruby/ruby-pango/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-pango/metadata.xml
+++ b/dev-ruby/ruby-pango/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-poppler/metadata.xml b/dev-ruby/ruby-poppler/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-poppler/metadata.xml
+++ b/dev-ruby/ruby-poppler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-prof/metadata.xml b/dev-ruby/ruby-prof/metadata.xml
index 91a53b1bd6dc..fc9f4d1e21ea 100644
--- a/dev-ruby/ruby-prof/metadata.xml
+++ b/dev-ruby/ruby-prof/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-prof/ruby-prof</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-progressbar/metadata.xml b/dev-ruby/ruby-progressbar/metadata.xml
index 954949379d3a..df88dadf7650 100644
--- a/dev-ruby/ruby-progressbar/metadata.xml
+++ b/dev-ruby/ruby-progressbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jfelchner/ruby-progressbar</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-rc4/metadata.xml b/dev-ruby/ruby-rc4/metadata.xml
index a38690d92c11..8f12aba48173 100644
--- a/dev-ruby/ruby-rc4/metadata.xml
+++ b/dev-ruby/ruby-rc4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">caiges/Ruby-RC4</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-romkan/metadata.xml b/dev-ruby/ruby-romkan/metadata.xml
index 321f2e91b33e..945962390fde 100644
--- a/dev-ruby/ruby-romkan/metadata.xml
+++ b/dev-ruby/ruby-romkan/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ b/dev-ruby/ruby-rsvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-sdl/metadata.xml b/dev-ruby/ruby-sdl/metadata.xml
index f7a74de48806..7f78115a9604 100644
--- a/dev-ruby/ruby-sdl/metadata.xml
+++ b/dev-ruby/ruby-sdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
     <flag name="image">Enable <pkg>media-libs/sdl-image</pkg> support</flag>
     <flag name="mixer">Enable <pkg>media-libs/sdl-mixer</pkg> support</flag>
diff --git a/dev-ruby/ruby-shadow/metadata.xml b/dev-ruby/ruby-shadow/metadata.xml
index 3a4ce18b860a..07057ad1102e 100644
--- a/dev-ruby/ruby-shadow/metadata.xml
+++ b/dev-ruby/ruby-shadow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">apalmblad/ruby-shadow</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-shout/metadata.xml b/dev-ruby/ruby-shout/metadata.xml
index 33b8e90efea1..e9b462e1c127 100644
--- a/dev-ruby/ruby-shout/metadata.xml
+++ b/dev-ruby/ruby-shout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">niko/ruby-shout</remote-id>
 	</upstream>
diff --git a/dev-ruby/ruby-tcpwrap/metadata.xml b/dev-ruby/ruby-tcpwrap/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-tcpwrap/metadata.xml
+++ b/dev-ruby/ruby-tcpwrap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-termios/metadata.xml b/dev-ruby/ruby-termios/metadata.xml
index b0019a7158d0..8b3e29390222 100644
--- a/dev-ruby/ruby-termios/metadata.xml
+++ b/dev-ruby/ruby-termios/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">arika/ruby-termios</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-vte/metadata.xml
+++ b/dev-ruby/ruby-vte/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ b/dev-ruby/ruby-vte3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-webkit-gtk/metadata.xml b/dev-ruby/ruby-webkit-gtk/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-webkit-gtk/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-webkit-gtk2/metadata.xml b/dev-ruby/ruby-webkit-gtk2/metadata.xml
index a69152a618d5..d28f7a0fb7e3 100644
--- a/dev-ruby/ruby-webkit-gtk2/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
 		<remote-id type="sourceforge">ruby-gnome2</remote-id>
diff --git a/dev-ruby/ruby-xslt/metadata.xml b/dev-ruby/ruby-xslt/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/ruby-xslt/metadata.xml
+++ b/dev-ruby/ruby-xslt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-yadis/metadata.xml b/dev-ruby/ruby-yadis/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/ruby-yadis/metadata.xml
+++ b/dev-ruby/ruby-yadis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ruby2ruby/metadata.xml b/dev-ruby/ruby2ruby/metadata.xml
index 770eb616ff9b..052c59589782 100644
--- a/dev-ruby/ruby2ruby/metadata.xml
+++ b/dev-ruby/ruby2ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seattlerb/ruby2ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby_gntp/metadata.xml b/dev-ruby/ruby_gntp/metadata.xml
index 1af421508a17..01207e019ea4 100644
--- a/dev-ruby/ruby_gntp/metadata.xml
+++ b/dev-ruby/ruby_gntp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">snaka/ruby_gntp</remote-id>
   </upstream>
diff --git a/dev-ruby/ruby_parser/metadata.xml b/dev-ruby/ruby_parser/metadata.xml
index a4b2ce2dd342..98fa31cc7601 100644
--- a/dev-ruby/ruby_parser/metadata.xml
+++ b/dev-ruby/ruby_parser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seattlerb/ruby_parser</remote-id>
   </upstream>
diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index 32afaf25eb59..9f1b19fa604a 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<use>
 		<flag name="server">Install support for the rubygems server</flag>
 	</use>
diff --git a/dev-ruby/rubypants/metadata.xml b/dev-ruby/rubypants/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rubypants/metadata.xml
+++ b/dev-ruby/rubypants/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rubytest-cli/metadata.xml b/dev-ruby/rubytest-cli/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rubytest-cli/metadata.xml
+++ b/dev-ruby/rubytest-cli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rubytest/metadata.xml b/dev-ruby/rubytest/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/rubytest/metadata.xml
+++ b/dev-ruby/rubytest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rubytter/metadata.xml b/dev-ruby/rubytter/metadata.xml
index 61f90007fbc3..dd4264100f3e 100644
--- a/dev-ruby/rubytter/metadata.xml
+++ b/dev-ruby/rubytter/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
-<maintainer>
+  <maintainer>
   <email>naota@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>ruby@gentoo.org</email>
+  <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/rubyzip/metadata.xml b/dev-ruby/rubyzip/metadata.xml
index 07203c4fad72..ded51e35c908 100644
--- a/dev-ruby/rubyzip/metadata.xml
+++ b/dev-ruby/rubyzip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rubyzip/rubyzip</remote-id>
   </upstream>
diff --git a/dev-ruby/safe_yaml/metadata.xml b/dev-ruby/safe_yaml/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/safe_yaml/metadata.xml
+++ b/dev-ruby/safe_yaml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/samuel/metadata.xml b/dev-ruby/samuel/metadata.xml
index c529cf364d67..eb7720aacd31 100644
--- a/dev-ruby/samuel/metadata.xml
+++ b/dev-ruby/samuel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">chrisk/samuel</remote-id>
   </upstream>
diff --git a/dev-ruby/sanitize/metadata.xml b/dev-ruby/sanitize/metadata.xml
index 5f97c0117141..735278244042 100644
--- a/dev-ruby/sanitize/metadata.xml
+++ b/dev-ruby/sanitize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rgrove/sanitize</remote-id>
   </upstream>
diff --git a/dev-ruby/sass-rails/metadata.xml b/dev-ruby/sass-rails/metadata.xml
index d43494725bb3..1e471c96364e 100644
--- a/dev-ruby/sass-rails/metadata.xml
+++ b/dev-ruby/sass-rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/sass-rails</remote-id>
   </upstream>
diff --git a/dev-ruby/sass/metadata.xml b/dev-ruby/sass/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/sass/metadata.xml
+++ b/dev-ruby/sass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/sdoc/metadata.xml b/dev-ruby/sdoc/metadata.xml
index 3ad35ad88973..3389312dba77 100644
--- a/dev-ruby/sdoc/metadata.xml
+++ b/dev-ruby/sdoc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-ruby/seed-fu/metadata.xml b/dev-ruby/seed-fu/metadata.xml
index a909fd9148f7..2bf471a65af3 100644
--- a/dev-ruby/seed-fu/metadata.xml
+++ b/dev-ruby/seed-fu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mbleigh/seed-fu</remote-id>
   </upstream>
diff --git a/dev-ruby/selenium-webdriver/metadata.xml b/dev-ruby/selenium-webdriver/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/selenium-webdriver/metadata.xml
+++ b/dev-ruby/selenium-webdriver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/semantic_puppet/metadata.xml b/dev-ruby/semantic_puppet/metadata.xml
index f013ed1dd53e..18d0fe6044de 100644
--- a/dev-ruby/semantic_puppet/metadata.xml
+++ b/dev-ruby/semantic_puppet/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Library of useful tools for working with Semantic Versions and module dependencies.
 	</longdescription>
diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/session/metadata.xml b/dev-ruby/session/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/session/metadata.xml
+++ b/dev-ruby/session/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/settingslogic/metadata.xml b/dev-ruby/settingslogic/metadata.xml
index 765e4b75bde2..c9ce7b01d631 100644
--- a/dev-ruby/settingslogic/metadata.xml
+++ b/dev-ruby/settingslogic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">binarylogic/settingslogic</remote-id>
   </upstream>
diff --git a/dev-ruby/sexp_processor/metadata.xml b/dev-ruby/sexp_processor/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/sexp_processor/metadata.xml
+++ b/dev-ruby/sexp_processor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/sfl/metadata.xml b/dev-ruby/sfl/metadata.xml
index 69328d6c8f1a..1520d2827a14 100644
--- a/dev-ruby/sfl/metadata.xml
+++ b/dev-ruby/sfl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ujihisa/spawn-for-legacy</remote-id>
   </upstream>
diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/shorturl/metadata.xml
+++ b/dev-ruby/shorturl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/shotgun/metadata.xml b/dev-ruby/shotgun/metadata.xml
index 99c5701378f9..5b7478864bc6 100644
--- a/dev-ruby/shotgun/metadata.xml
+++ b/dev-ruby/shotgun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/shotgun</remote-id>
   </upstream>
diff --git a/dev-ruby/shoulda-context/metadata.xml b/dev-ruby/shoulda-context/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/shoulda-context/metadata.xml
+++ b/dev-ruby/shoulda-context/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/shoulda-matchers/metadata.xml b/dev-ruby/shoulda-matchers/metadata.xml
index abbfc8db3691..4699b76e86b8 100644
--- a/dev-ruby/shoulda-matchers/metadata.xml
+++ b/dev-ruby/shoulda-matchers/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thoughtbot/shoulda-matchers</remote-id>
   </upstream>
diff --git a/dev-ruby/shoulda/metadata.xml b/dev-ruby/shoulda/metadata.xml
index 4cba2872be95..5ddd6b3c36db 100644
--- a/dev-ruby/shoulda/metadata.xml
+++ b/dev-ruby/shoulda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">thoughtbot/shoulda</remote-id>
   </upstream>
diff --git a/dev-ruby/sigar/metadata.xml b/dev-ruby/sigar/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/sigar/metadata.xml
+++ b/dev-ruby/sigar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/simple_oauth/metadata.xml b/dev-ruby/simple_oauth/metadata.xml
index cf155400cba9..2e47e7b2218b 100644
--- a/dev-ruby/simple_oauth/metadata.xml
+++ b/dev-ruby/simple_oauth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">laserlemon/simple_oauth</remote-id>
   </upstream>
diff --git a/dev-ruby/simplecov-html/metadata.xml b/dev-ruby/simplecov-html/metadata.xml
index 05cdc6836d96..e7d57e6c13e2 100644
--- a/dev-ruby/simplecov-html/metadata.xml
+++ b/dev-ruby/simplecov-html/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">colszowka/simplecov</remote-id>
   </upstream>
diff --git a/dev-ruby/simplecov/metadata.xml b/dev-ruby/simplecov/metadata.xml
index 05cdc6836d96..e7d57e6c13e2 100644
--- a/dev-ruby/simplecov/metadata.xml
+++ b/dev-ruby/simplecov/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">colszowka/simplecov</remote-id>
   </upstream>
diff --git a/dev-ruby/sinatra/metadata.xml b/dev-ruby/sinatra/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/sinatra/metadata.xml
+++ b/dev-ruby/sinatra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/six/metadata.xml b/dev-ruby/six/metadata.xml
index 2979cc714c0f..52a47924ffdc 100644
--- a/dev-ruby/six/metadata.xml
+++ b/dev-ruby/six/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">randx/six</remote-id>
   </upstream>
diff --git a/dev-ruby/slim/metadata.xml b/dev-ruby/slim/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/slim/metadata.xml
+++ b/dev-ruby/slim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/slop/metadata.xml b/dev-ruby/slop/metadata.xml
index 72670901038b..6d4d49785be4 100644
--- a/dev-ruby/slop/metadata.xml
+++ b/dev-ruby/slop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">injekt/slop</remote-id>
   </upstream>
diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/snmplib/metadata.xml
+++ b/dev-ruby/snmplib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/source_map/metadata.xml b/dev-ruby/source_map/metadata.xml
index a2efc894d57c..98e9b258c5d8 100644
--- a/dev-ruby/source_map/metadata.xml
+++ b/dev-ruby/source_map/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ConradIrwin/ruby-source_map</remote-id>
   </upstream>
diff --git a/dev-ruby/sparklines/metadata.xml b/dev-ruby/sparklines/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/sparklines/metadata.xml
+++ b/dev-ruby/sparklines/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/spork/metadata.xml b/dev-ruby/spork/metadata.xml
index 981971e98538..db5dde6d551b 100644
--- a/dev-ruby/spork/metadata.xml
+++ b/dev-ruby/spork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sporkrb/spork</remote-id>
   </upstream>
diff --git a/dev-ruby/spreadsheet/metadata.xml b/dev-ruby/spreadsheet/metadata.xml
index 142e8c479abe..1451c34f8d3a 100644
--- a/dev-ruby/spreadsheet/metadata.xml
+++ b/dev-ruby/spreadsheet/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="rubygems">spreadsheet</remote-id>
   </upstream>
diff --git a/dev-ruby/spring/metadata.xml b/dev-ruby/spring/metadata.xml
index 8ee483c2b0f9..07192ae4a448 100644
--- a/dev-ruby/spring/metadata.xml
+++ b/dev-ruby/spring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/spring</remote-id>
   </upstream>
diff --git a/dev-ruby/sprockets-rails/metadata.xml b/dev-ruby/sprockets-rails/metadata.xml
index 15e6a76a7e65..11ac2206f24e 100644
--- a/dev-ruby/sprockets-rails/metadata.xml
+++ b/dev-ruby/sprockets-rails/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/sprockets-rails</remote-id>
   </upstream>
diff --git a/dev-ruby/sprockets/metadata.xml b/dev-ruby/sprockets/metadata.xml
index 69ca640045b6..fe9299c1c3b6 100644
--- a/dev-ruby/sprockets/metadata.xml
+++ b/dev-ruby/sprockets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/sprockets</remote-id>
   </upstream>
diff --git a/dev-ruby/spy/metadata.xml b/dev-ruby/spy/metadata.xml
index 15604164416e..c9c6381ae341 100644
--- a/dev-ruby/spy/metadata.xml
+++ b/dev-ruby/spy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ryanong/spy</remote-id>
   </upstream>
diff --git a/dev-ruby/sqlite3/metadata.xml b/dev-ruby/sqlite3/metadata.xml
index 144e8d4583f0..3145135195f8 100644
--- a/dev-ruby/sqlite3/metadata.xml
+++ b/dev-ruby/sqlite3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sparklemotion/sqlite3-ruby</remote-id>
 	</upstream>
diff --git a/dev-ruby/sshkit/metadata.xml b/dev-ruby/sshkit/metadata.xml
index ee090b513661..abccc6b20c23 100644
--- a/dev-ruby/sshkit/metadata.xml
+++ b/dev-ruby/sshkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">capistrano/sshkit</remote-id>
   </upstream>
diff --git a/dev-ruby/stamp/metadata.xml b/dev-ruby/stamp/metadata.xml
index 643300f6cc6d..1f7138073d7e 100644
--- a/dev-ruby/stamp/metadata.xml
+++ b/dev-ruby/stamp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jeremyw/stamp</remote-id>
   </upstream>
diff --git a/dev-ruby/state_machine/metadata.xml b/dev-ruby/state_machine/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/state_machine/metadata.xml
+++ b/dev-ruby/state_machine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/stomp/metadata.xml b/dev-ruby/stomp/metadata.xml
index 2763c698229c..346a4e7a9868 100644
--- a/dev-ruby/stomp/metadata.xml
+++ b/dev-ruby/stomp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">stompgem/stomp</remote-id>
   </upstream>
diff --git a/dev-ruby/stringex/metadata.xml b/dev-ruby/stringex/metadata.xml
index 83a4eee626dc..fdd0e77bf1a7 100644
--- a/dev-ruby/stringex/metadata.xml
+++ b/dev-ruby/stringex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rsl/stringex</remote-id>
   </upstream>
diff --git a/dev-ruby/subexec/metadata.xml b/dev-ruby/subexec/metadata.xml
index 4554c42496a7..48cc75ded485 100644
--- a/dev-ruby/subexec/metadata.xml
+++ b/dev-ruby/subexec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nulayer/subexec</remote-id>
   </upstream>
diff --git a/dev-ruby/syntax/metadata.xml b/dev-ruby/syntax/metadata.xml
index fc8cde902459..139d7b3fac12 100644
--- a/dev-ruby/syntax/metadata.xml
+++ b/dev-ruby/syntax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dblock/syntax</remote-id>
   </upstream>
diff --git a/dev-ruby/syslogger/metadata.xml b/dev-ruby/syslogger/metadata.xml
index 4f71e545dd98..237681b5308f 100644
--- a/dev-ruby/syslogger/metadata.xml
+++ b/dev-ruby/syslogger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">crohr/syslogger</remote-id>
   </upstream>
diff --git a/dev-ruby/systemu/metadata.xml b/dev-ruby/systemu/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/systemu/metadata.xml
+++ b/dev-ruby/systemu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/tdiff/metadata.xml b/dev-ruby/tdiff/metadata.xml
index 9ea5912bd94d..0d6b8db96d0c 100644
--- a/dev-ruby/tdiff/metadata.xml
+++ b/dev-ruby/tdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">postmodern/tdiff</remote-id>
   </upstream>
diff --git a/dev-ruby/temple/metadata.xml b/dev-ruby/temple/metadata.xml
index c57536b87990..ed3de2ac8562 100644
--- a/dev-ruby/temple/metadata.xml
+++ b/dev-ruby/temple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">judofyr/temple</remote-id>
   </upstream>
diff --git a/dev-ruby/term-ansicolor/metadata.xml b/dev-ruby/term-ansicolor/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/term-ansicolor/metadata.xml
+++ b/dev-ruby/term-ansicolor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/termcolor/metadata.xml b/dev-ruby/termcolor/metadata.xml
index 95391f6eb9bd..190eca1de83a 100644
--- a/dev-ruby/termcolor/metadata.xml
+++ b/dev-ruby/termcolor/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index 8b31a5154d4a..4a70cf385aa9 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription lang="en">
     Improved version of the Test::Unit framework as shipped by Ruby
     1.8, compatible with Ruby 1.9.
diff --git a/dev-ruby/test_construct/metadata.xml b/dev-ruby/test_construct/metadata.xml
index 280cf9b37e8c..cd63c65d1475 100644
--- a/dev-ruby/test_construct/metadata.xml
+++ b/dev-ruby/test_construct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bhb/test_construct</remote-id>
   </upstream>
diff --git a/dev-ruby/test_declarative/metadata.xml b/dev-ruby/test_declarative/metadata.xml
index 67f8403c5af2..91a5aca1c381 100644
--- a/dev-ruby/test_declarative/metadata.xml
+++ b/dev-ruby/test_declarative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">svenfuchs/test_declarative</remote-id>
   </upstream>
diff --git a/dev-ruby/text-hyphen/metadata.xml b/dev-ruby/text-hyphen/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/text-hyphen/metadata.xml
+++ b/dev-ruby/text-hyphen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/text/metadata.xml b/dev-ruby/text/metadata.xml
index d492d6eb5e9b..59d97fc4af31 100644
--- a/dev-ruby/text/metadata.xml
+++ b/dev-ruby/text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">threedaymonk/text</remote-id>
   </upstream>
diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
index 61358cbe7797..a16e89f22528 100644
--- a/dev-ruby/textpow/metadata.xml
+++ b/dev-ruby/textpow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">grosser/textpow</remote-id>
   </upstream>
diff --git a/dev-ruby/thor/metadata.xml b/dev-ruby/thor/metadata.xml
index 24d60c8be42e..a5ea314f0203 100644
--- a/dev-ruby/thor/metadata.xml
+++ b/dev-ruby/thor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription>
 		Thor is a simple and efficient tool for building self-documenting
 		command line utilities. It removes the pain of parsing command line
diff --git a/dev-ruby/thread_order/metadata.xml b/dev-ruby/thread_order/metadata.xml
index 9bf8916555f0..929d88089002 100644
--- a/dev-ruby/thread_order/metadata.xml
+++ b/dev-ruby/thread_order/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">JoshCheek/thread_order</remote-id>
   </upstream>
diff --git a/dev-ruby/thread_safe/metadata.xml b/dev-ruby/thread_safe/metadata.xml
index b37175b345f9..8c7087df11ee 100644
--- a/dev-ruby/thread_safe/metadata.xml
+++ b/dev-ruby/thread_safe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ruby-concurrency/thread_safe</remote-id>
   </upstream>
diff --git a/dev-ruby/tidy-ext/metadata.xml b/dev-ruby/tidy-ext/metadata.xml
index 5adefb6e43ed..05d110bbb894 100644
--- a/dev-ruby/tidy-ext/metadata.xml
+++ b/dev-ruby/tidy-ext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">carld/tidy</remote-id>
   </upstream>
diff --git a/dev-ruby/tidy_table/metadata.xml b/dev-ruby/tidy_table/metadata.xml
index 31d786a9879f..4c09b77973e9 100644
--- a/dev-ruby/tidy_table/metadata.xml
+++ b/dev-ruby/tidy_table/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">topfunky/tidy_table</remote-id>
   </upstream>
diff --git a/dev-ruby/tilt/metadata.xml b/dev-ruby/tilt/metadata.xml
index 012880f55b90..03c8cfffd989 100644
--- a/dev-ruby/tilt/metadata.xml
+++ b/dev-ruby/tilt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rtomayko/tilt</remote-id>
   </upstream>
diff --git a/dev-ruby/timecop/metadata.xml b/dev-ruby/timecop/metadata.xml
index b024441bd572..0a991e285a9a 100644
--- a/dev-ruby/timecop/metadata.xml
+++ b/dev-ruby/timecop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jtrupiano/timecop</remote-id>
   </upstream>
diff --git a/dev-ruby/timers/metadata.xml b/dev-ruby/timers/metadata.xml
index c59b87b6f503..7a1987ce0df3 100644
--- a/dev-ruby/timers/metadata.xml
+++ b/dev-ruby/timers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tarcieri/timers</remote-id>
   </upstream>
diff --git a/dev-ruby/tins/metadata.xml b/dev-ruby/tins/metadata.xml
index 2d2f6bd003d9..4bb06133554e 100644
--- a/dev-ruby/tins/metadata.xml
+++ b/dev-ruby/tins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">flori/tins</remote-id>
   </upstream>
diff --git a/dev-ruby/tokyocabinet/metadata.xml b/dev-ruby/tokyocabinet/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/tokyocabinet/metadata.xml
+++ b/dev-ruby/tokyocabinet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/toml/metadata.xml b/dev-ruby/toml/metadata.xml
index aff94767049d..d2077a2616c5 100644
--- a/dev-ruby/toml/metadata.xml
+++ b/dev-ruby/toml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jm/toml</remote-id>
   </upstream>
diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml
index 88ccded3a69a..aa6b10a92a0d 100644
--- a/dev-ruby/totoridipjp/metadata.xml
+++ b/dev-ruby/totoridipjp/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">delayer-deferred</remote-id>
 	</upstream>
diff --git a/dev-ruby/transaction-simple/metadata.xml b/dev-ruby/transaction-simple/metadata.xml
index 37fc4905b00c..704079d19c84 100644
--- a/dev-ruby/transaction-simple/metadata.xml
+++ b/dev-ruby/transaction-simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">halostatue/transaction-simple</remote-id>
   </upstream>
diff --git a/dev-ruby/treetop/metadata.xml b/dev-ruby/treetop/metadata.xml
index b0254be8e627..e018da48513c 100644
--- a/dev-ruby/treetop/metadata.xml
+++ b/dev-ruby/treetop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cjheath/treetop</remote-id>
   </upstream>
diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/trollop/metadata.xml
+++ b/dev-ruby/trollop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/ttfunk/metadata.xml b/dev-ruby/ttfunk/metadata.xml
index ad58d17e7355..700d8d70ab42 100644
--- a/dev-ruby/ttfunk/metadata.xml
+++ b/dev-ruby/ttfunk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">prawnpdf/ttfunk</remote-id>
   </upstream>
diff --git a/dev-ruby/turbolinks/metadata.xml b/dev-ruby/turbolinks/metadata.xml
index 1502f4fb2038..613677ab94ba 100644
--- a/dev-ruby/turbolinks/metadata.xml
+++ b/dev-ruby/turbolinks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/turbolinks</remote-id>
   </upstream>
diff --git a/dev-ruby/twitter-text/metadata.xml b/dev-ruby/twitter-text/metadata.xml
index c753feff6dd9..c68bb673d5ad 100644
--- a/dev-ruby/twitter-text/metadata.xml
+++ b/dev-ruby/twitter-text/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">twitter/twitter-text</remote-id>
   </upstream>
diff --git a/dev-ruby/twitter/metadata.xml b/dev-ruby/twitter/metadata.xml
index e48ef066023b..d52375f45d5a 100644
--- a/dev-ruby/twitter/metadata.xml
+++ b/dev-ruby/twitter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sferik/twitter</remote-id>
   </upstream>
diff --git a/dev-ruby/typed-array/metadata.xml b/dev-ruby/typed-array/metadata.xml
index 3280812d1f39..bace558fd9bf 100644
--- a/dev-ruby/typed-array/metadata.xml
+++ b/dev-ruby/typed-array/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">yaauie/typed-array</remote-id>
   </upstream>
diff --git a/dev-ruby/typhoeus/metadata.xml b/dev-ruby/typhoeus/metadata.xml
index 0c5734b91565..7a9f6c4eeec2 100644
--- a/dev-ruby/typhoeus/metadata.xml
+++ b/dev-ruby/typhoeus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">typhoeus</remote-id>
 	</upstream>
diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index 0040b1162894..1837b059cadc 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/uconv/metadata.xml b/dev-ruby/uconv/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/uconv/metadata.xml
+++ b/dev-ruby/uconv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/uglifier/metadata.xml b/dev-ruby/uglifier/metadata.xml
index 81486a414754..130d074fae5d 100644
--- a/dev-ruby/uglifier/metadata.xml
+++ b/dev-ruby/uglifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lautis/uglifier</remote-id>
   </upstream>
diff --git a/dev-ruby/ultraviolet/metadata.xml b/dev-ruby/ultraviolet/metadata.xml
index 9df5baf5e6e0..20c04210cd44 100644
--- a/dev-ruby/ultraviolet/metadata.xml
+++ b/dev-ruby/ultraviolet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">grosser/ultraviolet</remote-id>
   </upstream>
diff --git a/dev-ruby/unf/metadata.xml b/dev-ruby/unf/metadata.xml
index ca0926c3ba0d..6a5bddf1c34b 100644
--- a/dev-ruby/unf/metadata.xml
+++ b/dev-ruby/unf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">knu/ruby-unf</remote-id>
   </upstream>
diff --git a/dev-ruby/unf_ext/metadata.xml b/dev-ruby/unf_ext/metadata.xml
index 114ddee8ede3..cc09ab9d0541 100644
--- a/dev-ruby/unf_ext/metadata.xml
+++ b/dev-ruby/unf_ext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">unf</remote-id>
 	</upstream>
diff --git a/dev-ruby/unindent/metadata.xml b/dev-ruby/unindent/metadata.xml
index 5502a21c145c..8017c5de78bf 100644
--- a/dev-ruby/unindent/metadata.xml
+++ b/dev-ruby/unindent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mynyml/unindent</remote-id>
   </upstream>
diff --git a/dev-ruby/uuidtools/metadata.xml b/dev-ruby/uuidtools/metadata.xml
index 04a0d7c3a5bb..e1f7662ff7a9 100644
--- a/dev-ruby/uuidtools/metadata.xml
+++ b/dev-ruby/uuidtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <longdescription lang="en">Simple Ruby library for the generation of UUID, based on constant,
     time-based or random data. It conforms to RFC 4122 whenever
     possible.</longdescription>
diff --git a/dev-ruby/vcard/metadata.xml b/dev-ruby/vcard/metadata.xml
index b0f4a773eaf8..74fea4e59abe 100644
--- a/dev-ruby/vcard/metadata.xml
+++ b/dev-ruby/vcard/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">qoobaa/vcard</remote-id>
   </upstream>
diff --git a/dev-ruby/vcr/metadata.xml b/dev-ruby/vcr/metadata.xml
index 7a07c25b066b..409ec722f236 100644
--- a/dev-ruby/vcr/metadata.xml
+++ b/dev-ruby/vcr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">myronmarston/vcr</remote-id>
   </upstream>
diff --git a/dev-ruby/vlad/metadata.xml b/dev-ruby/vlad/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/vlad/metadata.xml
+++ b/dev-ruby/vlad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/warden/metadata.xml b/dev-ruby/warden/metadata.xml
index 9ae6416801c5..9cda0f64707d 100644
--- a/dev-ruby/warden/metadata.xml
+++ b/dev-ruby/warden/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hassox/warden</remote-id>
   </upstream>
diff --git a/dev-ruby/watch/metadata.xml b/dev-ruby/watch/metadata.xml
index 91c2b39687b4..3f3988466d0e 100644
--- a/dev-ruby/watch/metadata.xml
+++ b/dev-ruby/watch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">benschwarz/watch</remote-id>
   </upstream>
diff --git a/dev-ruby/weakling/metadata.xml b/dev-ruby/weakling/metadata.xml
index ff7d8161fe0b..f491012d152d 100644
--- a/dev-ruby/weakling/metadata.xml
+++ b/dev-ruby/weakling/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">headius/weakling</remote-id>
   </upstream>
diff --git a/dev-ruby/web-console/metadata.xml b/dev-ruby/web-console/metadata.xml
index 3e3a9136e079..c09589dd7857 100644
--- a/dev-ruby/web-console/metadata.xml
+++ b/dev-ruby/web-console/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rails/web-console</remote-id>
   </upstream>
diff --git a/dev-ruby/webmock/metadata.xml b/dev-ruby/webmock/metadata.xml
index 348d2903a674..f6af8d69dd7f 100644
--- a/dev-ruby/webmock/metadata.xml
+++ b/dev-ruby/webmock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bblimke/webmock</remote-id>
   </upstream>
diff --git a/dev-ruby/webrobots/metadata.xml b/dev-ruby/webrobots/metadata.xml
index 2866557fd19d..c15d260d0d54 100644
--- a/dev-ruby/webrobots/metadata.xml
+++ b/dev-ruby/webrobots/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">webrobots</remote-id>
 	</upstream>
diff --git a/dev-ruby/websocket-driver/metadata.xml b/dev-ruby/websocket-driver/metadata.xml
index 71706974ac70..a826d0279894 100644
--- a/dev-ruby/websocket-driver/metadata.xml
+++ b/dev-ruby/websocket-driver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">faye/websocket-driver-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/websocket-extensions/metadata.xml b/dev-ruby/websocket-extensions/metadata.xml
index 365ea9bc51f5..9a6461c7580a 100644
--- a/dev-ruby/websocket-extensions/metadata.xml
+++ b/dev-ruby/websocket-extensions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">faye/websocket-extensions-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/wikicloth/metadata.xml b/dev-ruby/wikicloth/metadata.xml
index 1fb25f424faf..3ae78b64c353 100644
--- a/dev-ruby/wikicloth/metadata.xml
+++ b/dev-ruby/wikicloth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">nricciar/wikicloth</remote-id>
   </upstream>
diff --git a/dev-ruby/will_paginate/metadata.xml b/dev-ruby/will_paginate/metadata.xml
index 3d990dbc5ea8..fc040a201a0d 100644
--- a/dev-ruby/will_paginate/metadata.xml
+++ b/dev-ruby/will_paginate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mislav/will_paginate</remote-id>
   </upstream>
diff --git a/dev-ruby/wirble/metadata.xml b/dev-ruby/wirble/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/dev-ruby/wirble/metadata.xml
+++ b/dev-ruby/wirble/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/xml-simple/metadata.xml b/dev-ruby/xml-simple/metadata.xml
index e70310e01984..2fc5110ce459 100644
--- a/dev-ruby/xml-simple/metadata.xml
+++ b/dev-ruby/xml-simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">maik/xml-simple</remote-id>
   </upstream>
diff --git a/dev-ruby/xpath/metadata.xml b/dev-ruby/xpath/metadata.xml
index 40ba762ee70e..a213ebefd95c 100644
--- a/dev-ruby/xpath/metadata.xml
+++ b/dev-ruby/xpath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jnicklas/xpath</remote-id>
   </upstream>
diff --git a/dev-ruby/yajl-ruby/metadata.xml b/dev-ruby/yajl-ruby/metadata.xml
index d3eff4829d42..510cfc11f1ee 100644
--- a/dev-ruby/yajl-ruby/metadata.xml
+++ b/dev-ruby/yajl-ruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brianmario/yajl-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/yard/metadata.xml b/dev-ruby/yard/metadata.xml
index 0212c7b141ef..e1ecd856d72b 100644
--- a/dev-ruby/yard/metadata.xml
+++ b/dev-ruby/yard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lsegal/yard</remote-id>
   </upstream>
diff --git a/dev-ruby/zentest/metadata.xml b/dev-ruby/zentest/metadata.xml
index 1f10a6bb3dfa..bc111aa50587 100644
--- a/dev-ruby/zentest/metadata.xml
+++ b/dev-ruby/zentest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">seattlerb/zentest</remote-id>
 	</upstream>
diff --git a/dev-scheme/bigloo/metadata.xml b/dev-scheme/bigloo/metadata.xml
index a1ecd8724a23..ab5a7472369b 100644
--- a/dev-scheme/bigloo/metadata.xml
+++ b/dev-scheme/bigloo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>scheme</herd>
+  <maintainer>
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
   <longdescription>
     Bigloo is a Scheme implementation devoted to one goal: enabling Scheme
     based programming style where C(++) is usually required. Bigloo attempts
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index 7f6452901120..d80bd1fcc254 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>ewfalor@gmail.com</email>
 	<name>Erik Falor</name>
@@ -11,6 +9,14 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
 portable, efficient C, supports almost all of the current Scheme language
diff --git a/dev-scheme/elk/metadata.xml b/dev-scheme/elk/metadata.xml
index e0b1703b04fa..3abadcc15034 100644
--- a/dev-scheme/elk/metadata.xml
+++ b/dev-scheme/elk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Elk is an implementation of the Scheme programming language. In contrast to existing, stand-alone Scheme systems Elk has been designed specifically as an embeddable, reusable extension language subsystem for applications written in C or C++. 
 	</longdescription>
diff --git a/dev-scheme/gambit/metadata.xml b/dev-scheme/gambit/metadata.xml
index 6dc936ce2d1c..c60f4643b1b1 100644
--- a/dev-scheme/gambit/metadata.xml
+++ b/dev-scheme/gambit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/gauche/metadata.xml b/dev-scheme/gauche/metadata.xml
index 11619e379dbd..880ecb82145e 100644
--- a/dev-scheme/gauche/metadata.xml
+++ b/dev-scheme/gauche/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hattya@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription>
     Gauche is an R5RS Scheme implementation developed to be a handy script
     interpreter, which allows programmers and system administrators to write
diff --git a/dev-scheme/goosh/metadata.xml b/dev-scheme/goosh/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/dev-scheme/goosh/metadata.xml
+++ b/dev-scheme/goosh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/greg/metadata.xml b/dev-scheme/greg/metadata.xml
index 4bf6dbc6b1ea..bd11e068faaf 100644
--- a/dev-scheme/greg/metadata.xml
+++ b/dev-scheme/greg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>sci@gentoo.org</email>
   </maintainer>
diff --git a/dev-scheme/guile-cairo/metadata.xml b/dev-scheme/guile-cairo/metadata.xml
index e1fc076bd1ce..89ddd00bf0a2 100644
--- a/dev-scheme/guile-cairo/metadata.xml
+++ b/dev-scheme/guile-cairo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Guile-Cairo is complete, wrapping almost all of the Cairo API. It is API stable, providing a firm base on which to do graphics work. Finally, and importantly, it is pleasant to use. You get a powerful and well-maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.
 	</longdescription>
diff --git a/dev-scheme/guile-gnome-platform/metadata.xml b/dev-scheme/guile-gnome-platform/metadata.xml
index b21c5fc8dc80..cc1317ef1cb6 100644
--- a/dev-scheme/guile-gnome-platform/metadata.xml
+++ b/dev-scheme/guile-gnome-platform/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile-gui/metadata.xml b/dev-scheme/guile-gui/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/dev-scheme/guile-gui/metadata.xml
+++ b/dev-scheme/guile-gui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
index 36006ff275ea..c924ef6c0ef3 100644
--- a/dev-scheme/guile-lib/metadata.xml
+++ b/dev-scheme/guile-lib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile-www/metadata.xml b/dev-scheme/guile-www/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/dev-scheme/guile-www/metadata.xml
+++ b/dev-scheme/guile-www/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
index 05ad57a9512e..a0d1fe2aab42 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
 	</longdescription>
diff --git a/dev-scheme/hop/metadata.xml b/dev-scheme/hop/metadata.xml
index a424df30ec6f..30f603adc5ad 100644
--- a/dev-scheme/hop/metadata.xml
+++ b/dev-scheme/hop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 HOP is a new programming language designed for the Web 2.0. It is a higher-order language for programming interactive web applications such as web agendas, web galleries, music players, etc. HOP can be viewed as a replacement for traditional graphical toolkits. HOP is implemented as a Web broker, i.e., a Web server that may act indifferently as a regular Web server or Web proxy.
 	</longdescription>
diff --git a/dev-scheme/ikarus/metadata.xml b/dev-scheme/ikarus/metadata.xml
index de82f61ff873..c3e91f29f29d 100644
--- a/dev-scheme/ikarus/metadata.xml
+++ b/dev-scheme/ikarus/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>pchrist@gentoo.org</email>
 		<name>Panagiotis Christopoulos</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Ikarus Scheme is a free optimizing incremental native-code compiler for
 		Scheme as specified in the Revised-6 Report on the Algorithmic Language
diff --git a/dev-scheme/jscheme/metadata.xml b/dev-scheme/jscheme/metadata.xml
index e0944d888fe5..07c06eacf7b9 100644
--- a/dev-scheme/jscheme/metadata.xml
+++ b/dev-scheme/jscheme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	JScheme is a dialect of Scheme with a very simple interface to Java, called
 	the Javadot notation . This notation provides a transparent access to all
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index fb3f43f32430..568df5aeead2 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+  <email>scheme@gentoo.org</email>
+  <name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription lang="en">
   Kawa is a full Scheme implementation. It implements almost all of R5RS,
   plus some extensions. By default, symbols are case sensitive. It is
diff --git a/dev-scheme/net-http/metadata.xml b/dev-scheme/net-http/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/dev-scheme/net-http/metadata.xml
+++ b/dev-scheme/net-http/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/racket/metadata.xml b/dev-scheme/racket/metadata.xml
index ebd9fa19ddd1..fcbcce00af24 100644
--- a/dev-scheme/racket/metadata.xml
+++ b/dev-scheme/racket/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>scheme</herd>
+  <maintainer>
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
   <longdescription lang="en">
 ==Grow your Program==
 Racket's interactive mode encourages experimentation, and quick scripts easily compose into larger systems. Small scripts and large systems both benefit from native-code JIT compilation. When a system gets too big to keep in your head, you can add static types.
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index 9ec55af00456..4e0595b59c9f 100644
--- a/dev-scheme/scheme48/metadata.xml
+++ b/dev-scheme/scheme48/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription lang="en">
 Scheme 48 is an implementation of Scheme written by Richard Kelsey and Jonathan
 Rees. It is based on a byte-code interpreter and is designed to be used as a
diff --git a/dev-scheme/schemik/metadata.xml b/dev-scheme/schemik/metadata.xml
index a87597a84f29..3fe2a7bd0cb4 100644
--- a/dev-scheme/schemik/metadata.xml
+++ b/dev-scheme/schemik/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	Schemik is a high-level lexically-scoped implicitly-parallel dialect of
 	Scheme and Common LISP, this means the parallel execution of programs is
diff --git a/dev-scheme/schoca/metadata.xml b/dev-scheme/schoca/metadata.xml
index 44caaf8cc89a..31f571cb6623 100644
--- a/dev-scheme/schoca/metadata.xml
+++ b/dev-scheme/schoca/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
-	<herd>ml</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Schoca is an implementation of the Scheme language. The primary 
 		purpose of Schoca is the use as an embedded extension language 
diff --git a/dev-scheme/scm/metadata.xml b/dev-scheme/scm/metadata.xml
index 49da7a7b1bfd..95aa05ad2fb6 100644
--- a/dev-scheme/scm/metadata.xml
+++ b/dev-scheme/scm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 SCM is a  Scheme implementation conforming to  Revised5 Report on the Algorithmic Language Scheme and the IEEE P1178 specification.
 	</longdescription>
diff --git a/dev-scheme/scmxlate/metadata.xml b/dev-scheme/scmxlate/metadata.xml
index b8be9f4a7dcf..0963b92e55a6 100644
--- a/dev-scheme/scmxlate/metadata.xml
+++ b/dev-scheme/scmxlate/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Scmxlate is a configuration tool for software packages written in Scheme.
 Scmxlate provides the package author with a strategy for programmatically specifying the changes required to translate the package for a variety of Scheme dialects and Common Lisp, and a variety of operating systems. The end-user simply loads one file into their Scheme or Common Lisp, which triggers the entire configuration process with little or no further intervention. 
diff --git a/dev-scheme/sigscheme/metadata.xml b/dev-scheme/sigscheme/metadata.xml
index 5d520e455d2a..b16f76529e26 100644
--- a/dev-scheme/sigscheme/metadata.xml
+++ b/dev-scheme/sigscheme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription>SigScheme is a R5RS Scheme interpreter for embedded use. 
 		It features small footprint (64KB in library form on the 
 		'small' configuration) like SIOD and TinyScheme, low memory 
diff --git a/dev-scheme/slib/metadata.xml b/dev-scheme/slib/metadata.xml
index e2e83365222e..6194334f3f0c 100644
--- a/dev-scheme/slib/metadata.xml
+++ b/dev-scheme/slib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 SLIB is a portable scheme library meant to provide compatibiliy and
 utility functions for all standard scheme implementations.
diff --git a/dev-scheme/stalin/metadata.xml b/dev-scheme/stalin/metadata.xml
index 06b97553c3d2..5add5efd236a 100644
--- a/dev-scheme/stalin/metadata.xml
+++ b/dev-scheme/stalin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>scheme</herd>
   <maintainer>
     <email>pchrist@gentoo.org</email>
     <name>Panagiotis Christopoulos</name>
   </maintainer>
+  <maintainer>
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Stalin is an aggressively optimizing Scheme compiler. It is the most
 		highly optimizing Scheme compiler, and in fact one of the most highly
diff --git a/dev-scheme/stklos/metadata.xml b/dev-scheme/stklos/metadata.xml
index 28121fec7862..cfce622a5f11 100644
--- a/dev-scheme/stklos/metadata.xml
+++ b/dev-scheme/stklos/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		STklos is a free Scheme system supporting most of the languages 
 		features defined in R5RS. The aim of this implementation is to 
diff --git a/dev-scheme/termite/metadata.xml b/dev-scheme/termite/metadata.xml
index eaca52e6f0f4..f670902608e5 100644
--- a/dev-scheme/termite/metadata.xml
+++ b/dev-scheme/termite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">Termite Scheme is a variant of Scheme intended for distributed computing. 
 	It offers a simple and powerful concurrency model, inspired by the Erlang 
 	programming language, which is based on a message-passing model of 
diff --git a/dev-scheme/tinyscheme/metadata.xml b/dev-scheme/tinyscheme/metadata.xml
index b60f12cff3b7..56faa0c4b6ee 100644
--- a/dev-scheme/tinyscheme/metadata.xml
+++ b/dev-scheme/tinyscheme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. It is meant to be used as an embedded scripting interpreter for other programs. As such, it does not offer IDEs or extensive toolkits although it does sport a small top-level loop, included conditionally. A lot of functionality in TinyScheme is included conditionally, to allow developers freedom in balancing features and footprint.
 	</longdescription>
diff --git a/dev-scheme/ypsilon/metadata.xml b/dev-scheme/ypsilon/metadata.xml
index 993379f14f74..50fc4e642aee 100644
--- a/dev-scheme/ypsilon/metadata.xml
+++ b/dev-scheme/ypsilon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">Ypsilon is the implementation of Scheme Programming Language, which conforms
 		to the latest standard R6RS.</longdescription>
 	<upstream>
diff --git a/dev-tcltk/blt/metadata.xml b/dev-tcltk/blt/metadata.xml
index 6678747dcba3..3869f8fbf5ff 100644
--- a/dev-tcltk/blt/metadata.xml
+++ b/dev-tcltk/blt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">blt</remote-id>
   </upstream>
diff --git a/dev-tcltk/bwidget/metadata.xml b/dev-tcltk/bwidget/metadata.xml
index c9ab155ba8d5..cd900b92e5a5 100644
--- a/dev-tcltk/bwidget/metadata.xml
+++ b/dev-tcltk/bwidget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcllib</remote-id>
 	</upstream>
diff --git a/dev-tcltk/ck/metadata.xml b/dev-tcltk/ck/metadata.xml
index 70ac40499556..48817ee6fe94 100644
--- a/dev-tcltk/ck/metadata.xml
+++ b/dev-tcltk/ck/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/combobox/metadata.xml b/dev-tcltk/combobox/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/dev-tcltk/combobox/metadata.xml
+++ b/dev-tcltk/combobox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/expect-lite/metadata.xml b/dev-tcltk/expect-lite/metadata.xml
index 60de8dcb3a23..e4826a3bab92 100644
--- a/dev-tcltk/expect-lite/metadata.xml
+++ b/dev-tcltk/expect-lite/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<use>
 		<flag name="debug">pull in packages needed for runtime interactive debugger</flag>
 	</use>
diff --git a/dev-tcltk/expect/metadata.xml b/dev-tcltk/expect/metadata.xml
index 4a2e453c9905..e4b61aa43de1 100644
--- a/dev-tcltk/expect/metadata.xml
+++ b/dev-tcltk/expect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">expect</remote-id>
 	</upstream>
diff --git a/dev-tcltk/itcl/metadata.xml b/dev-tcltk/itcl/metadata.xml
index 2f4ceee8b869..a5d9243fcb0c 100644
--- a/dev-tcltk/itcl/metadata.xml
+++ b/dev-tcltk/itcl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">incrtcl</remote-id>
 	</upstream>
diff --git a/dev-tcltk/itk/metadata.xml b/dev-tcltk/itk/metadata.xml
index 2f4ceee8b869..a5d9243fcb0c 100644
--- a/dev-tcltk/itk/metadata.xml
+++ b/dev-tcltk/itk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">incrtcl</remote-id>
 	</upstream>
diff --git a/dev-tcltk/iwidgets/metadata.xml b/dev-tcltk/iwidgets/metadata.xml
index 2f4ceee8b869..a5d9243fcb0c 100644
--- a/dev-tcltk/iwidgets/metadata.xml
+++ b/dev-tcltk/iwidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">incrtcl</remote-id>
 	</upstream>
diff --git a/dev-tcltk/mysqltcl/metadata.xml b/dev-tcltk/mysqltcl/metadata.xml
index 716e7d4301bd..54aafedc6395 100644
--- a/dev-tcltk/mysqltcl/metadata.xml
+++ b/dev-tcltk/mysqltcl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
+<maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/scwoop/metadata.xml b/dev-tcltk/scwoop/metadata.xml
index d9408d8ab078..cc8e08d570d1 100644
--- a/dev-tcltk/scwoop/metadata.xml
+++ b/dev-tcltk/scwoop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+<maintainer>
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/snack/metadata.xml b/dev-tcltk/snack/metadata.xml
index 70ac40499556..48817ee6fe94 100644
--- a/dev-tcltk/snack/metadata.xml
+++ b/dev-tcltk/snack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tablelist/metadata.xml b/dev-tcltk/tablelist/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/dev-tcltk/tablelist/metadata.xml
+++ b/dev-tcltk/tablelist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tcl-gtk/metadata.xml b/dev-tcltk/tcl-gtk/metadata.xml
index 10c4bdcfecee..107757e8ffc3 100644
--- a/dev-tcltk/tcl-gtk/metadata.xml
+++ b/dev-tcltk/tcl-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcl-gtk</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tcl-mccp/metadata.xml b/dev-tcltk/tcl-mccp/metadata.xml
index 3be4732250a6..3c7b6362102a 100644
--- a/dev-tcltk/tcl-mccp/metadata.xml
+++ b/dev-tcltk/tcl-mccp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcl-mccp</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tcl-sql/metadata.xml b/dev-tcltk/tcl-sql/metadata.xml
index b678ec2d1e34..b9853f4e62c2 100644
--- a/dev-tcltk/tcl-sql/metadata.xml
+++ b/dev-tcltk/tcl-sql/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
 	<maintainer>
 		<email>tcltk@gentoo.org</email>
 		<description>TCL / TK herd</description>
diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml
index 8791d02088e4..1d291821f9eb 100644
--- a/dev-tcltk/tcl3d/metadata.xml
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+<maintainer>
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
 <longdescription>
 Tcl3D offers the 3D functionality of OpenGL and other 3D libraries at the Tcl scripting level.
 The Tcl3D package currently consists of the following modules:
diff --git a/dev-tcltk/tcllib/metadata.xml b/dev-tcltk/tcllib/metadata.xml
index c9ab155ba8d5..cd900b92e5a5 100644
--- a/dev-tcltk/tcllib/metadata.xml
+++ b/dev-tcltk/tcllib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcllib</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tclperl/metadata.xml b/dev-tcltk/tclperl/metadata.xml
index 70ac40499556..48817ee6fe94 100644
--- a/dev-tcltk/tclperl/metadata.xml
+++ b/dev-tcltk/tclperl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tclpython/metadata.xml b/dev-tcltk/tclpython/metadata.xml
index 70ac40499556..48817ee6fe94 100644
--- a/dev-tcltk/tclpython/metadata.xml
+++ b/dev-tcltk/tclpython/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tclreadline/metadata.xml b/dev-tcltk/tclreadline/metadata.xml
index bf64b24deb60..633030e88c27 100644
--- a/dev-tcltk/tclreadline/metadata.xml
+++ b/dev-tcltk/tclreadline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclreadline</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 4cf3132678c5..428a8198a2b5 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
 	<maintainer>
 		<email>tcltk@gentoo.org</email>
 		<description>TCL / TK herd</description>
diff --git a/dev-tcltk/tclxml/metadata.xml b/dev-tcltk/tclxml/metadata.xml
index 52d7934bd296..61dc5fbd2877 100644
--- a/dev-tcltk/tclxml/metadata.xml
+++ b/dev-tcltk/tclxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclxml</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tdom/metadata.xml b/dev-tcltk/tdom/metadata.xml
index 15cec3cf4c63..094d1f5ff2d3 100644
--- a/dev-tcltk/tdom/metadata.xml
+++ b/dev-tcltk/tdom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
   <longdescription>
 tDOM combines high performance XML data processing with easy and
 powerful Tcl scripting functionality. tDOM should be one of the fastest
diff --git a/dev-tcltk/thread/metadata.xml b/dev-tcltk/thread/metadata.xml
index 6aece7ec2ee6..76bcf5841f17 100644
--- a/dev-tcltk/thread/metadata.xml
+++ b/dev-tcltk/thread/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tcl</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tix/metadata.xml b/dev-tcltk/tix/metadata.xml
index 793044fd656f..f702bf2c499a 100644
--- a/dev-tcltk/tix/metadata.xml
+++ b/dev-tcltk/tix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tix</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tkTheme/metadata.xml b/dev-tcltk/tkTheme/metadata.xml
index 815cc916f2b6..ff185e9c11ba 100644
--- a/dev-tcltk/tkTheme/metadata.xml
+++ b/dev-tcltk/tkTheme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tkXwin/metadata.xml b/dev-tcltk/tkXwin/metadata.xml
index 5800d34857b1..6b974db97172 100644
--- a/dev-tcltk/tkXwin/metadata.xml
+++ b/dev-tcltk/tkXwin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">beepcore-tcl</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tkcon/metadata.xml b/dev-tcltk/tkcon/metadata.xml
index 021d026a88a7..a09ddd5a8549 100644
--- a/dev-tcltk/tkcon/metadata.xml
+++ b/dev-tcltk/tkcon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<longdescription lang="en">
   tkcon is a replacement for the standard console that comes with
   Tk. The console itself provides  more features than the standard
diff --git a/dev-tcltk/tkdnd/metadata.xml b/dev-tcltk/tkdnd/metadata.xml
index 19c3be566f20..bf5240d1273e 100644
--- a/dev-tcltk/tkdnd/metadata.xml
+++ b/dev-tcltk/tkdnd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tkdnd</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
index 0e009fd6d057..06cab22527df 100644
--- a/dev-tcltk/tkimg/metadata.xml
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<longdescription lang="en">
   The "Img" package adds a lot of image formats to Tcl/Tk.
 </longdescription>
diff --git a/dev-tcltk/tklib/metadata.xml b/dev-tcltk/tklib/metadata.xml
index 70ac40499556..48817ee6fe94 100644
--- a/dev-tcltk/tklib/metadata.xml
+++ b/dev-tcltk/tklib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tkpiechart/metadata.xml b/dev-tcltk/tkpiechart/metadata.xml
index d9408d8ab078..cc8e08d570d1 100644
--- a/dev-tcltk/tkpiechart/metadata.xml
+++ b/dev-tcltk/tkpiechart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+<maintainer>
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tkpng/metadata.xml b/dev-tcltk/tkpng/metadata.xml
index 943e7d522597..a4b70fa7c200 100644
--- a/dev-tcltk/tkpng/metadata.xml
+++ b/dev-tcltk/tkpng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tkpng</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tktable/metadata.xml b/dev-tcltk/tktable/metadata.xml
index 2aa34a4a39b9..3965f11927a9 100644
--- a/dev-tcltk/tktable/metadata.xml
+++ b/dev-tcltk/tktable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tktable</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tktray/metadata.xml b/dev-tcltk/tktray/metadata.xml
index 9b9b332c113b..48817ee6fe94 100644
--- a/dev-tcltk/tktray/metadata.xml
+++ b/dev-tcltk/tktray/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
-  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tktreectrl/metadata.xml b/dev-tcltk/tktreectrl/metadata.xml
index 46ede87475ee..421872b6c1b1 100644
--- a/dev-tcltk/tktreectrl/metadata.xml
+++ b/dev-tcltk/tktreectrl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>sci@gentoo.org</email>
 	</maintainer>
diff --git a/dev-tcltk/tkzinc/metadata.xml b/dev-tcltk/tkzinc/metadata.xml
index 94d2144dccaa..9e5cfd2d4279 100644
--- a/dev-tcltk/tkzinc/metadata.xml
+++ b/dev-tcltk/tkzinc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tcltk</herd>
   <maintainer>
     <email>tcltk@gentoo.org</email>
     <description>TCL / TK Herd</description>
diff --git a/dev-tcltk/tls/metadata.xml b/dev-tcltk/tls/metadata.xml
index 4c5c70d2f177..962ddd95eb42 100644
--- a/dev-tcltk/tls/metadata.xml
+++ b/dev-tcltk/tls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tls</remote-id>
 	</upstream>
diff --git a/dev-tcltk/togl/metadata.xml b/dev-tcltk/togl/metadata.xml
index d41cba32a9ab..e8127f2ceded 100644
--- a/dev-tcltk/togl/metadata.xml
+++ b/dev-tcltk/togl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<longdescription>
 Togl is a Tk widget for OpenGL rendering. Togl was originally based on
 OGLTK, written by Benjamin Bederson at the University of New Mexico. Togl's
diff --git a/dev-tcltk/vtcl/metadata.xml b/dev-tcltk/vtcl/metadata.xml
index 9cdc0c6fea10..6e5f383561bc 100644
--- a/dev-tcltk/vtcl/metadata.xml
+++ b/dev-tcltk/vtcl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
 	<maintainer>
 		<email>tcltk@gentoo.org</email>
 		<description>TCL / TK herd</description>
diff --git a/dev-tex/aastex/metadata.xml b/dev-tex/aastex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/aastex/metadata.xml
+++ b/dev-tex/aastex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/abntex/metadata.xml b/dev-tex/abntex/metadata.xml
index dace8a819807..1e24d0bbdddb 100644
--- a/dev-tex/abntex/metadata.xml
+++ b/dev-tex/abntex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<use>
 		<flag name="lyx">Install with <pkg>app-office/lyx</pkg> layout</flag>
 	</use>
diff --git a/dev-tex/bera/metadata.xml b/dev-tex/bera/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/bera/metadata.xml
+++ b/dev-tex/bera/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/biblatex-apa/metadata.xml b/dev-tex/biblatex-apa/metadata.xml
index b7a7598eb42d..f329e1f3b267 100644
--- a/dev-tex/biblatex-apa/metadata.xml
+++ b/dev-tex/biblatex-apa/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 		<description>CC me on bugs. Assign to herd</description>
 	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">plk/biblatex-apa</remote-id>
 	</upstream>
diff --git a/dev-tex/biblatex/metadata.xml b/dev-tex/biblatex/metadata.xml
index 3924e72680f9..07aa0eba1081 100644
--- a/dev-tex/biblatex/metadata.xml
+++ b/dev-tex/biblatex/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 		<description>CC me on bugs. Assign to herd</description>
 	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">plk/biblatex</remote-id>
 		<remote-id type="sourceforge">biblatex</remote-id>
diff --git a/dev-tex/bibtex2html/metadata.xml b/dev-tex/bibtex2html/metadata.xml
index 12a9af659609..a845cefccaee 100644
--- a/dev-tex/bibtex2html/metadata.xml
+++ b/dev-tex/bibtex2html/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>ml</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/bibtexu/metadata.xml b/dev-tex/bibtexu/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/bibtexu/metadata.xml
+++ b/dev-tex/bibtexu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/catdvi/metadata.xml b/dev-tex/catdvi/metadata.xml
index 8149b587c670..19be0887af5a 100644
--- a/dev-tex/catdvi/metadata.xml
+++ b/dev-tex/catdvi/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>ulm@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">catdvi</remote-id>
 	</upstream>
diff --git a/dev-tex/cdcover/metadata.xml b/dev-tex/cdcover/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/cdcover/metadata.xml
+++ b/dev-tex/cdcover/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/chktex/metadata.xml b/dev-tex/chktex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/chktex/metadata.xml
+++ b/dev-tex/chktex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/circuit_macros/metadata.xml b/dev-tex/circuit_macros/metadata.xml
index 239ba2086e69..8186935282a9 100644
--- a/dev-tex/circuit_macros/metadata.xml
+++ b/dev-tex/circuit_macros/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>sci-electronics</herd>
 <maintainer>
 	<email>calchan@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>sci-electronics@gentoo.org</email>
+	<name>Gentoo Electronics Project</name>
+</maintainer>
 <longdescription>Set of macros for drawing high-quality line diagrams to include
 	in TeX, LaTeX, or similar documents. Fundamental electric circuit
 	elements and basic logic gates are included with several tools and
diff --git a/dev-tex/cjk-latex/metadata.xml b/dev-tex/cjk-latex/metadata.xml
index a5618f4ac96f..2ab7bdbdc1ee 100644
--- a/dev-tex/cjk-latex/metadata.xml
+++ b/dev-tex/cjk-latex/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/cpp2latex/metadata.xml b/dev-tex/cpp2latex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/cpp2latex/metadata.xml
+++ b/dev-tex/cpp2latex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/crosstex/metadata.xml b/dev-tex/crosstex/metadata.xml
index 76b8496bb50b..0dae82862010 100644
--- a/dev-tex/crosstex/metadata.xml
+++ b/dev-tex/crosstex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">crosstex</remote-id>
 	</upstream>
diff --git a/dev-tex/csindex/metadata.xml b/dev-tex/csindex/metadata.xml
index 040f708c8404..d616bd8d783c 100644
--- a/dev-tex/csindex/metadata.xml
+++ b/dev-tex/csindex/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>malenko@email.cz</email>
   <name>Jaromir Malenko</name>
   <description>Jaromir is helping us with Czeck and Slovak support in
   Gentoo. He is also a maintainer of cstetex. See bug #31657</description>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/culmus-latex/metadata.xml b/dev-tex/culmus-latex/metadata.xml
index 933d77e4b954..29b981cd80e0 100644
--- a/dev-tex/culmus-latex/metadata.xml
+++ b/dev-tex/culmus-latex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ivritex</remote-id>
 	</upstream>
diff --git a/dev-tex/currvita/metadata.xml b/dev-tex/currvita/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/currvita/metadata.xml
+++ b/dev-tex/currvita/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/curve/metadata.xml b/dev-tex/curve/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/curve/metadata.xml
+++ b/dev-tex/curve/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/detex/metadata.xml b/dev-tex/detex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/detex/metadata.xml
+++ b/dev-tex/detex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/dot2tex/metadata.xml b/dev-tex/dot2tex/metadata.xml
index 73c319c8eb2f..89ecc9e7407d 100644
--- a/dev-tex/dot2tex/metadata.xml
+++ b/dev-tex/dot2tex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">dot2tex</remote-id>
 		<remote-id type="github">kjellmf/dot2tex</remote-id>
diff --git a/dev-tex/dot2texi/metadata.xml b/dev-tex/dot2texi/metadata.xml
index 02a2866a458d..23d22905838c 100644
--- a/dev-tex/dot2texi/metadata.xml
+++ b/dev-tex/dot2texi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <use>
   <flag name="pgf">Enable support for <pkg>dev-tex/pgf</pkg> (The TeX Portable
     Graphic Format)</flag>
diff --git a/dev-tex/dvi2gr/metadata.xml b/dev-tex/dvi2gr/metadata.xml
index 39289e8990a5..f3ed5f16a800 100644
--- a/dev-tex/dvi2gr/metadata.xml
+++ b/dev-tex/dvi2gr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   dvi2gr is a small utility to translate a TeX file (DVI) into a string
   recognized by the Grace plotting tool.
diff --git a/dev-tex/dvi2tty/metadata.xml b/dev-tex/dvi2tty/metadata.xml
index 5e272f4cee56..7c604e6fa8d0 100644
--- a/dev-tex/dvi2tty/metadata.xml
+++ b/dev-tex/dvi2tty/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>idella4@gentoo.org</email>
 	<name>Ian Delaney</name>
@@ -11,4 +9,12 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/dvipost/metadata.xml b/dev-tex/dvipost/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/dvipost/metadata.xml
+++ b/dev-tex/dvipost/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/ellipsis/metadata.xml b/dev-tex/ellipsis/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/ellipsis/metadata.xml
+++ b/dev-tex/ellipsis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/envlab/metadata.xml b/dev-tex/envlab/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/envlab/metadata.xml
+++ b/dev-tex/envlab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/europecv/metadata.xml b/dev-tex/europecv/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/europecv/metadata.xml
+++ b/dev-tex/europecv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/feynmf/metadata.xml b/dev-tex/feynmf/metadata.xml
index 2ffe56d55443..14e9f3f93e2e 100644
--- a/dev-tex/feynmf/metadata.xml
+++ b/dev-tex/feynmf/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>
   FeynMF is a combined LaTeX/Metafont package for easy drawing of professional
   quality Feynman diagrams. FeynMF lays out most diagrams satisfactorily from
diff --git a/dev-tex/flabels/metadata.xml b/dev-tex/flabels/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/flabels/metadata.xml
+++ b/dev-tex/flabels/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/floatflt/metadata.xml b/dev-tex/floatflt/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/floatflt/metadata.xml
+++ b/dev-tex/floatflt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/foiltex/metadata.xml b/dev-tex/foiltex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/foiltex/metadata.xml
+++ b/dev-tex/foiltex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/frakturx/metadata.xml b/dev-tex/frakturx/metadata.xml
index 1dc1e0750434..0711aa9ef92c 100644
--- a/dev-tex/frakturx/metadata.xml
+++ b/dev-tex/frakturx/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription lang="de">
   Mit diesem Paket (und den dazugehörigen Schriften) soll das Setzen von
   gebrochenen Schriften unter LaTeX erleichtert werden. Hierzu wird eine
diff --git a/dev-tex/fundus/metadata.xml b/dev-tex/fundus/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/fundus/metadata.xml
+++ b/dev-tex/fundus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/g-brief/metadata.xml b/dev-tex/g-brief/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/g-brief/metadata.xml
+++ b/dev-tex/g-brief/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/glossaries/metadata.xml b/dev-tex/glossaries/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/glossaries/metadata.xml
+++ b/dev-tex/glossaries/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/harvard/metadata.xml b/dev-tex/harvard/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/harvard/metadata.xml
+++ b/dev-tex/harvard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/herm-pic/metadata.xml b/dev-tex/herm-pic/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/herm-pic/metadata.xml
+++ b/dev-tex/herm-pic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/hevea/metadata.xml b/dev-tex/hevea/metadata.xml
index 085db2162b6c..6399ef510c74 100644
--- a/dev-tex/hevea/metadata.xml
+++ b/dev-tex/hevea/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<herd>ml</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/hlatex/metadata.xml b/dev-tex/hlatex/metadata.xml
index ea9ececdd657..273910a14ebd 100644
--- a/dev-tex/hlatex/metadata.xml
+++ b/dev-tex/hlatex/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>tex</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/html2latex/metadata.xml b/dev-tex/html2latex/metadata.xml
index 9742be5022a8..4e206fadedf9 100644
--- a/dev-tex/html2latex/metadata.xml
+++ b/dev-tex/html2latex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">html2latex</remote-id>
 	</upstream>
diff --git a/dev-tex/hyphen_show/metadata.xml b/dev-tex/hyphen_show/metadata.xml
index daedb32cbf48..ca0feba6c628 100644
--- a/dev-tex/hyphen_show/metadata.xml
+++ b/dev-tex/hyphen_show/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>
   hyphen_show scans a DVI file, tries to find all hyphenations and writes them
   to stdout. It is useful to check whether TeX's hyphenation algorithm really
diff --git a/dev-tex/isotope/metadata.xml b/dev-tex/isotope/metadata.xml
index e7a2e262c889..b66f222eeda1 100644
--- a/dev-tex/isotope/metadata.xml
+++ b/dev-tex/isotope/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
-  <herd>sci</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     The package provides a command \isotope for setting the atomic weight and
 	atomic number indications of isotopes. (The naive way of doing the job with
diff --git a/dev-tex/ivritex/metadata.xml b/dev-tex/ivritex/metadata.xml
index 933d77e4b954..29b981cd80e0 100644
--- a/dev-tex/ivritex/metadata.xml
+++ b/dev-tex/ivritex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ivritex</remote-id>
 	</upstream>
diff --git a/dev-tex/latex-beamer/metadata.xml b/dev-tex/latex-beamer/metadata.xml
index a77c37926218..f4e4a6390b7e 100644
--- a/dev-tex/latex-beamer/metadata.xml
+++ b/dev-tex/latex-beamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">rivanvx/beamer</remote-id>
 	</upstream>
diff --git a/dev-tex/latex-calendar/metadata.xml b/dev-tex/latex-calendar/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/latex-calendar/metadata.xml
+++ b/dev-tex/latex-calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/latex2html/metadata.xml b/dev-tex/latex2html/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/latex2html/metadata.xml
+++ b/dev-tex/latex2html/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/latex2rtf/metadata.xml b/dev-tex/latex2rtf/metadata.xml
index 74cedb528b91..4db46ff8d713 100644
--- a/dev-tex/latex2rtf/metadata.xml
+++ b/dev-tex/latex2rtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">latex2rtf</remote-id>
 	</upstream>
diff --git a/dev-tex/latexdiff/metadata.xml b/dev-tex/latexdiff/metadata.xml
index d7b73cd8be89..4f99950a75fe 100644
--- a/dev-tex/latexdiff/metadata.xml
+++ b/dev-tex/latexdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ftilmann/latexdiff</remote-id>
 	</upstream>
diff --git a/dev-tex/latexmk/metadata.xml b/dev-tex/latexmk/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/latexmk/metadata.xml
+++ b/dev-tex/latexmk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/lazylist/metadata.xml b/dev-tex/lazylist/metadata.xml
index 66b9052a990b..9029619565a3 100644
--- a/dev-tex/lazylist/metadata.xml
+++ b/dev-tex/lazylist/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/leaflet/metadata.xml b/dev-tex/leaflet/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/leaflet/metadata.xml
+++ b/dev-tex/leaflet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/lgrind/metadata.xml b/dev-tex/lgrind/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/lgrind/metadata.xml
+++ b/dev-tex/lgrind/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/luatex/metadata.xml b/dev-tex/luatex/metadata.xml
index 1d2fc95bdaa1..c7fcd68de3dc 100644
--- a/dev-tex/luatex/metadata.xml
+++ b/dev-tex/luatex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription lang="en">
 An experimental pdfTeX extension that is to eventually
 become its successor. It is developed by a subset of the
diff --git a/dev-tex/metapost/metadata.xml b/dev-tex/metapost/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/metapost/metadata.xml
+++ b/dev-tex/metapost/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/minted/metadata.xml b/dev-tex/minted/metadata.xml
index 948f2f07b8ad..790391e2d081 100644
--- a/dev-tex/minted/metadata.xml
+++ b/dev-tex/minted/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>sci@gentoo.org</email>
   </maintainer>
diff --git a/dev-tex/newlfm/metadata.xml b/dev-tex/newlfm/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/newlfm/metadata.xml
+++ b/dev-tex/newlfm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/notoccite/metadata.xml b/dev-tex/notoccite/metadata.xml
index b8c7fc831028..ca86b4dda17e 100644
--- a/dev-tex/notoccite/metadata.xml
+++ b/dev-tex/notoccite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
   <longdescription>
     If you have \cite commands in \section-like commands, or in \caption, the
 	citation will also appear in the table of contents, or list of whatever. If
diff --git a/dev-tex/oesch/metadata.xml b/dev-tex/oesch/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/oesch/metadata.xml
+++ b/dev-tex/oesch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/pdfannotextractor/metadata.xml b/dev-tex/pdfannotextractor/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/pdfannotextractor/metadata.xml
+++ b/dev-tex/pdfannotextractor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/pgf/metadata.xml b/dev-tex/pgf/metadata.xml
index b24594832686..fc945a7cdc55 100644
--- a/dev-tex/pgf/metadata.xml
+++ b/dev-tex/pgf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pgf</remote-id>
 	</upstream>
diff --git a/dev-tex/polytable/metadata.xml b/dev-tex/polytable/metadata.xml
index 66b9052a990b..9029619565a3 100644
--- a/dev-tex/polytable/metadata.xml
+++ b/dev-tex/polytable/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/ppower4/metadata.xml b/dev-tex/ppower4/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/ppower4/metadata.xml
+++ b/dev-tex/ppower4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/prosper/metadata.xml b/dev-tex/prosper/metadata.xml
index d145b3f3222d..de0bd5e95321 100644
--- a/dev-tex/prosper/metadata.xml
+++ b/dev-tex/prosper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">prosper</remote-id>
 	</upstream>
diff --git a/dev-tex/pscyr/metadata.xml b/dev-tex/pscyr/metadata.xml
index 940b48761f8d..1158ee9a4605 100644
--- a/dev-tex/pscyr/metadata.xml
+++ b/dev-tex/pscyr/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/pstplus/metadata.xml b/dev-tex/pstplus/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/pstplus/metadata.xml
+++ b/dev-tex/pstplus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/qtexengine/metadata.xml b/dev-tex/qtexengine/metadata.xml
index 31a8c55cde2c..fa52c449111d 100644
--- a/dev-tex/qtexengine/metadata.xml
+++ b/dev-tex/qtexengine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qtiplot.berlios</remote-id>
   </upstream>
diff --git a/dev-tex/quotchap/metadata.xml b/dev-tex/quotchap/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/quotchap/metadata.xml
+++ b/dev-tex/quotchap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/rail/metadata.xml b/dev-tex/rail/metadata.xml
index b923cfad0837..069a842ac078 100644
--- a/dev-tex/rail/metadata.xml
+++ b/dev-tex/rail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription lang="en">
 A C program and LaTeX package to draw syntax diagrams specified in EBNF.
 </longdescription>
diff --git a/dev-tex/rcsinfo/metadata.xml b/dev-tex/rcsinfo/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/rcsinfo/metadata.xml
+++ b/dev-tex/rcsinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/revtex/metadata.xml b/dev-tex/revtex/metadata.xml
index 64ebb139fe48..10c4efb235ec 100644
--- a/dev-tex/revtex/metadata.xml
+++ b/dev-tex/revtex/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>sci</herd>
 <maintainer><email>dilfridge@gentoo.org</email></maintainer>
+<maintainer>
+<email>tex@gentoo.org</email>
+<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+<email>sci@gentoo.org</email>
+<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/rubber/metadata.xml b/dev-tex/rubber/metadata.xml
index 1939ab7a9627..c70df2665782 100644
--- a/dev-tex/rubber/metadata.xml
+++ b/dev-tex/rubber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">rubber</remote-id>
 	</upstream>
diff --git a/dev-tex/serienbrief/metadata.xml b/dev-tex/serienbrief/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/serienbrief/metadata.xml
+++ b/dev-tex/serienbrief/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/sketch/metadata.xml b/dev-tex/sketch/metadata.xml
index b98516e1eabd..f5f0178b02d8 100644
--- a/dev-tex/sketch/metadata.xml
+++ b/dev-tex/sketch/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>aballier@gentoo.org</email>
   <name>Alexis Ballier</name>
@@ -11,4 +9,12 @@
   <email>dima@dzhus.org</email>
   <name>Dmitry Dzhus</name>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/slatex/metadata.xml b/dev-tex/slatex/metadata.xml
index 40280b1e69ce..81401e91987e 100644
--- a/dev-tex/slatex/metadata.xml
+++ b/dev-tex/slatex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 SLaTeX  is a Scheme program that allows you to write programs or program fragments ``as is'' in your TeX or LaTeX source. It is particularly geared to the programming languages Scheme and other Lisps, eg, Common Lisp. The formatting of the code includes assigning appropriate fonts and colors to the various tokens in the code (keywords, variables, constants, data), at the same time retaining the proper indentation when going to the non-monospace (non-typewriter) fonts provided by TeX. SLaTeX comes with two databases that recognize the identifier conventions of Scheme and Common Lisp respectively. These can be modified by the user with easy TeX commands. In addition, the user can tell SLaTeX to typeset certain identifiers as specially suited TeX expressions (ie, beyond just fonting them). All this is done without interfering with the identifier conventions of the language of the programming code. In sum, no change need be made to your (presumably running) program code in order to get a typeset version with a desired look: You can get a spectrum of styles ranging from no fonting through basic default fonting to various ``mathematical''-looking output for pedagogic or other reasons.
 	</longdescription>
diff --git a/dev-tex/style-check/metadata.xml b/dev-tex/style-check/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/style-check/metadata.xml
+++ b/dev-tex/style-check/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/svninfo/metadata.xml b/dev-tex/svninfo/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/svninfo/metadata.xml
+++ b/dev-tex/svninfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/tex4ht/metadata.xml b/dev-tex/tex4ht/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/tex4ht/metadata.xml
+++ b/dev-tex/tex4ht/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/texamator/metadata.xml b/dev-tex/texamator/metadata.xml
index ed0568d85e79..4b4d0a04c643 100644
--- a/dev-tex/texamator/metadata.xml
+++ b/dev-tex/texamator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tex/texmfind/metadata.xml b/dev-tex/texmfind/metadata.xml
index 105baf339724..0512ef89d65e 100644
--- a/dev-tex/texmfind/metadata.xml
+++ b/dev-tex/texmfind/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>etux@bluewin.ch</email>
 		<name>Alexandre -- Untux</name>
@@ -15,6 +13,14 @@
 		<email>fauli@gentoo.org</email>
 		<name>Christian Faulhammer</name>
 	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Little CLI utility for Gentoo-texlive end-users. Search for texmf-files
 		matching a grep regexp and get the corresponding ebuild. It consists of
diff --git a/dev-tex/texpower/metadata.xml b/dev-tex/texpower/metadata.xml
index 15ddb18755a0..bf911ec42ce8 100644
--- a/dev-tex/texpower/metadata.xml
+++ b/dev-tex/texpower/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">texpower</remote-id>
 	</upstream>
diff --git a/dev-tex/tipa/metadata.xml b/dev-tex/tipa/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/tipa/metadata.xml
+++ b/dev-tex/tipa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/translator/metadata.xml b/dev-tex/translator/metadata.xml
index f9f92d934281..b2b28498c2aa 100644
--- a/dev-tex/translator/metadata.xml
+++ b/dev-tex/translator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">latex-beamer</remote-id>
 	</upstream>
diff --git a/dev-tex/tth/metadata.xml b/dev-tex/tth/metadata.xml
index 21ff3a538481..057df7463e62 100644
--- a/dev-tex/tth/metadata.xml
+++ b/dev-tex/tth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/vc/metadata.xml b/dev-tex/vc/metadata.xml
index 42f266d3ea99..6a866d4892fd 100644
--- a/dev-tex/vc/metadata.xml
+++ b/dev-tex/vc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>
   This is a script based approach to version control for TeX documents.
   It works more reliably than keyword substitution based approaches,
diff --git a/dev-tex/xcolor/metadata.xml b/dev-tex/xcolor/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/xcolor/metadata.xml
+++ b/dev-tex/xcolor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/xmltex/metadata.xml b/dev-tex/xmltex/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-tex/xmltex/metadata.xml
+++ b/dev-tex/xmltex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/xymtex/metadata.xml b/dev-tex/xymtex/metadata.xml
index a6a645317dfb..e1d8d724b792 100644
--- a/dev-tex/xymtex/metadata.xml
+++ b/dev-tex/xymtex/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>sci</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-basic/metadata.xml b/dev-texlive/texlive-basic/metadata.xml
index 863890adc8ec..e2dc108fb7ab 100644
--- a/dev-texlive/texlive-basic/metadata.xml
+++ b/dev-texlive/texlive-basic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+  </maintainer>
 <longdescription lang="en">
 These files are regarded as basic for any TeX system, covering
 plain TeX macros, Computer Modern fonts, and configuration for
diff --git a/dev-texlive/texlive-bibtexextra/metadata.xml b/dev-texlive/texlive-bibtexextra/metadata.xml
index e28f0181aeea..3b5c35b3e4ac 100644
--- a/dev-texlive/texlive-bibtexextra/metadata.xml
+++ b/dev-texlive/texlive-bibtexextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Additional BibTeX styles and bibliography data(bases),
 notably including BibLaTeX.
diff --git a/dev-texlive/texlive-context/metadata.xml b/dev-texlive/texlive-context/metadata.xml
index 059009948bd1..2d1e3a73e5bd 100644
--- a/dev-texlive/texlive-context/metadata.xml
+++ b/dev-texlive/texlive-context/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
 Also includes third-party ConTeXt packages.
diff --git a/dev-texlive/texlive-documentation-arabic/metadata.xml b/dev-texlive/texlive-documentation-arabic/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-arabic/metadata.xml
+++ b/dev-texlive/texlive-documentation-arabic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-base/metadata.xml b/dev-texlive/texlive-documentation-base/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-base/metadata.xml
+++ b/dev-texlive/texlive-documentation-base/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-bulgarian/metadata.xml b/dev-texlive/texlive-documentation-bulgarian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-bulgarian/metadata.xml
+++ b/dev-texlive/texlive-documentation-bulgarian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-chinese/metadata.xml b/dev-texlive/texlive-documentation-chinese/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-chinese/metadata.xml
+++ b/dev-texlive/texlive-documentation-chinese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-czechslovak/metadata.xml b/dev-texlive/texlive-documentation-czechslovak/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-czechslovak/metadata.xml
+++ b/dev-texlive/texlive-documentation-czechslovak/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-dutch/metadata.xml b/dev-texlive/texlive-documentation-dutch/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-dutch/metadata.xml
+++ b/dev-texlive/texlive-documentation-dutch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-english/metadata.xml b/dev-texlive/texlive-documentation-english/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-english/metadata.xml
+++ b/dev-texlive/texlive-documentation-english/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-finnish/metadata.xml b/dev-texlive/texlive-documentation-finnish/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-finnish/metadata.xml
+++ b/dev-texlive/texlive-documentation-finnish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-french/metadata.xml b/dev-texlive/texlive-documentation-french/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-french/metadata.xml
+++ b/dev-texlive/texlive-documentation-french/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-german/metadata.xml b/dev-texlive/texlive-documentation-german/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-german/metadata.xml
+++ b/dev-texlive/texlive-documentation-german/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-italian/metadata.xml b/dev-texlive/texlive-documentation-italian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-italian/metadata.xml
+++ b/dev-texlive/texlive-documentation-italian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-japanese/metadata.xml b/dev-texlive/texlive-documentation-japanese/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-japanese/metadata.xml
+++ b/dev-texlive/texlive-documentation-japanese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-korean/metadata.xml b/dev-texlive/texlive-documentation-korean/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-korean/metadata.xml
+++ b/dev-texlive/texlive-documentation-korean/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-mongolian/metadata.xml b/dev-texlive/texlive-documentation-mongolian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-mongolian/metadata.xml
+++ b/dev-texlive/texlive-documentation-mongolian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-polish/metadata.xml b/dev-texlive/texlive-documentation-polish/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-polish/metadata.xml
+++ b/dev-texlive/texlive-documentation-polish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-portuguese/metadata.xml b/dev-texlive/texlive-documentation-portuguese/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-portuguese/metadata.xml
+++ b/dev-texlive/texlive-documentation-portuguese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-russian/metadata.xml b/dev-texlive/texlive-documentation-russian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-russian/metadata.xml
+++ b/dev-texlive/texlive-documentation-russian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-serbian/metadata.xml b/dev-texlive/texlive-documentation-serbian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-serbian/metadata.xml
+++ b/dev-texlive/texlive-documentation-serbian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-slovenian/metadata.xml b/dev-texlive/texlive-documentation-slovenian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-slovenian/metadata.xml
+++ b/dev-texlive/texlive-documentation-slovenian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-spanish/metadata.xml b/dev-texlive/texlive-documentation-spanish/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-spanish/metadata.xml
+++ b/dev-texlive/texlive-documentation-spanish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-thai/metadata.xml b/dev-texlive/texlive-documentation-thai/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-thai/metadata.xml
+++ b/dev-texlive/texlive-documentation-thai/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-turkish/metadata.xml b/dev-texlive/texlive-documentation-turkish/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-turkish/metadata.xml
+++ b/dev-texlive/texlive-documentation-turkish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-ukrainian/metadata.xml b/dev-texlive/texlive-documentation-ukrainian/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-ukrainian/metadata.xml
+++ b/dev-texlive/texlive-documentation-ukrainian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-documentation-vietnamese/metadata.xml b/dev-texlive/texlive-documentation-vietnamese/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-documentation-vietnamese/metadata.xml
+++ b/dev-texlive/texlive-documentation-vietnamese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-fontsextra/metadata.xml b/dev-texlive/texlive-fontsextra/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-fontsextra/metadata.xml
+++ b/dev-texlive/texlive-fontsextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-fontsrecommended/metadata.xml b/dev-texlive/texlive-fontsrecommended/metadata.xml
index 179fe3b05667..a631d18167d6 100644
--- a/dev-texlive/texlive-fontsrecommended/metadata.xml
+++ b/dev-texlive/texlive-fontsrecommended/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Recommended fonts, including the base 35 PostScript fonts,
 Latin Modern, TeX Gyre, and T1 and other encoding support for
diff --git a/dev-texlive/texlive-fontutils/metadata.xml b/dev-texlive/texlive-fontutils/metadata.xml
index 1ff0eb3c03d5..e6eb9164f789 100644
--- a/dev-texlive/texlive-fontutils/metadata.xml
+++ b/dev-texlive/texlive-fontutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Programs for conversion between font formats, testing fonts,
 virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
diff --git a/dev-texlive/texlive-formatsextra/metadata.xml b/dev-texlive/texlive-formatsextra/metadata.xml
index 0c5ec541c9d0..21b80d0d6c45 100644
--- a/dev-texlive/texlive-formatsextra/metadata.xml
+++ b/dev-texlive/texlive-formatsextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Collected TeX `formats', i.e., large-scale macro packages
 designed to be dumped into .fmt files -- excluding the most common
diff --git a/dev-texlive/texlive-games/metadata.xml b/dev-texlive/texlive-games/metadata.xml
index 967b01c7948b..74d27a966bfd 100644
--- a/dev-texlive/texlive-games/metadata.xml
+++ b/dev-texlive/texlive-games/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Setups for typesetting various games, including chess.
 </longdescription>
diff --git a/dev-texlive/texlive-genericextra/metadata.xml b/dev-texlive/texlive-genericextra/metadata.xml
index e5f28b6514f4..3c676d48633a 100644
--- a/dev-texlive/texlive-genericextra/metadata.xml
+++ b/dev-texlive/texlive-genericextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Extra packages that work with multiple formats, typically both
 TeX and LaTeX.
diff --git a/dev-texlive/texlive-genericrecommended/metadata.xml b/dev-texlive/texlive-genericrecommended/metadata.xml
index 30c986cee57d..c2b40d0aa14f 100644
--- a/dev-texlive/texlive-genericrecommended/metadata.xml
+++ b/dev-texlive/texlive-genericrecommended/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Recommended packages that work with multiple formats.
 </longdescription>
diff --git a/dev-texlive/texlive-htmlxml/metadata.xml b/dev-texlive/texlive-htmlxml/metadata.xml
index dd4ea15c757b..302619f0d301 100644
--- a/dev-texlive/texlive-htmlxml/metadata.xml
+++ b/dev-texlive/texlive-htmlxml/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Packages to convert LaTeX to XML/HTML, and typset XML/SGML
 </longdescription>
diff --git a/dev-texlive/texlive-humanities/metadata.xml b/dev-texlive/texlive-humanities/metadata.xml
index 791dbab465e2..9df265c915b4 100644
--- a/dev-texlive/texlive-humanities/metadata.xml
+++ b/dev-texlive/texlive-humanities/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Packages for law, linguistics, social sciences, humanities, etc.
 </longdescription>
diff --git a/dev-texlive/texlive-langafrican/metadata.xml b/dev-texlive/texlive-langafrican/metadata.xml
index 26ba6751b8da..9e0acf46b73b 100644
--- a/dev-texlive/texlive-langafrican/metadata.xml
+++ b/dev-texlive/texlive-langafrican/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for African scripts.
 </longdescription>
diff --git a/dev-texlive/texlive-langarabic/metadata.xml b/dev-texlive/texlive-langarabic/metadata.xml
index c5da19f1fdb0..233a09df5758 100644
--- a/dev-texlive/texlive-langarabic/metadata.xml
+++ b/dev-texlive/texlive-langarabic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Arabic and Persian.
 </longdescription>
diff --git a/dev-texlive/texlive-langarmenian/metadata.xml b/dev-texlive/texlive-langarmenian/metadata.xml
index 4b535eb0132b..2b80bf719c64 100644
--- a/dev-texlive/texlive-langarmenian/metadata.xml
+++ b/dev-texlive/texlive-langarmenian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Armenian.
 </longdescription>
diff --git a/dev-texlive/texlive-langchinese/metadata.xml b/dev-texlive/texlive-langchinese/metadata.xml
index f0d4f78e2d3a..3b425102a787 100644
--- a/dev-texlive/texlive-langchinese/metadata.xml
+++ b/dev-texlive/texlive-langchinese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Chinese; additional packages in collection-langcjk.
 </longdescription>
diff --git a/dev-texlive/texlive-langcjk/metadata.xml b/dev-texlive/texlive-langcjk/metadata.xml
index 04581792e4e7..393a439e321e 100644
--- a/dev-texlive/texlive-langcjk/metadata.xml
+++ b/dev-texlive/texlive-langcjk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Packages supporting a combination of Chinese, Japanese, Korean,
 including macros, fonts, documentation.  Also Thai in the c90
diff --git a/dev-texlive/texlive-langcroatian/metadata.xml b/dev-texlive/texlive-langcroatian/metadata.xml
index b474f794fa68..9fead2e565c5 100644
--- a/dev-texlive/texlive-langcroatian/metadata.xml
+++ b/dev-texlive/texlive-langcroatian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Croatian.
 </longdescription>
diff --git a/dev-texlive/texlive-langcyrillic/metadata.xml b/dev-texlive/texlive-langcyrillic/metadata.xml
index ecbb6e81f877..fde7ec2931b1 100644
--- a/dev-texlive/texlive-langcyrillic/metadata.xml
+++ b/dev-texlive/texlive-langcyrillic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Cyrillic scripts (Bulgarian, Russian,
 Serbian, Ukrainian), even if Latin alphabets may also be used.
diff --git a/dev-texlive/texlive-langczechslovak/metadata.xml b/dev-texlive/texlive-langczechslovak/metadata.xml
index 9c2212a494fb..6f1363b5672e 100644
--- a/dev-texlive/texlive-langczechslovak/metadata.xml
+++ b/dev-texlive/texlive-langczechslovak/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Czech/Slovak.
 </longdescription>
diff --git a/dev-texlive/texlive-langdanish/metadata.xml b/dev-texlive/texlive-langdanish/metadata.xml
index d1b79e9c4b6f..ff8fb785c484 100644
--- a/dev-texlive/texlive-langdanish/metadata.xml
+++ b/dev-texlive/texlive-langdanish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Danish.
 </longdescription>
diff --git a/dev-texlive/texlive-langdutch/metadata.xml b/dev-texlive/texlive-langdutch/metadata.xml
index f95fe177bda8..78a06ff0cf29 100644
--- a/dev-texlive/texlive-langdutch/metadata.xml
+++ b/dev-texlive/texlive-langdutch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Dutch.
 </longdescription>
diff --git a/dev-texlive/texlive-langenglish/metadata.xml b/dev-texlive/texlive-langenglish/metadata.xml
index 3cdbb1dbc101..85ebc0da8e74 100644
--- a/dev-texlive/texlive-langenglish/metadata.xml
+++ b/dev-texlive/texlive-langenglish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for (and documentation in) English.
 </longdescription>
diff --git a/dev-texlive/texlive-langeuropean/metadata.xml b/dev-texlive/texlive-langeuropean/metadata.xml
index 747739007392..2b7bf4b66b51 100644
--- a/dev-texlive/texlive-langeuropean/metadata.xml
+++ b/dev-texlive/texlive-langeuropean/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for a number of European languages; others (Greek,
 German, French, ...) have their own collections, depending
diff --git a/dev-texlive/texlive-langfinnish/metadata.xml b/dev-texlive/texlive-langfinnish/metadata.xml
index 6548dc703e18..0cfe369ecb9d 100644
--- a/dev-texlive/texlive-langfinnish/metadata.xml
+++ b/dev-texlive/texlive-langfinnish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Finnish.
 </longdescription>
diff --git a/dev-texlive/texlive-langfrench/metadata.xml b/dev-texlive/texlive-langfrench/metadata.xml
index 64af51921e09..43224c7eb35b 100644
--- a/dev-texlive/texlive-langfrench/metadata.xml
+++ b/dev-texlive/texlive-langfrench/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for French and Basque.
 </longdescription>
diff --git a/dev-texlive/texlive-langgerman/metadata.xml b/dev-texlive/texlive-langgerman/metadata.xml
index 32b56d3d73d2..44e67aa2459a 100644
--- a/dev-texlive/texlive-langgerman/metadata.xml
+++ b/dev-texlive/texlive-langgerman/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for German.
 </longdescription>
diff --git a/dev-texlive/texlive-langgreek/metadata.xml b/dev-texlive/texlive-langgreek/metadata.xml
index acae2e0d8940..f52007a95d92 100644
--- a/dev-texlive/texlive-langgreek/metadata.xml
+++ b/dev-texlive/texlive-langgreek/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Greek.
 </longdescription>
diff --git a/dev-texlive/texlive-langhebrew/metadata.xml b/dev-texlive/texlive-langhebrew/metadata.xml
index 744e7195f401..5aefbc9445f3 100644
--- a/dev-texlive/texlive-langhebrew/metadata.xml
+++ b/dev-texlive/texlive-langhebrew/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Hebrew.
 </longdescription>
diff --git a/dev-texlive/texlive-langhungarian/metadata.xml b/dev-texlive/texlive-langhungarian/metadata.xml
index 985acce4628a..5c64b6aef577 100644
--- a/dev-texlive/texlive-langhungarian/metadata.xml
+++ b/dev-texlive/texlive-langhungarian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Hungarian.
 </longdescription>
diff --git a/dev-texlive/texlive-langindic/metadata.xml b/dev-texlive/texlive-langindic/metadata.xml
index 7e559461b961..dde13d289ea8 100644
--- a/dev-texlive/texlive-langindic/metadata.xml
+++ b/dev-texlive/texlive-langindic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Indic scripts.
 </longdescription>
diff --git a/dev-texlive/texlive-langitalian/metadata.xml b/dev-texlive/texlive-langitalian/metadata.xml
index b10f046d4805..223700225d38 100644
--- a/dev-texlive/texlive-langitalian/metadata.xml
+++ b/dev-texlive/texlive-langitalian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Italian.
 </longdescription>
diff --git a/dev-texlive/texlive-langjapanese/metadata.xml b/dev-texlive/texlive-langjapanese/metadata.xml
index a4f97d327d1f..5d0e2e22eca0 100644
--- a/dev-texlive/texlive-langjapanese/metadata.xml
+++ b/dev-texlive/texlive-langjapanese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Japanese; additional packages in collection-langcjk.
 </longdescription>
diff --git a/dev-texlive/texlive-langkorean/metadata.xml b/dev-texlive/texlive-langkorean/metadata.xml
index 3a051bbba04a..5f0753643114 100644
--- a/dev-texlive/texlive-langkorean/metadata.xml
+++ b/dev-texlive/texlive-langkorean/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Korean; additional packages in collection-langcjk.
 </longdescription>
diff --git a/dev-texlive/texlive-langlatin/metadata.xml b/dev-texlive/texlive-langlatin/metadata.xml
index f6768b711e90..fdb4d99d34bf 100644
--- a/dev-texlive/texlive-langlatin/metadata.xml
+++ b/dev-texlive/texlive-langlatin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Latin.
 </longdescription>
diff --git a/dev-texlive/texlive-langlatvian/metadata.xml b/dev-texlive/texlive-langlatvian/metadata.xml
index f3ea3077f68c..b87365543382 100644
--- a/dev-texlive/texlive-langlatvian/metadata.xml
+++ b/dev-texlive/texlive-langlatvian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Latvian.
 </longdescription>
diff --git a/dev-texlive/texlive-langlithuanian/metadata.xml b/dev-texlive/texlive-langlithuanian/metadata.xml
index 800783c2dded..db67973be6a5 100644
--- a/dev-texlive/texlive-langlithuanian/metadata.xml
+++ b/dev-texlive/texlive-langlithuanian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Lithuanian.
 </longdescription>
diff --git a/dev-texlive/texlive-langmongolian/metadata.xml b/dev-texlive/texlive-langmongolian/metadata.xml
index 859b66ff02db..73349e446b4b 100644
--- a/dev-texlive/texlive-langmongolian/metadata.xml
+++ b/dev-texlive/texlive-langmongolian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Mongolian.
 </longdescription>
diff --git a/dev-texlive/texlive-langnorwegian/metadata.xml b/dev-texlive/texlive-langnorwegian/metadata.xml
index c8341b603d6c..cac1d55f5daf 100644
--- a/dev-texlive/texlive-langnorwegian/metadata.xml
+++ b/dev-texlive/texlive-langnorwegian/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Norwegian.
 </longdescription>
diff --git a/dev-texlive/texlive-langother/metadata.xml b/dev-texlive/texlive-langother/metadata.xml
index d6287a7e12d9..5c7fcf0f02a6 100644
--- a/dev-texlive/texlive-langother/metadata.xml
+++ b/dev-texlive/texlive-langother/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for languages not otherwise listed, including Thai,
 Vietnamese, Hebrew, Indonesian, and plenty more.  The split is
diff --git a/dev-texlive/texlive-langpolish/metadata.xml b/dev-texlive/texlive-langpolish/metadata.xml
index f5d6a1257942..89c3d475ecf1 100644
--- a/dev-texlive/texlive-langpolish/metadata.xml
+++ b/dev-texlive/texlive-langpolish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Polish.
 </longdescription>
diff --git a/dev-texlive/texlive-langportuguese/metadata.xml b/dev-texlive/texlive-langportuguese/metadata.xml
index cc5241dd036d..506ef6e72407 100644
--- a/dev-texlive/texlive-langportuguese/metadata.xml
+++ b/dev-texlive/texlive-langportuguese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Portuguese.
 </longdescription>
diff --git a/dev-texlive/texlive-langspanish/metadata.xml b/dev-texlive/texlive-langspanish/metadata.xml
index 0f48c2465b10..1e94257142aa 100644
--- a/dev-texlive/texlive-langspanish/metadata.xml
+++ b/dev-texlive/texlive-langspanish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for Spanish.
 </longdescription>
diff --git a/dev-texlive/texlive-langswedish/metadata.xml b/dev-texlive/texlive-langswedish/metadata.xml
index 90c4fefaf543..34616b16a697 100644
--- a/dev-texlive/texlive-langswedish/metadata.xml
+++ b/dev-texlive/texlive-langswedish/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Swedish.
 </longdescription>
diff --git a/dev-texlive/texlive-langtibetan/metadata.xml b/dev-texlive/texlive-langtibetan/metadata.xml
index abfba6dc62b4..4f194edf8b37 100644
--- a/dev-texlive/texlive-langtibetan/metadata.xml
+++ b/dev-texlive/texlive-langtibetan/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Tibetan.
 </longdescription>
diff --git a/dev-texlive/texlive-langturkmen/metadata.xml b/dev-texlive/texlive-langturkmen/metadata.xml
index fb42c08b7cea..e1ae842f778e 100644
--- a/dev-texlive/texlive-langturkmen/metadata.xml
+++ b/dev-texlive/texlive-langturkmen/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Turkmen.
 </longdescription>
diff --git a/dev-texlive/texlive-langvietnamese/metadata.xml b/dev-texlive/texlive-langvietnamese/metadata.xml
index 6978f3ec3d0d..c0161fe58e6e 100644
--- a/dev-texlive/texlive-langvietnamese/metadata.xml
+++ b/dev-texlive/texlive-langvietnamese/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Support for typesetting Vietnamese.
 </longdescription>
diff --git a/dev-texlive/texlive-latex/metadata.xml b/dev-texlive/texlive-latex/metadata.xml
index 2759255c7ceb..888c65da0e8d 100644
--- a/dev-texlive/texlive-latex/metadata.xml
+++ b/dev-texlive/texlive-latex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 These packages are either mandated by the core LaTeX team,
 or very widely used and strongly recommended in practice.
diff --git a/dev-texlive/texlive-latexextra/metadata.xml b/dev-texlive/texlive-latexextra/metadata.xml
index dd3ffcec47e5..2ebdf0b391a8 100644
--- a/dev-texlive/texlive-latexextra/metadata.xml
+++ b/dev-texlive/texlive-latexextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 A very large collection of add-on packages for LaTeX.
 </longdescription>
diff --git a/dev-texlive/texlive-latexrecommended/metadata.xml b/dev-texlive/texlive-latexrecommended/metadata.xml
index c6d6dfb83d15..5d1d98d8ee10 100644
--- a/dev-texlive/texlive-latexrecommended/metadata.xml
+++ b/dev-texlive/texlive-latexrecommended/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 A collection of recommended add-on packages for LaTeX which have
 widespread use.
diff --git a/dev-texlive/texlive-luatex/metadata.xml b/dev-texlive/texlive-luatex/metadata.xml
index 041af7965219..2b80ac26ddf1 100644
--- a/dev-texlive/texlive-luatex/metadata.xml
+++ b/dev-texlive/texlive-luatex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using Lua 
 as an embedded scripting and extension language. http://luatex.org/
diff --git a/dev-texlive/texlive-mathextra/metadata.xml b/dev-texlive/texlive-mathextra/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-mathextra/metadata.xml
+++ b/dev-texlive/texlive-mathextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-metapost/metadata.xml b/dev-texlive/texlive-metapost/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-metapost/metadata.xml
+++ b/dev-texlive/texlive-metapost/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-music/metadata.xml b/dev-texlive/texlive-music/metadata.xml
index 93df437137b3..00a871578fc1 100644
--- a/dev-texlive/texlive-music/metadata.xml
+++ b/dev-texlive/texlive-music/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Music-related fonts and packages.
 </longdescription>
diff --git a/dev-texlive/texlive-omega/metadata.xml b/dev-texlive/texlive-omega/metadata.xml
index 2b8b04f799be..14552efd7b5c 100644
--- a/dev-texlive/texlive-omega/metadata.xml
+++ b/dev-texlive/texlive-omega/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous,
 now updated to Aleph.
diff --git a/dev-texlive/texlive-pictures/metadata.xml b/dev-texlive/texlive-pictures/metadata.xml
index 08b48360a7cd..f7e1db37f420 100644
--- a/dev-texlive/texlive-pictures/metadata.xml
+++ b/dev-texlive/texlive-pictures/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Including TikZ, pict, etc., but MetaPost and PStricks are separate.
 </longdescription>
diff --git a/dev-texlive/texlive-plainextra/metadata.xml b/dev-texlive/texlive-plainextra/metadata.xml
index 871be962eae9..a557965f63a8 100644
--- a/dev-texlive/texlive-plainextra/metadata.xml
+++ b/dev-texlive/texlive-plainextra/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Add-on packages and macros that work with plain TeX.
 </longdescription>
diff --git a/dev-texlive/texlive-pstricks/metadata.xml b/dev-texlive/texlive-pstricks/metadata.xml
index d6bdae0f6a3b..ddb221635cca 100644
--- a/dev-texlive/texlive-pstricks/metadata.xml
+++ b/dev-texlive/texlive-pstricks/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 PSTricks core and all add-on packages.
 </longdescription>
diff --git a/dev-texlive/texlive-publishers/metadata.xml b/dev-texlive/texlive-publishers/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-publishers/metadata.xml
+++ b/dev-texlive/texlive-publishers/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-science/metadata.xml b/dev-texlive/texlive-science/metadata.xml
index fc27305afea4..90b1eb1ac904 100644
--- a/dev-texlive/texlive-science/metadata.xml
+++ b/dev-texlive/texlive-science/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-texinfo/metadata.xml b/dev-texlive/texlive-texinfo/metadata.xml
index d47d8adbc598..d217687d709d 100644
--- a/dev-texlive/texlive-texinfo/metadata.xml
+++ b/dev-texlive/texlive-texinfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 TeX macros for the GNU Texinfo documentation system.  The programs
 and documentation are no longer distributed with TeX Live; get
diff --git a/dev-texlive/texlive-xetex/metadata.xml b/dev-texlive/texlive-xetex/metadata.xml
index 16c05aa34e6f..59aaf8c07b79 100644
--- a/dev-texlive/texlive-xetex/metadata.xml
+++ b/dev-texlive/texlive-xetex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 <longdescription lang="en">
 Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
 http://tug.org/xetex.
diff --git a/dev-util/aap/metadata.xml b/dev-util/aap/metadata.xml
index efa518256292..574fdc0e717f 100644
--- a/dev-util/aap/metadata.xml
+++ b/dev-util/aap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">a-a-p</remote-id>
 	</upstream>
diff --git a/dev-util/ald/metadata.xml b/dev-util/ald/metadata.xml
index 2b6fbc1053e9..7d70ee2eff74 100644
--- a/dev-util/ald/metadata.xml
+++ b/dev-util/ald/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<upstream>
 		<remote-id type="sourceforge">ald</remote-id>
 	</upstream>
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 32ad5a24d818..d9b33c23953b 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="devhelp">Enable devhelp integration</flag>
     <flag name="glade">Build glade plugin for anjuta</flag>
diff --git a/dev-util/antlrworks/metadata.xml b/dev-util/antlrworks/metadata.xml
index 3ae83fc7830c..83a85cf5a7b6 100644
--- a/dev-util/antlrworks/metadata.xml
+++ b/dev-util/antlrworks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		ANTLRWorks is a novel grammar development environment for ANTLR v3
 		grammars written by Jean Bovet (with suggested use cases from
diff --git a/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
index 6eb354a7ef11..92e0eb587821 100644
--- a/dev-util/appdata-tools/metadata.xml
+++ b/dev-util/appdata-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hughsie/appdata-tools</remote-id>
 	</upstream>
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index 6a67278ded8a..a7911192c19a 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>gentoo.power@gmail.com</email>
 	<name>Iván Atienza</name>
@@ -12,6 +11,10 @@
 	<name>Markos Chandras</name>
 	<description>Proxy maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/dev-util/argouml/metadata.xml b/dev-util/argouml/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-util/argouml/metadata.xml
+++ b/dev-util/argouml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index 3ed3c4b22b24..c08bb1e8524b 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <longdescription>
   From the web page:
 
diff --git a/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/automoc/metadata.xml
+++ b/dev-util/automoc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/autoproject/metadata.xml
+++ b/dev-util/autoproject/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
index c1a4dd3eb2e0..b059a78e4572 100644
--- a/dev-util/bakefile/metadata.xml
+++ b/dev-util/bakefile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bakefile</remote-id>
 	</upstream>
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
index 6b82cf0d48fc..ab05a5144206 100644
--- a/dev-util/bdelta/metadata.xml
+++ b/dev-util/bdelta/metadata.xml
@@ -6,7 +6,10 @@
     <name>Sergei Trofimovich</name>
     <description>Primary Maintainer</description>
   </maintainer>
-  <herd>tools-portage</herd>
+  <maintainer>
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">jjwhitney/BDelta</remote-id>
   </upstream>
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index e188f3384bcf..237c631767c5 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
 	</upstream>
diff --git a/dev-util/bnfc/metadata.xml b/dev-util/bnfc/metadata.xml
index ddb2b453cd1f..320f819da1e3 100644
--- a/dev-util/bnfc/metadata.xml
+++ b/dev-util/bnfc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 031ebfc77646..914846767c7a 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cpp</herd>
+  <maintainer>
+    <email>cpp@gentoo.org</email>
+    <name>Gentoo C++ Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">boost</remote-id>
   </upstream>
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
index 432f6bd7e831..b217ca6048ca 100644
--- a/dev-util/btyacc/metadata.xml
+++ b/dev-util/btyacc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>patrick@gentoo.org</email>
 <name>Patrick Lauer</name>
@@ -12,4 +11,8 @@
 <name>William L. Thomson Jr.</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml
index cbc386e5a915..e4af3d007663 100644
--- a/dev-util/bumpversion/metadata.xml
+++ b/dev-util/bumpversion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">bumpversion</remote-id>
 		<remote-id type="github">peritus/bumpversion</remote-id>
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index d2e02d93825d..a7a50120b4b9 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Draw pretty sequence diagrams of D-Bus traffic
 	</longdescription>
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 918f25d2e093..06b9dcb5bd38 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>livecd</herd>
   <maintainer>
     <email>catalyst@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>livecd@gentoo.org</email>
+    <name>Gentoo LiveCD Project</name>
+  </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
   </use>
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index c1dcc264f34f..56cbdd9604a5 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">catfish-search</remote-id>
 	</upstream>
diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml
index 4534eeb6a439..b839bb98e582 100644
--- a/dev-util/catkin/metadata.xml
+++ b/dev-util/catkin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/catkin</remote-id>
 	</upstream>
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index a1113ba3300a..e245a1647c0f 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <longdescription lang="en">
 		ccache acts as a caching pre-processor to C/C++ compilers, improving
 		compilation time when recompiling previously compiled source.
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
index 53a503e1fe5d..d05ffb595b8d 100644
--- a/dev-util/ccglue/metadata.xml
+++ b/dev-util/ccglue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		ccglue (ctags-cscope glue) is intended to be the interfacing app between cscope
 		and ctags. It can generate cross-reference tag files that can be interfaced
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index 29c3432a8d76..eb47fa951d52 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <longdescription>
     Colored, side-by-side diff terminal viewer.
   </longdescription>
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index cb772e568728..bdcc034da2f9 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<upstream>
 		<remote-id type="sourceforge">cgdb</remote-id>
 	</upstream>
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
index 3ca88ad73f31..c02c04449e94 100644
--- a/dev-util/checkbashisms/metadata.xml
+++ b/dev-util/checkbashisms/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">checkbaskisms</remote-id>
   </upstream>
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
index 0a63c3f4568f..05187eb3c576 100644
--- a/dev-util/checkstyle/metadata.xml
+++ b/dev-util/checkstyle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">checkstyle</remote-id>
 		<remote-id type="github">checkstyle/checkstyle</remote-id>
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 7e3fec5ae431..3ff2291a419f 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
 	</use>
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
index f017c1146cff..fe25c1aec0a6 100644
--- a/dev-util/cmocka/metadata.xml
+++ b/dev-util/cmocka/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
 <maintainer>
         <email>creffett@gentoo.org</email>
         <name>Chris Reffett</name>
 </maintainer>
+<maintainer>
+        <email>kde@gentoo.org</email>
+        <name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
index 06d54062e2f2..b1f11ebb7b36 100644
--- a/dev-util/coccinelle/metadata.xml
+++ b/dev-util/coccinelle/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
 <maintainer>
   <email>radhermit@gentoo.org</email>
   <name>Tim Harder</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 0f3a706d7ab7..3eb9da8e9751 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>wxwidgets</herd>
+  <maintainer>
+    <email>wxwidgets@gentoo.org</email>
+    <name>Gentoo wxWidgets Project</name>
+  </maintainer>
   <use>
     <flag name="contrib">Build additional contrib components</flag>
   </use>
diff --git a/dev-util/colorgcc/metadata.xml b/dev-util/colorgcc/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/dev-util/colorgcc/metadata.xml
+++ b/dev-util/colorgcc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-util/cppunit/metadata.xml
+++ b/dev-util/cppunit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/cpuinfo-collection/metadata.xml b/dev-util/cpuinfo-collection/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/cpuinfo-collection/metadata.xml
+++ b/dev-util/cpuinfo-collection/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/cscope/metadata.xml b/dev-util/cscope/metadata.xml
index 434721ed1a1c..6c0e2937ad0d 100644
--- a/dev-util/cscope/metadata.xml
+++ b/dev-util/cscope/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
-  <herd>emacs</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer>
+    <email>emacs@gentoo.org</email>
+    <name>Gentoo Emacs project</name>
+  </maintainer>
   <longdescription>
 Cscope is a developer's tool for browsing source code.  Cscope allows
 searching code for:
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/dev-util/csup/metadata.xml
+++ b/dev-util/csup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 4306b7903053..4095bc5de56a 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="ada">Enable Ada support</flag>
   </use>
diff --git a/dev-util/cunit/metadata.xml b/dev-util/cunit/metadata.xml
index 875d63833a63..bb77d7c3aa34 100644
--- a/dev-util/cunit/metadata.xml
+++ b/dev-util/cunit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 	<upstream>
 		<remote-id type="sourceforge">cunit</remote-id>
 	</upstream>
diff --git a/dev-util/cyclo/metadata.xml b/dev-util/cyclo/metadata.xml
index 44729c62a7ad..232c11960257 100644
--- a/dev-util/cyclo/metadata.xml
+++ b/dev-util/cyclo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
 <maintainer>
 	<email>nerdboy@gentoo.org</email>
 	<name>Steve Arnold</name>
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
index 9dac5c8a2bd2..3ab299ddfa6c 100644
--- a/dev-util/d-feet/metadata.xml
+++ b/dev-util/d-feet/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
   <email>cardoe@gentoo.org</email>
   <name>Doug Goldstein</name>
   <description>Feel free to bump or do any updates as needed</description>
 </maintainer>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/dbus-test-runner/metadata.xml b/dev-util/dbus-test-runner/metadata.xml
index 19dcdd8183d2..4a660105b008 100644
--- a/dev-util/dbus-test-runner/metadata.xml
+++ b/dev-util/dbus-test-runner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">dbus-test-runner</remote-id>
 	</upstream>
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
index 13183a3d7070..858d11e5074a 100644
--- a/dev-util/debhelper/metadata.xml
+++ b/dev-util/debhelper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>deb-tools</herd>
+<maintainer>
+	<email>deb-tools@gentoo.org</email>
+	<name>Gentoo Debian Tools Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index d5fca454db1f..a234812e7184 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>deb-tools</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
+<maintainer>
+		<email>deb-tools@gentoo.org</email>
+		<name>Gentoo Debian Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/debugedit/metadata.xml
+++ b/dev-util/debugedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-util/dejagnu/metadata.xml
+++ b/dev-util/dejagnu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/desktop-file-utils/metadata.xml b/dev-util/desktop-file-utils/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/dev-util/desktop-file-utils/metadata.xml
+++ b/dev-util/desktop-file-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-util/deskzilla/metadata.xml
+++ b/dev-util/deskzilla/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml
index 2bbccce04951..851334fc91f7 100644
--- a/dev-util/devhelp/metadata.xml
+++ b/dev-util/devhelp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gedit">Install plugin for <pkg>app-editors/gedit</pkg></flag>
 </use>
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index a56bb3ac4585..e8c7e9d7978f 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+<email>livecd@gentoo.org</email>
+<name>Gentoo LiveCD Project</name>
+</maintainer>
 <use>
 <flag name="minimal">Disable library, install command-line program only</flag>
 </use>
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
index 2d5b39853545..74be441f3aa3 100644
--- a/dev-util/diffstat/metadata.xml
+++ b/dev-util/diffstat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <upstream>
     <changelog>http://invisible-island.net/diffstat/CHANGES</changelog>
   </upstream>
diff --git a/dev-util/dogtail/metadata.xml b/dev-util/dogtail/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/dev-util/dogtail/metadata.xml
+++ b/dev-util/dogtail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/duma/metadata.xml b/dev-util/duma/metadata.xml
index 38964f6cb5a5..7db47aeaeee9 100644
--- a/dev-util/duma/metadata.xml
+++ b/dev-util/duma/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<longdescription>
 DUMA is an open-source library (under GNU General Public License) to 
 detect buffer overruns and under-runs in C and C++ programs. This 
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
index 83b1cb59b4e4..56c0e5a80abf 100644
--- a/dev-util/eclipse-sdk/metadata.xml
+++ b/dev-util/eclipse-sdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 The Eclipse Project is an open source project of eclipse.org, overseen by
 a Project Management Committee (PMC) and project leaders. The work is done
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
index d3cf0833c4dd..542dca119f9c 100644
--- a/dev-util/elfkickers/metadata.xml
+++ b/dev-util/elfkickers/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
 </pkgmetadata>
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
index 0b863c387a3e..32512589c7d2 100644
--- a/dev-util/eric/metadata.xml
+++ b/dev-util/eric/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">eric-ide</remote-id>
   </upstream>
diff --git a/dev-util/febootstrap/metadata.xml b/dev-util/febootstrap/metadata.xml
index d62d48a3f6df..cb7717104532 100644
--- a/dev-util/febootstrap/metadata.xml
+++ b/dev-util/febootstrap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
  	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
@@ -9,4 +8,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+ 	<email>proxy-maint@gentoo.org</email>
+ 	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
index d575582d205e..4ee1c17916a8 100644
--- a/dev-util/fhist/metadata.xml
+++ b/dev-util/fhist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fhist</remote-id>
 	</upstream>
diff --git a/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml
index 66ae673b690e..549e98606b54 100644
--- a/dev-util/findbugs/metadata.xml
+++ b/dev-util/findbugs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. Static analysis means that FindBugs can find bugs by simply inspecting a program's code: executing the program is not necessary. This makes FindBugs very easy to use: in general, you should be able to use it to look for bugs in your code within a few minutes of downloading it. FindBugs works by analyzing Java bytecode (compiled class files), so you don't even need the program's source code to use it. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is less than 50%.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">findbugs</remote-id>
diff --git a/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
index 7aa4c63325e2..88616e61d223 100644
--- a/dev-util/fix-la-relink-command/metadata.xml
+++ b/dev-util/fix-la-relink-command/metadata.xml
@@ -5,5 +5,8 @@
 <email>tetromino@gentoo.org</email>
 <name>Alexandre Rostovtsev</name>
 </maintainer>
-<herd>gnome</herd>
+<maintainer>
+<email>gnome@gentoo.org</email>
+<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index 429c6105e4c5..d9adb36c4ec8 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
@@ -9,6 +8,10 @@
 		<email>arfrever.fta@gmail.com</email> 
 		<description>Proxy maintainer</description>   
 	</maintainer>    
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>    
 	<use>
 		<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
 	</use>
diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gnome-devel-docs/metadata.xml
+++ b/dev-util/gnome-devel-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gob/metadata.xml b/dev-util/gob/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gob/metadata.xml
+++ b/dev-util/gob/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
index 7775c15af392..7acee17029ef 100644
--- a/dev-util/gource/metadata.xml
+++ b/dev-util/gource/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>enrico.tagliavini@gmail.com</email>
     <name>Enrico Tagliavini</name>
@@ -10,6 +9,10 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">gource</remote-id>
     <remote-id type="github">acaudwell/Gource</remote-id>
diff --git a/dev-util/gquilt/metadata.xml b/dev-util/gquilt/metadata.xml
index 3d6d79c9f3b8..782de34db8cf 100644
--- a/dev-util/gquilt/metadata.xml
+++ b/dev-util/gquilt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<upstream>
 		<remote-id type="sourceforge">gquilt</remote-id>
 	</upstream>
diff --git a/dev-util/gtk-builder-convert/metadata.xml b/dev-util/gtk-builder-convert/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gtk-builder-convert/metadata.xml
+++ b/dev-util/gtk-builder-convert/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gtk-doc-am/metadata.xml
+++ b/dev-util/gtk-doc-am/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
index a562fd84b87c..5ef9b83fa46c 100644
--- a/dev-util/gtk-doc/metadata.xml
+++ b/dev-util/gtk-doc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="highlight">Enable source code highlighting</flag>
 	<flag name="vim">Enable source code highlighting through
diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
index 23586bff0bd6..249756658a76 100644
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ b/dev-util/gtk-update-icon-cache/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">
     gtk-update-icon-cache is a tool from GTK+ to update icons and themes
     caches.
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 6fffb6812f9a..7b3677c1caee 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
index e09a4ea6ca94..2671205a8eb9 100644
--- a/dev-util/icemon/metadata.xml
+++ b/dev-util/icemon/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-<herd>suse</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
index e787117837fa..9a75c1c3a23f 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-	<maintainer>
+<maintainer>
 		<email>gert@gepe-biljarts.be</email>
 		<name>Gert Pellin</name>
 		<description>Proxy maintainer. Assign bugs to him.</description>
@@ -11,6 +10,10 @@
 		<email>tomboy64@sina.cn</email>
 		<description>Proxied co-maintainer</description>
 	</maintainer>		
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>		
 <longdescription lang="en">
 Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 </longdescription>
diff --git a/dev-util/insight/metadata.xml b/dev-util/insight/metadata.xml
index 392e8535ccce..150b1a474bb7 100644
--- a/dev-util/insight/metadata.xml
+++ b/dev-util/insight/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
 <longdescription>Graphical front-end to GDB</longdescription>
 </pkgmetadata>
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
index ab11cfdf2c80..a554fc85968c 100644
--- a/dev-util/intltool/metadata.xml
+++ b/dev-util/intltool/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
index dcf8006540cb..c5b83f7892b5 100644
--- a/dev-util/itstool/metadata.xml
+++ b/dev-util/itstool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">ITS Tool allows you to translate your XML documents
   with gettext PO files, using rules from the W3C Internationalization Tag Set
   (ITS) to determine what to translate and how to separate it into PO file
diff --git a/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
index 1613b38b18cb..4902ef5f66c5 100644
--- a/dev-util/jarwizard/metadata.xml
+++ b/dev-util/jarwizard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jarwizard</remote-id>
 	</upstream>
diff --git a/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
index 331dbe87a1f3..b526ceb67593 100644
--- a/dev-util/jay/metadata.xml
+++ b/dev-util/jay/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>dotnet</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
index 3eb786ee584c..7866b51afe58 100644
--- a/dev-util/jconfig/metadata.xml
+++ b/dev-util/jconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jconfig</remote-id>
 	</upstream>
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index 365af956a76a..c5788ae58783 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>swapon@gmail.com</email>
 		<name>Alessio Cassibba</name>
@@ -10,4 +9,8 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdbg/metadata.xml b/dev-util/kdbg/metadata.xml
index 82cdedc036ae..85453ce615a7 100644
--- a/dev-util/kdbg/metadata.xml
+++ b/dev-util/kdbg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kdbg</remote-id>
 	</upstream>
diff --git a/dev-util/kdevelop-pg-qt/metadata.xml b/dev-util/kdevelop-pg-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-pg-qt/metadata.xml
+++ b/dev-util/kdevelop-pg-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-php-docs/metadata.xml b/dev-util/kdevelop-php-docs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-php-docs/metadata.xml
+++ b/dev-util/kdevelop-php-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-php/metadata.xml b/dev-util/kdevelop-php/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-php/metadata.xml
+++ b/dev-util/kdevelop-php/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-python/metadata.xml
+++ b/dev-util/kdevelop-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-qmake/metadata.xml b/dev-util/kdevelop-qmake/metadata.xml
index 5a8fd6011702..a8c8aa529a5b 100644
--- a/dev-util/kdevelop-qmake/metadata.xml
+++ b/dev-util/kdevelop-qmake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Build and install the qmake-parser debugging tool</flag>
 	</use>
diff --git a/dev-util/kdevelop-qmljs/metadata.xml b/dev-util/kdevelop-qmljs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-qmljs/metadata.xml
+++ b/dev-util/kdevelop-qmljs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index d6717c393ca4..30c6eb413e4e 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="cmake">Enable support for CMake build system</flag>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
index 6acfb42b2ac0..bc0263a63550 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="classbrowser">Enable the class browser plugin</flag>
 		<flag name="konsole">Enable <pkg>kde-apps/konsole</pkg> integration</flag>
diff --git a/dev-util/kscope/metadata.xml b/dev-util/kscope/metadata.xml
index 1857d0bcc627..f3e450315124 100644
--- a/dev-util/kscope/metadata.xml
+++ b/dev-util/kscope/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kscope</remote-id>
 	</upstream>
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index a38465452764..8eb1e79ba8a3 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<upstream>
 		<remote-id type="sourceforge">ltp</remote-id>
 	</upstream>
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-util/leaktracer/metadata.xml
+++ b/dev-util/leaktracer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
index dce9e2ed8fa4..dabd15d72dbd 100644
--- a/dev-util/ltrace/metadata.xml
+++ b/dev-util/ltrace/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<use>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
 	</use>
diff --git a/dev-util/makepp/metadata.xml b/dev-util/makepp/metadata.xml
index a575b05d4cca..7173de71c333 100644
--- a/dev-util/makepp/metadata.xml
+++ b/dev-util/makepp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">makepp</remote-id>
 	</upstream>
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 006f35bb0ba6..07a21f283ace 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">multidimalgorithm</remote-id>
 	</upstream>
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/meld/metadata.xml
+++ b/dev-util/meld/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
index a4d63710b914..957427e97ceb 100644
--- a/dev-util/mingw-runtime/metadata.xml
+++ b/dev-util/mingw-runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mingw</remote-id>
 	</upstream>
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index b6f2f9e194ac..30cad3a48acc 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <use>
     <flag name="idl">
     Install idl files.
diff --git a/dev-util/monkeystudio/metadata.xml b/dev-util/monkeystudio/metadata.xml
index 79f13541af69..96efff06bb5f 100644
--- a/dev-util/monkeystudio/metadata.xml
+++ b/dev-util/monkeystudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="plugins">Build and install additional plugins</flag>
 	</use>
diff --git a/dev-util/mono-debugger/metadata.xml b/dev-util/mono-debugger/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/mono-debugger/metadata.xml
+++ b/dev-util/mono-debugger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/monodevelop-database/metadata.xml b/dev-util/monodevelop-database/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/monodevelop-database/metadata.xml
+++ b/dev-util/monodevelop-database/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/monodevelop-debugger-gdb/metadata.xml b/dev-util/monodevelop-debugger-gdb/metadata.xml
index d35e9300c540..b578be7f7b36 100644
--- a/dev-util/monodevelop-debugger-gdb/metadata.xml
+++ b/dev-util/monodevelop-debugger-gdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-util/monodevelop/metadata.xml b/dev-util/monodevelop/metadata.xml
index 14be1b1de2e2..1d225a3d48e8 100644
--- a/dev-util/monodevelop/metadata.xml
+++ b/dev-util/monodevelop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
+  <maintainer>
+  <email>dotnet@gentoo.org</email>
+  <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <use>
 	<flag name="git">Enable Git version control support</flag>
 	<flag name="gnome">Enable support gnome support (unsetting this flag is unsupported)</flag>
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index 10a2f1810a2e..eb9ad3b47a4e 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
     Nemiver is an on going effort to write an easy to use standalone C/C++
 	debugger that integrates well in the GNOME environment.
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
index f8a80571336f..20596a306b96 100644
--- a/dev-util/netbeans/metadata.xml
+++ b/dev-util/netbeans/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
 of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
diff --git a/dev-util/ninja-ide/metadata.xml b/dev-util/ninja-ide/metadata.xml
index 021c8cade6ca..292f7ff1b689 100644
--- a/dev-util/ninja-ide/metadata.xml
+++ b/dev-util/ninja-ide/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
 		<name>Aaron Burnett</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<changelog>https://github.com/ninja-ide/ninja-ide/commits/master</changelog>
 		<doc lang="en">https://github.com/ninja-ide/ninja-ide/wiki</doc>
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
index d0d2e6d9f0f4..a9eaca4f8eb1 100644
--- a/dev-util/ninja/metadata.xml
+++ b/dev-util/ninja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">martine/ninja</remote-id>
 	</upstream>
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 8bd8dab6f976..499ed98be6a7 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="opencl">
 			Build OpenCL binaries.
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index e099ba5579b7..48266d3c2975 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="profiler">
 			Installs the NVIDIA CUDA visual profiler.
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-cpanspec/metadata.xml
+++ b/dev-util/obs-service-cpanspec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_files/metadata.xml
+++ b/dev-util/obs-service-download_files/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_src_package/metadata.xml
+++ b/dev-util/obs-service-download_src_package/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_url/metadata.xml
+++ b/dev-util/obs-service-download_url/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-extract_file/metadata.xml
+++ b/dev-util/obs-service-extract_file/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
index c1febdafc499..4c5f6d639d73 100644
--- a/dev-util/obs-service-format_spec_file/metadata.xml
+++ b/dev-util/obs-service-format_spec_file/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for openSUSE Build Service.
 
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-generator_driver_update_disk/metadata.xml
+++ b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-git_tarballs/metadata.xml
+++ b/dev-util/obs-service-git_tarballs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-github_tarballs/metadata.xml
+++ b/dev-util/obs-service-github_tarballs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
index bf2692f5562e..2cd2cffd90de 100644
--- a/dev-util/obs-service-meta/metadata.xml
+++ b/dev-util/obs-service-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
 </longdescription>
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-rearchive/metadata.xml
+++ b/dev-util/obs-service-rearchive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-recompress/metadata.xml
+++ b/dev-util/obs-service-recompress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-set_version/metadata.xml
+++ b/dev-util/obs-service-set_version/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
index bf2692f5562e..2cd2cffd90de 100644
--- a/dev-util/obs-service-source_validator/metadata.xml
+++ b/dev-util/obs-service-source_validator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
 </longdescription>
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-tar_scm/metadata.xml
+++ b/dev-util/obs-service-tar_scm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-update_source/metadata.xml
+++ b/dev-util/obs-service-update_source/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-verify_file/metadata.xml
+++ b/dev-util/obs-service-verify_file/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-util/omake/metadata.xml
+++ b/dev-util/omake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 71f533fb42e2..22fd6feb1d72 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
 </longdescription>
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
index 934d5c44fc6f..3fdd61f906d7 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/metadata.xml
@@ -4,5 +4,8 @@
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
-	<herd>shell-tools</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/dev-util/pida/metadata.xml b/dev-util/pida/metadata.xml
index 42c241eb0463..0637a538f8c3 100644
--- a/dev-util/pida/metadata.xml
+++ b/dev-util/pida/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pida</remote-id>
 	</upstream>
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 938c704a8aa3..ab19a34f6cf7 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jdhore@gentoo.org</email>
 		<name>Jeff Horelick</name>
@@ -11,6 +10,10 @@
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
 		<flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
index 1e47ef827d11..e63116b87c68 100644
--- a/dev-util/pkgconfig/metadata.xml
+++ b/dev-util/pkgconfig/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index 0e42654984c7..3b4049cdb56f 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andy753421@gmail.com</email>
 	</maintainer>
@@ -9,6 +8,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Plan9Port is a set of Plan 9 utilities ported to the POSIX
 		environment - also know as Plan 9 from User Space.
diff --git a/dev-util/pmd/metadata.xml b/dev-util/pmd/metadata.xml
index 56443875fae5..90fac1dfb9a1 100644
--- a/dev-util/pmd/metadata.xml
+++ b/dev-util/pmd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pmd</remote-id>
 	</upstream>
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index 2920253981cc..90c791c1ab18 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>no111u3@gmail.com</email>
 		<name>Boris Vinogradov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
 
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 76c91f263895..3b08d4f9af22 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
-	<herd>suse</herd>
 	<maintainer>
 		  <email>mpagano@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		  <email>suse@gentoo.org</email>
+		  <name>SUSE</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/rbtools/metadata.xml
+++ b/dev-util/rbtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
index a07ab3cfb265..fd3275b550ad 100644
--- a/dev-util/rebar/metadata.xml
+++ b/dev-util/rebar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
@@ -11,6 +10,10 @@
     <name>Luis Ressel</name>
     <description>Proxy-maintainer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">rebar/rebar</remote-id>
   </upstream>
diff --git a/dev-util/regexxer/metadata.xml b/dev-util/regexxer/metadata.xml
index bfb8e568fb12..f6fee2ece649 100644
--- a/dev-util/regexxer/metadata.xml
+++ b/dev-util/regexxer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">regexxer</remote-id>
 	</upstream>
diff --git a/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml
index a337e79e8c73..8c2c7b468cb4 100644
--- a/dev-util/rosdep/metadata.xml
+++ b/dev-util/rosdep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/rosdep</remote-id>
 	</upstream>
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
index 22272a81ac89..a47c8afb1262 100644
--- a/dev-util/rosinstall/metadata.xml
+++ b/dev-util/rosinstall/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vcstools/rosinstall</remote-id>
 	</upstream>
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
index e4e50ba004c2..e645cad210a9 100644
--- a/dev-util/rosinstall_generator/metadata.xml
+++ b/dev-util/rosinstall_generator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/rosinstall_generator</remote-id>
 	</upstream>
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
index 68b30527c024..01ad1fbd1574 100644
--- a/dev-util/scala-ide/metadata.xml
+++ b/dev-util/scala-ide/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
 	  <email>monsieurp@gentoo.org</email>
   </maintainer>
+<maintainer>
+	  <email>java@gentoo.org</email>
+	  <name>Java</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml
index 1181e65fb7d3..af109b1694bb 100644
--- a/dev-util/scons/metadata.xml
+++ b/dev-util/scons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     SCons is a make replacement providing a range of enhanced
     features such as automated dependency generation and built in
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
index 67dfac8ca4f4..30029adc6d76 100644
--- a/dev-util/setconf/metadata.xml
+++ b/dev-util/setconf/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index 5f6d825d5f9a..7bc6ee8ea837 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <maintainer>
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
index dbb21d6b2945..7eb910daeb1d 100644
--- a/dev-util/shelltestrunner/metadata.xml
+++ b/dev-util/shelltestrunner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		shelltestrunner is a cross-platform tool for testing command-line
 		programs (or arbitrary shell commands.)  It reads simple declarative tests
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index d9096ef82092..7a53dbeb0ef9 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">shflags</remote-id>
 		<remote-id type="github">kward/shflags</remote-id>
diff --git a/dev-util/shtool/metadata.xml b/dev-util/shtool/metadata.xml
index 028d1cef3af8..097975e3adc2 100644
--- a/dev-util/shtool/metadata.xml
+++ b/dev-util/shtool/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 </pkgmetadata>
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
index 0d72971c67e1..a9b2488a9be6 100644
--- a/dev-util/skipfish/metadata.xml
+++ b/dev-util/skipfish/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>givi-zurabovich@mail.ru</email>
 		<name>Georgy Kovtunov</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">skipfish</remote-id>
 	</upstream>
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
index 12ec8af3d77a..b5607a5f0fc0 100644
--- a/dev-util/spec-cleaner/metadata.xml
+++ b/dev-util/spec-cleaner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>suse</herd>
+	<maintainer>
+		<email>suse@gentoo.org</email>
+		<name>SUSE</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
 	</upstream>
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index 0ca954da6d5f..9c35a4b7c9ec 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <use>
     <flag name="aio">
       Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index b12171d137ee..bba503417c59 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>suse</herd>
+  <maintainer>
+    <email>suse@gentoo.org</email>
+    <name>SUSE</name>
+  </maintainer>
   <use>
     <flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
   </use>
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
index 3df908a9c339..e9b5d3c1976e 100644
--- a/dev-util/tailor/metadata.xml
+++ b/dev-util/tailor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Tailor is a tool to migrate changesets between ArX, Bazaar,
 		Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone,
diff --git a/dev-util/tkdiff/metadata.xml b/dev-util/tkdiff/metadata.xml
index e2cbb4ff9322..bb651e5939fc 100644
--- a/dev-util/tkdiff/metadata.xml
+++ b/dev-util/tkdiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tkdiff</remote-id>
 	</upstream>
diff --git a/dev-util/treecc/metadata.xml b/dev-util/treecc/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/treecc/metadata.xml
+++ b/dev-util/treecc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
index 6227bf2f489c..df953e8746eb 100644
--- a/dev-util/txt2regex/metadata.xml
+++ b/dev-util/txt2regex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">txt2regex</remote-id>
 	</upstream>
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/unifdef/metadata.xml
+++ b/dev-util/unifdef/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml
index c019dcc590d4..24cee61bf4f6 100644
--- a/dev-util/universalindentgui/metadata.xml
+++ b/dev-util/universalindentgui/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="html">Add support for HTML files</flag>
 	</use>
diff --git a/dev-util/vdkbuilder/metadata.xml b/dev-util/vdkbuilder/metadata.xml
index 7f6fbc2997c2..9b4d256ecd8c 100644
--- a/dev-util/vdkbuilder/metadata.xml
+++ b/dev-util/vdkbuilder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lang-misc</herd>
 	<upstream>
 		<remote-id type="sourceforge">vdkbuilder</remote-id>
 	</upstream>
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
index f5b2d29b8036..602403218447 100644
--- a/dev-util/visual-regexp/metadata.xml
+++ b/dev-util/visual-regexp/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>quentin@minster.io</email>
 		<name>Quentin Minster</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
index 2c5fccdf3d93..d39e9af86c8c 100644
--- a/dev-util/visualvm/metadata.xml
+++ b/dev-util/visualvm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>The IcedTea project provides a harness to build the source code from VisualVM. </longdescription>
 </pkgmetadata>
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
index a4d63710b914..957427e97ceb 100644
--- a/dev-util/w32api/metadata.xml
+++ b/dev-util/w32api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mingw</remote-id>
 	</upstream>
diff --git a/dev-util/watchr/metadata.xml b/dev-util/watchr/metadata.xml
index 3c43de11d5ec..409d99ea230c 100644
--- a/dev-util/watchr/metadata.xml
+++ b/dev-util/watchr/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>graaff@gentoo.org</email></maintainer>
-<herd>ruby</herd>
+<maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
index 3e44b6f956f2..16839d5f714f 100644
--- a/dev-util/webstorm/metadata.xml
+++ b/dev-util/webstorm/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>gert@gepe-biljarts.be</email>
 	<name>Gert Pellin</name>
 	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js
 </longdescription>
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index 4ed449fcc080..771faa7ed817 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 	    <email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+	    <email>java@gentoo.org</email>
+	    <name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">weka</remote-id>
 	</upstream>
diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
index fd3fa9a0ad5e..012ea5f8a72e 100644
--- a/dev-util/wstool/metadata.xml
+++ b/dev-util/wstool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vcstools/wstool</remote-id>
 	</upstream>
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
index 72b7c58382b4..0f042550d7df 100644
--- a/dev-util/wxglade/metadata.xml
+++ b/dev-util/wxglade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wxglade</remote-id>
 	</upstream>
diff --git a/dev-util/xmlindent/metadata.xml b/dev-util/xmlindent/metadata.xml
index bfcd6bf8d100..9a52c7f55d8d 100644
--- a/dev-util/xmlindent/metadata.xml
+++ b/dev-util/xmlindent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
index 41a7cb7c7441..ba98006324a1 100644
--- a/dev-util/yuicompressor/metadata.xml
+++ b/dev-util/yuicompressor/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">yui/yuicompressor</remote-id>
 	</upstream>
diff --git a/dev-vcs/bzr-explorer/metadata.xml b/dev-vcs/bzr-explorer/metadata.xml
index 764351126d2d..3548e6990ecb 100644
--- a/dev-vcs/bzr-explorer/metadata.xml
+++ b/dev-vcs/bzr-explorer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <longdescription lang="en">
     Bazaar Explorer is a desktop application for using the Bazaar
     Version Control System. It provides a high level interface to all
diff --git a/dev-vcs/bzr-fastimport/metadata.xml b/dev-vcs/bzr-fastimport/metadata.xml
index e8dc124c31fa..a5abaaa924f6 100644
--- a/dev-vcs/bzr-fastimport/metadata.xml
+++ b/dev-vcs/bzr-fastimport/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
-	<herd>bazaar</herd>
+	<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">bzr-fastimport</remote-id>
 	</upstream>
diff --git a/dev-vcs/bzr-git/metadata.xml b/dev-vcs/bzr-git/metadata.xml
index e74a92d1562c..7ade5c52972c 100644
--- a/dev-vcs/bzr-git/metadata.xml
+++ b/dev-vcs/bzr-git/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/bzr-gtk/metadata.xml b/dev-vcs/bzr-gtk/metadata.xml
index a41036fb8275..d54e96764a96 100644
--- a/dev-vcs/bzr-gtk/metadata.xml
+++ b/dev-vcs/bzr-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <longdescription lang="en">
     GTK+ Frontends to various Bazaar commands. Currently contains
     dialogs for almost all common operations, including annotate and
diff --git a/dev-vcs/bzr-rewrite/metadata.xml b/dev-vcs/bzr-rewrite/metadata.xml
index 49b47809416d..a8d1a675bbd9 100644
--- a/dev-vcs/bzr-rewrite/metadata.xml
+++ b/dev-vcs/bzr-rewrite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">bzr-rewrite</remote-id>
   </upstream>
diff --git a/dev-vcs/bzr-xmloutput/metadata.xml b/dev-vcs/bzr-xmloutput/metadata.xml
index db982428e047..e900e80fe71a 100644
--- a/dev-vcs/bzr-xmloutput/metadata.xml
+++ b/dev-vcs/bzr-xmloutput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">bzr-xmloutput</remote-id>
   </upstream>
diff --git a/dev-vcs/bzr/metadata.xml b/dev-vcs/bzr/metadata.xml
index 3950aca74bad..6ab2b316ce44 100644
--- a/dev-vcs/bzr/metadata.xml
+++ b/dev-vcs/bzr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <longdescription lang="en">
     Bazaar (``bzr``) is a decentralized revision control system, designed to be
     easy for developers and end users alike.  Bazaar is part of the GNU project
diff --git a/dev-vcs/bzrtools/metadata.xml b/dev-vcs/bzrtools/metadata.xml
index 5277693b7c63..6682f9247f1c 100644
--- a/dev-vcs/bzrtools/metadata.xml
+++ b/dev-vcs/bzrtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bazaar</herd>
+  <maintainer>
+    <email>bazaar@gentoo.org</email>
+    <name>Gentoo Bazaar Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">bzrtools</remote-id>
   </upstream>
diff --git a/dev-vcs/colorcvs/metadata.xml b/dev-vcs/colorcvs/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/dev-vcs/colorcvs/metadata.xml
+++ b/dev-vcs/colorcvs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/cvs-fast-export/metadata.xml b/dev-vcs/cvs-fast-export/metadata.xml
index d22bbde28e2d..a66e5719bfd9 100644
--- a/dev-vcs/cvs-fast-export/metadata.xml
+++ b/dev-vcs/cvs-fast-export/metadata.xml
@@ -5,7 +5,10 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">cvs-fast-export</remote-id>
 	</upstream>
diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
index 443275017827..2215855e64df 100644
--- a/dev-vcs/cvs/metadata.xml
+++ b/dev-vcs/cvs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cvs-utils</herd>
+  <maintainer>
+    <email>cvs-utils@gentoo.org</email>
+    <name>Gentoo CVS Project</name>
+  </maintainer>
   <use>
     <flag name="server">Enable server support</flag>
   </use>
diff --git a/dev-vcs/cvs2cl/metadata.xml b/dev-vcs/cvs2cl/metadata.xml
index 45023270b146..eb53a33fd8c1 100644
--- a/dev-vcs/cvs2cl/metadata.xml
+++ b/dev-vcs/cvs2cl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/cvsd/metadata.xml b/dev-vcs/cvsd/metadata.xml
index 45023270b146..eb53a33fd8c1 100644
--- a/dev-vcs/cvsd/metadata.xml
+++ b/dev-vcs/cvsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/cvsgraph/metadata.xml b/dev-vcs/cvsgraph/metadata.xml
index cff4061208b5..3f9ce96d5e93 100644
--- a/dev-vcs/cvsgraph/metadata.xml
+++ b/dev-vcs/cvsgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		CvsGraph is a utility to make a graphical representation of all
 		revisions and branches of a file in a CVS/RCS repository. It has been
diff --git a/dev-vcs/cvsps/metadata.xml b/dev-vcs/cvsps/metadata.xml
index e9a271ce1876..faab52a4fe8b 100644
--- a/dev-vcs/cvsps/metadata.xml
+++ b/dev-vcs/cvsps/metadata.xml
@@ -5,7 +5,10 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">cvsps</remote-id>
 	</upstream>
diff --git a/dev-vcs/cvsq/metadata.xml b/dev-vcs/cvsq/metadata.xml
index 45023270b146..eb53a33fd8c1 100644
--- a/dev-vcs/cvsq/metadata.xml
+++ b/dev-vcs/cvsq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/cvsutils/metadata.xml b/dev-vcs/cvsutils/metadata.xml
index 78866efc2780..5817bf3aa0da 100644
--- a/dev-vcs/cvsutils/metadata.xml
+++ b/dev-vcs/cvsutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cvs-utils</herd>
+	<maintainer>
+		<email>cvs-utils@gentoo.org</email>
+		<name>Gentoo CVS Project</name>
+	</maintainer>
 	<longdescription>
 		CVS Utilities are helpful scripts for working with CVS repositories
 		offline and online.  They include the ability to check file status,
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
index 91743df1aec2..c2f194da09c9 100644
--- a/dev-vcs/darcs/metadata.xml
+++ b/dev-vcs/darcs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
 <maintainer>
   <email>haskell@gentoo.org</email>
 </maintainer>
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 2e3bb62e6d80..1b476c4a8c97 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		git-annex allows managing files with git, without checking the file
 		contents into git. While that may seem paradoxical, it is useful when
diff --git a/dev-vcs/git-bzr-ng/metadata.xml b/dev-vcs/git-bzr-ng/metadata.xml
index 42972bdb6b29..4d4e03ff758d 100644
--- a/dev-vcs/git-bzr-ng/metadata.xml
+++ b/dev-vcs/git-bzr-ng/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
-	<herd>bazaar</herd>
+	<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">termie/git-bzr-ng</remote-id>
 	</upstream>
diff --git a/dev-vcs/git-sh/metadata.xml b/dev-vcs/git-sh/metadata.xml
index c6a8dc624659..3ab24f1c628f 100644
--- a/dev-vcs/git-sh/metadata.xml
+++ b/dev-vcs/git-sh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
index 84a416fc9225..329a385a30db 100644
--- a/dev-vcs/gitg/metadata.xml
+++ b/dev-vcs/gitg/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
   <maintainer>
     <email>ikelos@gentoo.org</email>
     <name>Mike Auty</name>
   </maintainer>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">
 		GTK+ based frontend for GIT
 	</longdescription>
diff --git a/dev-vcs/gitinspector/metadata.xml b/dev-vcs/gitinspector/metadata.xml
index a831c76ff49a..91254dc00844 100644
--- a/dev-vcs/gitinspector/metadata.xml
+++ b/dev-vcs/gitinspector/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="github">ejwa/gitinspector</remote-id>
   </upstream>
diff --git a/dev-vcs/gitsh/metadata.xml b/dev-vcs/gitsh/metadata.xml
index 17ad8d3eedf3..0ddbd85e8bf5 100644
--- a/dev-vcs/gitsh/metadata.xml
+++ b/dev-vcs/gitsh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="github">thoughtbot/gitsh</remote-id>
   </upstream>
diff --git a/dev-vcs/gitstats/metadata.xml b/dev-vcs/gitstats/metadata.xml
index aa37752f43bb..c90617ac5d84 100644
--- a/dev-vcs/gitstats/metadata.xml
+++ b/dev-vcs/gitstats/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="sourceforge">gitstats</remote-id>
   </upstream>
diff --git a/dev-vcs/hgview/metadata.xml b/dev-vcs/hgview/metadata.xml
index 03e6087438f3..5fd580d2cb15 100644
--- a/dev-vcs/hgview/metadata.xml
+++ b/dev-vcs/hgview/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
   <maintainer>
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">hgview</remote-id>
   </upstream>
diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml
index aae019204ec7..f84c7870ce72 100644
--- a/dev-vcs/kdesvn/metadata.xml
+++ b/dev-vcs/kdesvn/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
-	<herd>kde</herd>
 	<maintainer>
 		<email>george@gentoo.org</email>
 		<name>George Shapovalov</name>
 	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml
index 968c07b67dee..027f55ba787b 100644
--- a/dev-vcs/monotone/metadata.xml
+++ b/dev-vcs/monotone/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-  <maintainer>
+<maintainer>
     <email>johnny@localmomentum.net</email>
     <name>Jonny</name>
 	<description>Future Maintainer</description>
@@ -11,6 +10,10 @@
   <email>pva@gentoo.org</email>
   <name>Peter Volkov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     A free distributed version control system. It provides a simple,
     single-file transactional version store, with fully disconnected
diff --git a/dev-vcs/qbzr/metadata.xml b/dev-vcs/qbzr/metadata.xml
index b5b93b4d45d9..434f8b3465b8 100644
--- a/dev-vcs/qbzr/metadata.xml
+++ b/dev-vcs/qbzr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>bazaar</herd>
+	<maintainer>
+		<email>bazaar@gentoo.org</email>
+		<name>Gentoo Bazaar Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">qbzr</remote-id>
 	</upstream>
diff --git a/dev-vcs/qct/metadata.xml b/dev-vcs/qct/metadata.xml
index d94b6fdb1e08..ec1d3de92068 100644
--- a/dev-vcs/qct/metadata.xml
+++ b/dev-vcs/qct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="bazaar">
       Support for <pkg>dev-vcs/bzr</pkg>
diff --git a/dev-vcs/qsvn/metadata.xml b/dev-vcs/qsvn/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/dev-vcs/qsvn/metadata.xml
+++ b/dev-vcs/qsvn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/rapidsvn/metadata.xml b/dev-vcs/rapidsvn/metadata.xml
index f093f104d17c..abe93a9f3f74 100644
--- a/dev-vcs/rapidsvn/metadata.xml
+++ b/dev-vcs/rapidsvn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dev-tools</herd>
   <longdescription>
 RapidSVN is a cross-platform GUI front-end for the Subversion revision 
 system written in C++ using the wxWidgets framework. This project also 
diff --git a/dev-vcs/rcsi/metadata.xml b/dev-vcs/rcsi/metadata.xml
index cb2f040031cf..d10160480a02 100644
--- a/dev-vcs/rcsi/metadata.xml
+++ b/dev-vcs/rcsi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cvs-utils</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>cvs-utils@gentoo.org</email>
+  <name>Gentoo CVS Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/statcvs/metadata.xml b/dev-vcs/statcvs/metadata.xml
index 064ac2bacdfc..689e55481df5 100644
--- a/dev-vcs/statcvs/metadata.xml
+++ b/dev-vcs/statcvs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>java@gentoo.org</email>
   </maintainer>
diff --git a/dev-vcs/statsvn/metadata.xml b/dev-vcs/statsvn/metadata.xml
index e927a7d48597..ebde08466097 100644
--- a/dev-vcs/statsvn/metadata.xml
+++ b/dev-vcs/statsvn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
   <maintainer>
     <email>java@gentoo.org</email>
   </maintainer>
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
index 6ad69ab1f95c..036c12fe3e91 100644
--- a/dev-vcs/stgit/metadata.xml
+++ b/dev-vcs/stgit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>gentoo@necoro.eu</email>
   <name>René 'Necoro' Neumann</name>
@@ -15,4 +14,8 @@
   <email>flameeyes@gentoo.org</email>
   <description>Proxy/Backup, CC bugs</description>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/svn2cl/metadata.xml b/dev-vcs/svn2cl/metadata.xml
index 028d1cef3af8..097975e3adc2 100644
--- a/dev-vcs/svn2cl/metadata.xml
+++ b/dev-vcs/svn2cl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 </pkgmetadata>
diff --git a/dev-vcs/tkcvs/metadata.xml b/dev-vcs/tkcvs/metadata.xml
index 815cc916f2b6..ff185e9c11ba 100644
--- a/dev-vcs/tkcvs/metadata.xml
+++ b/dev-vcs/tkcvs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-action/0verkill/metadata.xml b/games-action/0verkill/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/0verkill/metadata.xml
+++ b/games-action/0verkill/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/abuse/metadata.xml b/games-action/abuse/metadata.xml
index f72870c0c28d..e86d7ab2b7bf 100644
--- a/games-action/abuse/metadata.xml
+++ b/games-action/abuse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-action/accelerator3d/metadata.xml b/games-action/accelerator3d/metadata.xml
index c22ed7a09453..579448bf7e0e 100644
--- a/games-action/accelerator3d/metadata.xml
+++ b/games-action/accelerator3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">accelerator3d</remote-id>
 	</upstream>
diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml
index 3ddf64ba758b..3d1b80fc7426 100644
--- a/games-action/armagetronad/metadata.xml
+++ b/games-action/armagetronad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">armagetronad</remote-id>
 	</upstream>
diff --git a/games-action/atanks/metadata.xml b/games-action/atanks/metadata.xml
index b9994564225c..335b7083c946 100644
--- a/games-action/atanks/metadata.xml
+++ b/games-action/atanks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">atanks</remote-id>
 	</upstream>
diff --git a/games-action/awesomenauts/metadata.xml b/games-action/awesomenauts/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-action/awesomenauts/metadata.xml
+++ b/games-action/awesomenauts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-action/barrage/metadata.xml b/games-action/barrage/metadata.xml
index 0f9429dd0de0..f2eba1bcb2a3 100644
--- a/games-action/barrage/metadata.xml
+++ b/games-action/barrage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgames</remote-id>
 	</upstream>
diff --git a/games-action/battalion/metadata.xml b/games-action/battalion/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/battalion/metadata.xml
+++ b/games-action/battalion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/beathazardultra/metadata.xml b/games-action/beathazardultra/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-action/beathazardultra/metadata.xml
+++ b/games-action/beathazardultra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-action/bomberclone/metadata.xml b/games-action/bomberclone/metadata.xml
index 2c5c4b0302ac..5243fbf80899 100644
--- a/games-action/bomberclone/metadata.xml
+++ b/games-action/bomberclone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bomberclone</remote-id>
 	</upstream>
diff --git a/games-action/brutal-legend/metadata.xml b/games-action/brutal-legend/metadata.xml
index 61daea7cd59c..1b895e45a1ee 100644
--- a/games-action/brutal-legend/metadata.xml
+++ b/games-action/brutal-legend/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Jack Black stars as Eddie Riggs, a roadie who’s sucked into a
 		mythical Age of Rock to fight evil, liberate an army of headbangers
diff --git a/games-action/btanks/metadata.xml b/games-action/btanks/metadata.xml
index f9be16e9e21f..378703d46d79 100644
--- a/games-action/btanks/metadata.xml
+++ b/games-action/btanks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 "Battle Tanks" is a funny battle on your desk, where you can choose one of three
 vehicles and eliminate your enemy using the whole arsenal of weapons. It has
diff --git a/games-action/bzflag/metadata.xml b/games-action/bzflag/metadata.xml
index ebec991ee847..422102e4ab8b 100644
--- a/games-action/bzflag/metadata.xml
+++ b/games-action/bzflag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bzflag</remote-id>
 	</upstream>
diff --git a/games-action/chickens/metadata.xml b/games-action/chickens/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/chickens/metadata.xml
+++ b/games-action/chickens/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/chromium-bsu/metadata.xml b/games-action/chromium-bsu/metadata.xml
index 7027aec68768..0b75629b340d 100644
--- a/games-action/chromium-bsu/metadata.xml
+++ b/games-action/chromium-bsu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="mixer">
 		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend instead of
diff --git a/games-action/clanbomber/metadata.xml b/games-action/clanbomber/metadata.xml
index 77a5395f55fb..159026b074ab 100644
--- a/games-action/clanbomber/metadata.xml
+++ b/games-action/clanbomber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib, a free multi 
 platform C++ game SDK. First "ClanBomber" was only a working title for a small game started in 
diff --git a/games-action/cs2d/metadata.xml b/games-action/cs2d/metadata.xml
index 921b2ff4ce3f..52eb3732edc4 100644
--- a/games-action/cs2d/metadata.xml
+++ b/games-action/cs2d/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<herd>games</herd>
 <maintainer>
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
@@ -10,4 +8,12 @@
 <maintainer>
 	<email>oleg@kaa.org.ua</email>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
index f6929f284230..0b2d9889a532 100644
--- a/games-action/d1x-rebirth/metadata.xml
+++ b/games-action/d1x-rebirth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Descent 1 is a classic first-person shooter released in 1995 by Interplay 
 and Parallax.  It was one of the first games with true 3-dimensional 
diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml
index 5a4f52b78c1d..a3c4153d4fb4 100644
--- a/games-action/d2x-rebirth/metadata.xml
+++ b/games-action/d2x-rebirth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="demo">Install <pkg>games-action/descent2-demodata</pkg> as well</flag>
     <flag name="music">Support for ingame music</flag>
diff --git a/games-action/deathchase3d/metadata.xml b/games-action/deathchase3d/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/deathchase3d/metadata.xml
+++ b/games-action/deathchase3d/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/descent1-demodata/metadata.xml b/games-action/descent1-demodata/metadata.xml
index 821c5f02b7fe..3f0d66f0affc 100644
--- a/games-action/descent1-demodata/metadata.xml
+++ b/games-action/descent1-demodata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Descent 1 is a classic first-person shooter released in 1995 by Interplay 
 and Parallax.  It was one of the first games with true 3-dimensional 
diff --git a/games-action/descent2-data/metadata.xml b/games-action/descent2-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/descent2-data/metadata.xml
+++ b/games-action/descent2-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/descent2-demodata/metadata.xml b/games-action/descent2-demodata/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/descent2-demodata/metadata.xml
+++ b/games-action/descent2-demodata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/descent3-demo/metadata.xml b/games-action/descent3-demo/metadata.xml
index 799357326bea..0c7ef5bb6d27 100644
--- a/games-action/descent3-demo/metadata.xml
+++ b/games-action/descent3-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Descent 3 is a first-person 3-D action flight-sim which takes place in both
 indoor and outdoor arenas.  The game was ported to Linux by the now defunct Loki
diff --git a/games-action/descent3/metadata.xml b/games-action/descent3/metadata.xml
index cefc721b94c3..87786a4f34f7 100644
--- a/games-action/descent3/metadata.xml
+++ b/games-action/descent3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Descent 3 is a first-person 3-D action flight-sim which takes place in both indoor and outdoor arenas.  The game was ported to Linux by the now defunct Loki Entertainment and is commercial software.  You can still pick up a copy from Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher is no longer in business.
 </longdescription>
diff --git a/games-action/extreme-tuxracer/metadata.xml b/games-action/extreme-tuxracer/metadata.xml
index 93658409190f..d5efc3bcaa2a 100644
--- a/games-action/extreme-tuxracer/metadata.xml
+++ b/games-action/extreme-tuxracer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Extreme Tux Racer is an open source racing game featuring Tux the Linux Penguin.
 ETRacer continues in the tracks of Tux Racer and its forks.
diff --git a/games-action/fakk2/metadata.xml b/games-action/fakk2/metadata.xml
index 1f425a350d7e..679f5a46bf60 100644
--- a/games-action/fakk2/metadata.xml
+++ b/games-action/fakk2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Heavy Metal: F.A.K.K.2 is a third-person 3-D action game based on characters from the Heavy Metal comics and movies.  Years have passed since Julie Strain (a.k.a. F.A.K.K.2) defeated the would-be God Lord Tyler on the bloody battlefields of the Holy Land. She has long since put the pain of those days behind her and brought her homeworld of Eden to a perfect natural balance. But far away in the deepest nebulas of space, the greatest evil of all stirs, ready to make its final move -- to take control of the entire universe. A lone beacon hurtles toward Eden, hoping to summon the god-slayer F.A.K.K.2 one last time. It bears nothing more than an onimous warning: "GITH IS COMING."  The game was ported to Linux by the now defunct Loki Entertainment and is commercial software.  You can still pick up a copy from Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher is no longer in business.
 </longdescription>
diff --git a/games-action/formido/metadata.xml b/games-action/formido/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/formido/metadata.xml
+++ b/games-action/formido/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/garden/metadata.xml b/games-action/garden/metadata.xml
index e6459c07f8a7..594c1323fa10 100644
--- a/games-action/garden/metadata.xml
+++ b/games-action/garden/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">garden</remote-id>
 	</upstream>
diff --git a/games-action/geki2-KXL/metadata.xml b/games-action/geki2-KXL/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/geki2-KXL/metadata.xml
+++ b/games-action/geki2-KXL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/geki3-KXL/metadata.xml b/games-action/geki3-KXL/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/geki3-KXL/metadata.xml
+++ b/games-action/geki3-KXL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/gltron/metadata.xml b/games-action/gltron/metadata.xml
index cf8792227341..4a2c033fe768 100644
--- a/games-action/gltron/metadata.xml
+++ b/games-action/gltron/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gltron</remote-id>
 	</upstream>
diff --git a/games-action/heretic2-demo/metadata.xml b/games-action/heretic2-demo/metadata.xml
index a72ae8ca0315..7db579e33dc4 100644
--- a/games-action/heretic2-demo/metadata.xml
+++ b/games-action/heretic2-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Power up your mana and help Corvus find the cure to a plague of epic dimensions -- and save the worlds of D'sparil before it's too late!  A high-powered and mystical three-dimensional environment will enthrall you, with spectacular sound and visual effects, non-stop action and adventure.  Prepare to be ensnared in the visual feast that is the worlds of D'sparil.  This is the demo version of the commercially-ported game.
 </longdescription>
diff --git a/games-action/heretic2/metadata.xml b/games-action/heretic2/metadata.xml
index 668ca6c70661..bb9ce27abbfe 100644
--- a/games-action/heretic2/metadata.xml
+++ b/games-action/heretic2/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>tristan@gentoo.org</email>
 		<name>Tristan Heaven</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-action/heroes/metadata.xml b/games-action/heroes/metadata.xml
index 1ce25c831678..6aec2cd68762 100644
--- a/games-action/heroes/metadata.xml
+++ b/games-action/heroes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">heroes</remote-id>
 	</upstream>
diff --git a/games-action/hotline-miami/metadata.xml b/games-action/hotline-miami/metadata.xml
index e5a44ead0121..298888f50877 100644
--- a/games-action/hotline-miami/metadata.xml
+++ b/games-action/hotline-miami/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 		<flag name="launcher">Install qt launcher</flag>
diff --git a/games-action/intrusion2/metadata.xml b/games-action/intrusion2/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-action/intrusion2/metadata.xml
+++ b/games-action/intrusion2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-action/koth/metadata.xml b/games-action/koth/metadata.xml
index fffb26d543b6..f9f50be8e686 100644
--- a/games-action/koth/metadata.xml
+++ b/games-action/koth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 King of the Hill (KOTH) is a multiplayer, networked artillery game of little tanks with really big weapons set out to destroy one another. Best-known games of this type include the classic DOS game "Scorched Earth: The Mother of All Games" and "Scorched Tanks" for the Amiga.
 </longdescription>
diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
index 44fd866000da..ffed43cf23ea 100644
--- a/games-action/lugaru/metadata.xml
+++ b/games-action/lugaru/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">osslugaru/lugaru</remote-id>
 	</upstream>
diff --git a/games-action/luola/metadata.xml b/games-action/luola/metadata.xml
index 7833f208568e..9946a155ea18 100644
--- a/games-action/luola/metadata.xml
+++ b/games-action/luola/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">luola</remote-id>
 	</upstream>
diff --git a/games-action/maelstrom/metadata.xml b/games-action/maelstrom/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/maelstrom/metadata.xml
+++ b/games-action/maelstrom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 2d7fb9c4eb1b..674e0deac665 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maddin081591@gmail.com</email>
 		<name>Martin-Kevin Neumann</name>
 		<description>Proxy maintainer, CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Minetest is an infinite-world block sandbox game and a game
 		engine, inspired by InfiniMiner, Minecraft and the like. It has
diff --git a/games-action/minetest_game/metadata.xml b/games-action/minetest_game/metadata.xml
index 6659e0aafe4b..c794af3a301b 100644
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maddin081591@gmail.com</email>
 		<name>Martin-Kevin Neumann</name>
 		<description>Proxy maintainer, CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
 		<remote-id type="github">minetest/minetest_game</remote-id>
diff --git a/games-action/moon-buggy/metadata.xml b/games-action/moon-buggy/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/moon-buggy/metadata.xml
+++ b/games-action/moon-buggy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/mutantstorm-demo/metadata.xml b/games-action/mutantstorm-demo/metadata.xml
index 2a729cb8a838..9c3988ac32c9 100644
--- a/games-action/mutantstorm-demo/metadata.xml
+++ b/games-action/mutantstorm-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Mutant Storm progresses over 89 levels of psychedelic 3D arenas, that get 
 ever more crowded with nasty beasties. This carnival of frenetic fun is 
diff --git a/games-action/nighthawk/metadata.xml b/games-action/nighthawk/metadata.xml
index 8569ac0ab1a1..91902b5ca79f 100644
--- a/games-action/nighthawk/metadata.xml
+++ b/games-action/nighthawk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">night-hawk</remote-id>
 	</upstream>
diff --git a/games-action/noiz2sa/metadata.xml b/games-action/noiz2sa/metadata.xml
index 331014e08527..e480adafa0d3 100644
--- a/games-action/noiz2sa/metadata.xml
+++ b/games-action/noiz2sa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">noiz2sa</remote-id>
 	</upstream>
diff --git a/games-action/openastromenace/metadata.xml b/games-action/openastromenace/metadata.xml
index 187d75a84626..c5604ed3243f 100644
--- a/games-action/openastromenace/metadata.xml
+++ b/games-action/openastromenace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openastromenace</remote-id>
 	</upstream>
diff --git a/games-action/openclonk/metadata.xml b/games-action/openclonk/metadata.xml
index b0ce92abfafc..a1ab2d0d140e 100644
--- a/games-action/openclonk/metadata.xml
+++ b/games-action/openclonk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<changelog>http://hg.openclonk.org/openclonk/</changelog>
 		<doc lang="en">http://wiki.openclonk.org/w/C4Script_Documentation</doc>
diff --git a/games-action/openlierox/metadata.xml b/games-action/openlierox/metadata.xml
index 303eb3bc6f12..40406bf5b380 100644
--- a/games-action/openlierox/metadata.xml
+++ b/games-action/openlierox/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="breakpad">
 			Compile with support for
diff --git a/games-action/orbital-eunuchs-sniper/metadata.xml b/games-action/orbital-eunuchs-sniper/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/orbital-eunuchs-sniper/metadata.xml
+++ b/games-action/orbital-eunuchs-sniper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/phobiaii/metadata.xml b/games-action/phobiaii/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/phobiaii/metadata.xml
+++ b/games-action/phobiaii/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/poopmup/metadata.xml b/games-action/poopmup/metadata.xml
index c06792ddfaaf..94c228ffda2d 100644
--- a/games-action/poopmup/metadata.xml
+++ b/games-action/poopmup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">poopmup</remote-id>
 	</upstream>
diff --git a/games-action/postalplus/metadata.xml b/games-action/postalplus/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/postalplus/metadata.xml
+++ b/games-action/postalplus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/powermanga/metadata.xml b/games-action/powermanga/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/powermanga/metadata.xml
+++ b/games-action/powermanga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/rafkill/metadata.xml b/games-action/rafkill/metadata.xml
index dea8299ff8d4..f81e6e7b7c0a 100644
--- a/games-action/rafkill/metadata.xml
+++ b/games-action/rafkill/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">raptorv2</remote-id>
 	</upstream>
diff --git a/games-action/rrootage/metadata.xml b/games-action/rrootage/metadata.xml
index f598ac280d72..76c87962fd63 100644
--- a/games-action/rrootage/metadata.xml
+++ b/games-action/rrootage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rrootage</remote-id>
 	</upstream>
diff --git a/games-action/rune/metadata.xml b/games-action/rune/metadata.xml
index 2f144290bc94..1e2c603b6720 100644
--- a/games-action/rune/metadata.xml
+++ b/games-action/rune/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Loki, god of deception and mischief was the bane of the gods, a black sheep who
 tormented all the heavens with his persistent schemes for personal power.
diff --git a/games-action/shadowgrounds-bin/metadata.xml b/games-action/shadowgrounds-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/shadowgrounds-bin/metadata.xml
+++ b/games-action/shadowgrounds-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/shadowgrounds-survivor-bin/metadata.xml b/games-action/shadowgrounds-survivor-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/shadowgrounds-survivor-bin/metadata.xml
+++ b/games-action/shadowgrounds-survivor-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/shootingstar/metadata.xml b/games-action/shootingstar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/shootingstar/metadata.xml
+++ b/games-action/shootingstar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/slune/metadata.xml b/games-action/slune/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/slune/metadata.xml
+++ b/games-action/slune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/snipes/metadata.xml b/games-action/snipes/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/snipes/metadata.xml
+++ b/games-action/snipes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-action/solar2/metadata.xml
+++ b/games-action/solar2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-action/spacearyarya-kxl/metadata.xml b/games-action/spacearyarya-kxl/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/spacearyarya-kxl/metadata.xml
+++ b/games-action/spacearyarya-kxl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/spacetripper-demo/metadata.xml b/games-action/spacetripper-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/spacetripper-demo/metadata.xml
+++ b/games-action/spacetripper-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-action/super-hexagon/metadata.xml
+++ b/games-action/super-hexagon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
index 701854e762a8..9025f587405e 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="fribidi">Support for right-to-left languages</flag>
 		<flag name="wiimote">Support for wiimote input devices</flag>
diff --git a/games-action/swordandsworcery/metadata.xml b/games-action/swordandsworcery/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-action/swordandsworcery/metadata.xml
+++ b/games-action/swordandsworcery/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-action/teeworlds/metadata.xml b/games-action/teeworlds/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-action/teeworlds/metadata.xml
+++ b/games-action/teeworlds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-action/towbowl-tactics/metadata.xml b/games-action/towbowl-tactics/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/towbowl-tactics/metadata.xml
+++ b/games-action/towbowl-tactics/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/transcend/metadata.xml b/games-action/transcend/metadata.xml
index d73d354bd0db..4fd28fd08c68 100644
--- a/games-action/transcend/metadata.xml
+++ b/games-action/transcend/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">transcend</remote-id>
 	</upstream>
diff --git a/games-action/trine-bin/metadata.xml b/games-action/trine-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/trine-bin/metadata.xml
+++ b/games-action/trine-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/trine2/metadata.xml b/games-action/trine2/metadata.xml
index c87b23f21fba..15b193bbb6d1 100644
--- a/games-action/trine2/metadata.xml
+++ b/games-action/trine2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 		<flag name="launcher">Install gtk+ launcher</flag>
diff --git a/games-action/trosh/metadata.xml b/games-action/trosh/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-action/trosh/metadata.xml
+++ b/games-action/trosh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-action/tuxkart/metadata.xml b/games-action/tuxkart/metadata.xml
index 351ab939a4a8..ec93ac765dec 100644
--- a/games-action/tuxkart/metadata.xml
+++ b/games-action/tuxkart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tuxkart</remote-id>
 	</upstream>
diff --git a/games-action/violetland/metadata.xml b/games-action/violetland/metadata.xml
index 039266550caf..d35a0a852065 100644
--- a/games-action/violetland/metadata.xml
+++ b/games-action/violetland/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">violetland</remote-id>
 	</upstream>
diff --git a/games-action/wordwarvi/metadata.xml b/games-action/wordwarvi/metadata.xml
index 5f8fcc05224e..cee41a09eb16 100644
--- a/games-action/wordwarvi/metadata.xml
+++ b/games-action/wordwarvi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wordwarvi</remote-id>
 	</upstream>
diff --git a/games-action/xblast/metadata.xml b/games-action/xblast/metadata.xml
index a623356437a4..6043db6be6ca 100644
--- a/games-action/xblast/metadata.xml
+++ b/games-action/xblast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xblast</remote-id>
 	</upstream>
diff --git a/games-action/xbomber/metadata.xml b/games-action/xbomber/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-action/xbomber/metadata.xml
+++ b/games-action/xbomber/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-action/xpilot/metadata.xml b/games-action/xpilot/metadata.xml
index d35614714d1e..09d490c88ed6 100644
--- a/games-action/xpilot/metadata.xml
+++ b/games-action/xpilot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xpilotgame</remote-id>
 	</upstream>
diff --git a/games-arcade/abe/metadata.xml b/games-arcade/abe/metadata.xml
index e94a66c0dd94..38d2d538a17a 100644
--- a/games-arcade/abe/metadata.xml
+++ b/games-arcade/abe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">abe</remote-id>
 	</upstream>
diff --git a/games-arcade/afternoonstalker/metadata.xml b/games-arcade/afternoonstalker/metadata.xml
index 112b2c3dc17e..a017cba54c3e 100644
--- a/games-arcade/afternoonstalker/metadata.xml
+++ b/games-arcade/afternoonstalker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
 Electronics.
diff --git a/games-arcade/alienwave/metadata.xml b/games-arcade/alienwave/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-arcade/alienwave/metadata.xml
+++ b/games-arcade/alienwave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/amphetamine/metadata.xml b/games-arcade/amphetamine/metadata.xml
index 65706f28dade..4b1b8b0fa8ef 100644
--- a/games-arcade/amphetamine/metadata.xml
+++ b/games-arcade/amphetamine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Amphetamine is a cool Jump'n Run game offering some unique visual effects.
 </longdescription>
diff --git a/games-arcade/aop/metadata.xml b/games-arcade/aop/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/aop/metadata.xml
+++ b/games-arcade/aop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/apricots/metadata.xml b/games-arcade/apricots/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/apricots/metadata.xml
+++ b/games-arcade/apricots/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/aquaria/metadata.xml b/games-arcade/aquaria/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/aquaria/metadata.xml
+++ b/games-arcade/aquaria/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/ascii-invaders/metadata.xml b/games-arcade/ascii-invaders/metadata.xml
index f8b1597439de..41925217f605 100644
--- a/games-arcade/ascii-invaders/metadata.xml
+++ b/games-arcade/ascii-invaders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Ascii-Invaders is a clone of Space Invaders for text-terminals using the 
 curses library. It compiles and runs on MacOS X, GNU/Linux and probably 
diff --git a/games-arcade/asteroid/metadata.xml b/games-arcade/asteroid/metadata.xml
index aa0fd15ec698..b8d06115eae4 100644
--- a/games-arcade/asteroid/metadata.xml
+++ b/games-arcade/asteroid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chaoslizard</remote-id>
 	</upstream>
diff --git a/games-arcade/balloonchase/metadata.xml b/games-arcade/balloonchase/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/balloonchase/metadata.xml
+++ b/games-arcade/balloonchase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/barbarian-bin/metadata.xml b/games-arcade/barbarian-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/barbarian-bin/metadata.xml
+++ b/games-arcade/barbarian-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/batrachians/metadata.xml b/games-arcade/batrachians/metadata.xml
index 112b2c3dc17e..a017cba54c3e 100644
--- a/games-arcade/batrachians/metadata.xml
+++ b/games-arcade/batrachians/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
 Electronics.
diff --git a/games-arcade/berusky/metadata.xml b/games-arcade/berusky/metadata.xml
index 2dc670913f47..9d8e7bec6ad3 100644
--- a/games-arcade/berusky/metadata.xml
+++ b/games-arcade/berusky/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Berusky is a free logic game, published under GNU Public License and it's based
 on an ancient puzzle named Sokoban.
diff --git a/games-arcade/betna/metadata.xml b/games-arcade/betna/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/betna/metadata.xml
+++ b/games-arcade/betna/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/blobby/metadata.xml b/games-arcade/blobby/metadata.xml
index 54fc8e0db93d..8189906629c0 100644
--- a/games-arcade/blobby/metadata.xml
+++ b/games-arcade/blobby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">blobby</remote-id>
 	</upstream>
diff --git a/games-arcade/bloboats/metadata.xml b/games-arcade/bloboats/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/bloboats/metadata.xml
+++ b/games-arcade/bloboats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/blobwars/metadata.xml b/games-arcade/blobwars/metadata.xml
index 6e3e4b851f2a..5b13ba30f0d8 100644
--- a/games-arcade/blobwars/metadata.xml
+++ b/games-arcade/blobwars/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">blobwars</remote-id>
 	</upstream>
diff --git a/games-arcade/blockrage/metadata.xml b/games-arcade/blockrage/metadata.xml
index 9f40ff536fad..1136e259aabd 100644
--- a/games-arcade/blockrage/metadata.xml
+++ b/games-arcade/blockrage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 An arcade game with addictive gameplay and a 2-player hotseat mode.
 </longdescription>
diff --git a/games-arcade/bomns/metadata.xml b/games-arcade/bomns/metadata.xml
index 42a753fb437a..8ab24068a35d 100644
--- a/games-arcade/bomns/metadata.xml
+++ b/games-arcade/bomns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="editor">enables building the level editor</flag>
   </use>
diff --git a/games-arcade/briquolo/metadata.xml b/games-arcade/briquolo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/briquolo/metadata.xml
+++ b/games-arcade/briquolo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/bub-n-bros/metadata.xml b/games-arcade/bub-n-bros/metadata.xml
index a24d22ec375b..91b822a7a1ed 100644
--- a/games-arcade/bub-n-bros/metadata.xml
+++ b/games-arcade/bub-n-bros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bub-n-bros</remote-id>
 	</upstream>
diff --git a/games-arcade/bumprace/metadata.xml b/games-arcade/bumprace/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/bumprace/metadata.xml
+++ b/games-arcade/bumprace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/burgerspace/metadata.xml b/games-arcade/burgerspace/metadata.xml
index 4d4304ba05a8..394b92b434e0 100644
--- a/games-arcade/burgerspace/metadata.xml
+++ b/games-arcade/burgerspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="network">Enable client-server support</flag>
   </use>
diff --git a/games-arcade/cavezofphear/metadata.xml b/games-arcade/cavezofphear/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/cavezofphear/metadata.xml
+++ b/games-arcade/cavezofphear/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/cdogs-sdl/metadata.xml b/games-arcade/cdogs-sdl/metadata.xml
index 0999c6a1d83a..263106ce8272 100644
--- a/games-arcade/cdogs-sdl/metadata.xml
+++ b/games-arcade/cdogs-sdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 C-Dogs is an arcade shoot-em-up which lets players work alone and
 cooperatively during missions or fight against each other in the "dogfight"
diff --git a/games-arcade/ceferino/metadata.xml b/games-arcade/ceferino/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/ceferino/metadata.xml
+++ b/games-arcade/ceferino/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/circuslinux/metadata.xml b/games-arcade/circuslinux/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/circuslinux/metadata.xml
+++ b/games-arcade/circuslinux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/cob/metadata.xml b/games-arcade/cob/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/cob/metadata.xml
+++ b/games-arcade/cob/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/commandergenius/metadata.xml b/games-arcade/commandergenius/metadata.xml
index 7fb3a298b1c0..2e148edde704 100644
--- a/games-arcade/commandergenius/metadata.xml
+++ b/games-arcade/commandergenius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="tremor">
 			Use <pkg>media-libs/tremor</pkg> as ogg decoder
diff --git a/games-arcade/conveysdl/metadata.xml b/games-arcade/conveysdl/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/conveysdl/metadata.xml
+++ b/games-arcade/conveysdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/cosmosmash/metadata.xml b/games-arcade/cosmosmash/metadata.xml
index 112b2c3dc17e..a017cba54c3e 100644
--- a/games-arcade/cosmosmash/metadata.xml
+++ b/games-arcade/cosmosmash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
 Electronics.
diff --git a/games-arcade/crack-attack/metadata.xml b/games-arcade/crack-attack/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/crack-attack/metadata.xml
+++ b/games-arcade/crack-attack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/criticalmass/metadata.xml b/games-arcade/criticalmass/metadata.xml
index 8b6d907abada..b6be645e0f24 100644
--- a/games-arcade/criticalmass/metadata.xml
+++ b/games-arcade/criticalmass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">criticalmass</remote-id>
 	</upstream>
diff --git a/games-arcade/defendguin/metadata.xml b/games-arcade/defendguin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/defendguin/metadata.xml
+++ b/games-arcade/defendguin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/diameter/metadata.xml b/games-arcade/diameter/metadata.xml
index 359e555a56b2..d8285e701b5b 100644
--- a/games-arcade/diameter/metadata.xml
+++ b/games-arcade/diameter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 "Diameter" - is an arcade-style game with elements of economy and adventure.
 Project's main objective is to make a distinctive game with a storm gameplay and
diff --git a/games-arcade/digger/metadata.xml b/games-arcade/digger/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/digger/metadata.xml
+++ b/games-arcade/digger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/dynamitejack/metadata.xml b/games-arcade/dynamitejack/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-arcade/dynamitejack/metadata.xml
+++ b/games-arcade/dynamitejack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/emilia-pinball/metadata.xml b/games-arcade/emilia-pinball/metadata.xml
index 169596646163..2b7264cbebac 100644
--- a/games-arcade/emilia-pinball/metadata.xml
+++ b/games-arcade/emilia-pinball/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pinball</remote-id>
 	</upstream>
diff --git a/games-arcade/epiar/metadata.xml b/games-arcade/epiar/metadata.xml
index a48c9cd9695c..c8d383630cf0 100644
--- a/games-arcade/epiar/metadata.xml
+++ b/games-arcade/epiar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 Epiar is a space adventure/combat game written in C with SDL 
 (Simple DirectMedia Layer). It is absolutely free (released 
diff --git a/games-arcade/excido/metadata.xml b/games-arcade/excido/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/excido/metadata.xml
+++ b/games-arcade/excido/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/fishsupper/metadata.xml b/games-arcade/fishsupper/metadata.xml
index 6f7bdf45da78..7e3534c72895 100644
--- a/games-arcade/fishsupper/metadata.xml
+++ b/games-arcade/fishsupper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fishsupper</remote-id>
 	</upstream>
diff --git a/games-arcade/frozen-bubble/metadata.xml b/games-arcade/frozen-bubble/metadata.xml
index a8fe22f9e560..8b3f8c3fa4af 100644
--- a/games-arcade/frozen-bubble/metadata.xml
+++ b/games-arcade/frozen-bubble/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours and hours of 
 2p game, a level-editor, 3 professional quality 20-channels music tracks, 15 stereo sound 
diff --git a/games-arcade/funnyboat/metadata.xml b/games-arcade/funnyboat/metadata.xml
index f665da6a8949..e93171c1a72d 100644
--- a/games-arcade/funnyboat/metadata.xml
+++ b/games-arcade/funnyboat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">funnyboat</remote-id>
 	</upstream>
diff --git a/games-arcade/gav/metadata.xml b/games-arcade/gav/metadata.xml
index 08ee7f8ae0db..1dddd72f5c69 100644
--- a/games-arcade/gav/metadata.xml
+++ b/games-arcade/gav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gav</remote-id>
 	</upstream>
diff --git a/games-arcade/gish-demo/metadata.xml b/games-arcade/gish-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/gish-demo/metadata.xml
+++ b/games-arcade/gish-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/gnake/metadata.xml b/games-arcade/gnake/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/gnake/metadata.xml
+++ b/games-arcade/gnake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/gnome-nibbles/metadata.xml b/games-arcade/gnome-nibbles/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-arcade/gnome-nibbles/metadata.xml
+++ b/games-arcade/gnome-nibbles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/gnome-robots/metadata.xml b/games-arcade/gnome-robots/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-arcade/gnome-robots/metadata.xml
+++ b/games-arcade/gnome-robots/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/gnujump/metadata.xml b/games-arcade/gnujump/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/gnujump/metadata.xml
+++ b/games-arcade/gnujump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/grande-KXL/metadata.xml b/games-arcade/grande-KXL/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/grande-KXL/metadata.xml
+++ b/games-arcade/grande-KXL/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/gunocide2ex/metadata.xml b/games-arcade/gunocide2ex/metadata.xml
index e70e54d1aff7..a08ca79c3a19 100644
--- a/games-arcade/gunocide2ex/metadata.xml
+++ b/games-arcade/gunocide2ex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">g2ex</remote-id>
 	</upstream>
diff --git a/games-arcade/holotz-castle/metadata.xml b/games-arcade/holotz-castle/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/holotz-castle/metadata.xml
+++ b/games-arcade/holotz-castle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/insaneodyssey/metadata.xml b/games-arcade/insaneodyssey/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/insaneodyssey/metadata.xml
+++ b/games-arcade/insaneodyssey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/jardinains/metadata.xml b/games-arcade/jardinains/metadata.xml
index 92111f0d3a89..7d8267cd7ded 100644
--- a/games-arcade/jardinains/metadata.xml
+++ b/games-arcade/jardinains/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>Jardinains 2!, the sequel to Jardinains 1! (surprisingly
 	enough) is a fairly straightforward game. You have a paddle. You have a
 	ball. You have a whole bunch of bricks. Inside these bricks live ‘nains.
diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml
index 658a1ecd0c6d..f86815793878 100644
--- a/games-arcade/jumpnbump/metadata.xml
+++ b/games-arcade/jumpnbump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="music">Enable playing of background music</flag>
 </use>
diff --git a/games-arcade/jvgs/metadata.xml b/games-arcade/jvgs/metadata.xml
index 25da2874ba81..9e0aefb04b92 100644
--- a/games-arcade/jvgs/metadata.xml
+++ b/games-arcade/jvgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jvgs</remote-id>
 	</upstream>
diff --git a/games-arcade/kajaani-kombat/metadata.xml b/games-arcade/kajaani-kombat/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/kajaani-kombat/metadata.xml
+++ b/games-arcade/kajaani-kombat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/kobodeluxe/metadata.xml b/games-arcade/kobodeluxe/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/kobodeluxe/metadata.xml
+++ b/games-arcade/kobodeluxe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/komi/metadata.xml b/games-arcade/komi/metadata.xml
index 4156d2ec7dbf..626726e3fc82 100644
--- a/games-arcade/komi/metadata.xml
+++ b/games-arcade/komi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">komi</remote-id>
 	</upstream>
diff --git a/games-arcade/late/metadata.xml b/games-arcade/late/metadata.xml
index e4cbcf411f56..a34ec81f79a8 100644
--- a/games-arcade/late/metadata.xml
+++ b/games-arcade/late/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">late</remote-id>
 	</upstream>
diff --git a/games-arcade/lbreakout/metadata.xml b/games-arcade/lbreakout/metadata.xml
index 0f9429dd0de0..f2eba1bcb2a3 100644
--- a/games-arcade/lbreakout/metadata.xml
+++ b/games-arcade/lbreakout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgames</remote-id>
 	</upstream>
diff --git a/games-arcade/lbreakout2/metadata.xml b/games-arcade/lbreakout2/metadata.xml
index a218c5e37eda..5394d84faa93 100644
--- a/games-arcade/lbreakout2/metadata.xml
+++ b/games-arcade/lbreakout2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="themes">Install additional themes</flag>
   </use>
diff --git a/games-arcade/marbleblast-demo/metadata.xml b/games-arcade/marbleblast-demo/metadata.xml
index f0e38de4ba77..4b440739f73c 100644
--- a/games-arcade/marbleblast-demo/metadata.xml
+++ b/games-arcade/marbleblast-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Marble Blast is an arcade action game with simple yet addictive gameplay, 
 suitable for players of any age. In the rich cartoon landscape of Marble 
diff --git a/games-arcade/marbleblastgold-demo/metadata.xml b/games-arcade/marbleblastgold-demo/metadata.xml
index 81f80ccb2368..710ec999d80e 100644
--- a/games-arcade/marbleblastgold-demo/metadata.xml
+++ b/games-arcade/marbleblastgold-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Marble Blast Gold is an arcade action game with simple yet 
 addictive gameplay, suitable for players of any age. In the 
diff --git a/games-arcade/mari0/metadata.xml b/games-arcade/mari0/metadata.xml
index 651f43562a42..836a2c510f5d 100644
--- a/games-arcade/mari0/metadata.xml
+++ b/games-arcade/mari0/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A complete from scratch recreation of Super Mario Bros. with a focus on
 		perfectly imitating the feel the 1985 classic gave us. Then give Mario
diff --git a/games-arcade/methane/metadata.xml b/games-arcade/methane/metadata.xml
index bccd79d620d5..466a73dd2508 100644
--- a/games-arcade/methane/metadata.xml
+++ b/games-arcade/methane/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">methane</remote-id>
 	</upstream>
diff --git a/games-arcade/missile/metadata.xml b/games-arcade/missile/metadata.xml
index 1a96d428e816..5ed6e293acd2 100644
--- a/games-arcade/missile/metadata.xml
+++ b/games-arcade/missile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">missile</remote-id>
 	</upstream>
diff --git a/games-arcade/moleinvasion/metadata.xml b/games-arcade/moleinvasion/metadata.xml
index 96ceb3270a0d..5f0e1d2669d8 100644
--- a/games-arcade/moleinvasion/metadata.xml
+++ b/games-arcade/moleinvasion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="music">Download and install the music files</flag>
 	</use>
diff --git a/games-arcade/monkey-bubble/metadata.xml b/games-arcade/monkey-bubble/metadata.xml
index b4647c10eaf6..de30961cfb7e 100644
--- a/games-arcade/monkey-bubble/metadata.xml
+++ b/games-arcade/monkey-bubble/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>mr_bones_@gentoo.org</email>
 <name>Michael Sterrett</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/monster-masher/metadata.xml b/games-arcade/monster-masher/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/monster-masher/metadata.xml
+++ b/games-arcade/monster-masher/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/mrrescue/metadata.xml b/games-arcade/mrrescue/metadata.xml
index 28782ebba7d9..8fcfd7e2820d 100644
--- a/games-arcade/mrrescue/metadata.xml
+++ b/games-arcade/mrrescue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">SimonLarsen/mrrescue</remote-id>
 	</upstream>
diff --git a/games-arcade/netris/metadata.xml b/games-arcade/netris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/netris/metadata.xml
+++ b/games-arcade/netris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/nibbles/metadata.xml b/games-arcade/nibbles/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/nibbles/metadata.xml
+++ b/games-arcade/nibbles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/ninvaders/metadata.xml b/games-arcade/ninvaders/metadata.xml
index da189cd7e97d..72915d56f9df 100644
--- a/games-arcade/ninvaders/metadata.xml
+++ b/games-arcade/ninvaders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ninvaders</remote-id>
 	</upstream>
diff --git a/games-arcade/njam/metadata.xml b/games-arcade/njam/metadata.xml
index cbb30a3a18a3..26524c6ef9c5 100644
--- a/games-arcade/njam/metadata.xml
+++ b/games-arcade/njam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">njam</remote-id>
 	</upstream>
diff --git a/games-arcade/notpacman/metadata.xml b/games-arcade/notpacman/metadata.xml
index 27afac7af5ae..4397d2255684 100644
--- a/games-arcade/notpacman/metadata.xml
+++ b/games-arcade/notpacman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Ever wondered how Pacman would be like with physics? No? Well, it's
 		revolutionary. This mashup of "Not" and "Pacman" puts The Pac and
diff --git a/games-arcade/nottetris2/metadata.xml b/games-arcade/nottetris2/metadata.xml
index acdcccf8fb15..540f91b947d6 100644
--- a/games-arcade/nottetris2/metadata.xml
+++ b/games-arcade/nottetris2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Not Tetris 2 is the spiritual successor of the classic Tetris
 		mixed with physics. The result is a fun spinoff in which blocks
diff --git a/games-arcade/openbubbles/metadata.xml b/games-arcade/openbubbles/metadata.xml
index 906d51d15057..39ff5b476c06 100644
--- a/games-arcade/openbubbles/metadata.xml
+++ b/games-arcade/openbubbles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 This is a clone of Evan Bailey's game Bubbles. Why did I reinvent the wheel? In
 this case, the wheel is made in Game Maker, so anyone who wants to do any
diff --git a/games-arcade/openmortal/metadata.xml b/games-arcade/openmortal/metadata.xml
index 663665f4c371..e89a96b2d80e 100644
--- a/games-arcade/openmortal/metadata.xml
+++ b/games-arcade/openmortal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openmortal</remote-id>
 	</upstream>
diff --git a/games-arcade/opensonic/metadata.xml b/games-arcade/opensonic/metadata.xml
index 968413f10f72..ac2773708b1d 100644
--- a/games-arcade/opensonic/metadata.xml
+++ b/games-arcade/opensonic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opensnc</remote-id>
 	</upstream>
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
index b71c7c96095b..9fabcd5e566b 100644
--- a/games-arcade/opentyrian/metadata.xml
+++ b/games-arcade/opentyrian/metadata.xml
@@ -5,7 +5,10 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
   </upstream>
diff --git a/games-arcade/pachi/metadata.xml b/games-arcade/pachi/metadata.xml
index 780830533e2d..7d04660e3bfa 100644
--- a/games-arcade/pachi/metadata.xml
+++ b/games-arcade/pachi/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 		<name>Michael Sterrett</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dragontech</remote-id>
 	</upstream>
diff --git a/games-arcade/pacmanarena/metadata.xml b/games-arcade/pacmanarena/metadata.xml
index 884b0e2a1b66..55f90fa58a43 100644
--- a/games-arcade/pacmanarena/metadata.xml
+++ b/games-arcade/pacmanarena/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pacmanarena</remote-id>
 	</upstream>
diff --git a/games-arcade/penguin-command/metadata.xml b/games-arcade/penguin-command/metadata.xml
index 64e282784366..d48a4c11895d 100644
--- a/games-arcade/penguin-command/metadata.xml
+++ b/games-arcade/penguin-command/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">penguin-command</remote-id>
 	</upstream>
diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml
index 01f485db09bd..83ceca2e5adb 100644
--- a/games-arcade/pengupop/metadata.xml
+++ b/games-arcade/pengupop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">pengupop</remote-id>
 	</upstream>
diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml
index 9def245b0290..bbd46d859519 100644
--- a/games-arcade/performous/metadata.xml
+++ b/games-arcade/performous/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Performous is an open-source rhythm/performance platform that contains singing, guitar/bass playing, drumming and dancing all in one game.
 	</longdescription>
diff --git a/games-arcade/primateplunge/metadata.xml b/games-arcade/primateplunge/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/primateplunge/metadata.xml
+++ b/games-arcade/primateplunge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/pycadia/metadata.xml b/games-arcade/pycadia/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/pycadia/metadata.xml
+++ b/games-arcade/pycadia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/pydance-songs/metadata.xml b/games-arcade/pydance-songs/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/pydance-songs/metadata.xml
+++ b/games-arcade/pydance-songs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/pydance/metadata.xml b/games-arcade/pydance/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/pydance/metadata.xml
+++ b/games-arcade/pydance/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/retrobattle/metadata.xml b/games-arcade/retrobattle/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-arcade/retrobattle/metadata.xml
+++ b/games-arcade/retrobattle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/ri-li/metadata.xml b/games-arcade/ri-li/metadata.xml
index adcacb009e3e..40c16292a9ff 100644
--- a/games-arcade/ri-li/metadata.xml
+++ b/games-arcade/ri-li/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ri-li</remote-id>
 	</upstream>
diff --git a/games-arcade/rockdodger/metadata.xml b/games-arcade/rockdodger/metadata.xml
index bf5eb2351781..5341338176ed 100644
--- a/games-arcade/rockdodger/metadata.xml
+++ b/games-arcade/rockdodger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">spacerocks</remote-id>
 	</upstream>
diff --git a/games-arcade/rocksndiamonds/metadata.xml b/games-arcade/rocksndiamonds/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/rocksndiamonds/metadata.xml
+++ b/games-arcade/rocksndiamonds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/sable/metadata.xml b/games-arcade/sable/metadata.xml
index 66d45cd64099..38f07f9cec5e 100644
--- a/games-arcade/sable/metadata.xml
+++ b/games-arcade/sable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Sable is a frantic 3d space shooter inspired by games such as After Burner and
 Space Harrier. You pilot a ship through an obstacle-laden landscape and attack
diff --git a/games-arcade/sdb/metadata.xml b/games-arcade/sdb/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/sdb/metadata.xml
+++ b/games-arcade/sdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/sdl-sopwith/metadata.xml b/games-arcade/sdl-sopwith/metadata.xml
index 0423b06f44dd..56c336d07c72 100644
--- a/games-arcade/sdl-sopwith/metadata.xml
+++ b/games-arcade/sdl-sopwith/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdl-sopwith</remote-id>
 	</upstream>
diff --git a/games-arcade/sdlroids/metadata.xml b/games-arcade/sdlroids/metadata.xml
index 3901cd5790ba..1f1f8d01e159 100644
--- a/games-arcade/sdlroids/metadata.xml
+++ b/games-arcade/sdlroids/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdlroids</remote-id>
 	</upstream>
diff --git a/games-arcade/sdlsasteroids/metadata.xml b/games-arcade/sdlsasteroids/metadata.xml
index 59b165d32928..e01c76808b10 100644
--- a/games-arcade/sdlsasteroids/metadata.xml
+++ b/games-arcade/sdlsasteroids/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdlsas</remote-id>
 	</upstream>
diff --git a/games-arcade/skystreets/metadata.xml b/games-arcade/skystreets/metadata.xml
index 9203495e4844..b376a8f63980 100644
--- a/games-arcade/skystreets/metadata.xml
+++ b/games-arcade/skystreets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">skystreets</remote-id>
 	</upstream>
diff --git a/games-arcade/slimevolley/metadata.xml b/games-arcade/slimevolley/metadata.xml
index 4f008a8be0cf..948ddaa762a2 100644
--- a/games-arcade/slimevolley/metadata.xml
+++ b/games-arcade/slimevolley/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 <flag name="net">Enable network support</flag>
 </use>
diff --git a/games-arcade/smc/metadata.xml b/games-arcade/smc/metadata.xml
index 040ec537b325..082c06fc58db 100644
--- a/games-arcade/smc/metadata.xml
+++ b/games-arcade/smc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="music">Download and install the music files</flag>
 	</use>
diff --git a/games-arcade/snake3d/metadata.xml b/games-arcade/snake3d/metadata.xml
index 41a8199548e9..3cfa3730c7fc 100644
--- a/games-arcade/snake3d/metadata.xml
+++ b/games-arcade/snake3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 snake3d is a variant of the snake game. You are a snake in a 3d world trying to
 eat as many icosahedrons as possible, which makes your tail longer. There are
diff --git a/games-arcade/solarwolf/metadata.xml b/games-arcade/solarwolf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/solarwolf/metadata.xml
+++ b/games-arcade/solarwolf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/spacerider/metadata.xml b/games-arcade/spacerider/metadata.xml
index 84cc44534ddb..e197b241214a 100644
--- a/games-arcade/spacerider/metadata.xml
+++ b/games-arcade/spacerider/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 spacerider is a space-shooter written in C++, using the SDL.
 </longdescription>
diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml
index 4f84a5e80d56..ffaf30a61aaf 100644
--- a/games-arcade/spout/metadata.xml
+++ b/games-arcade/spout/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">spout</remote-id>
 	</upstream>
diff --git a/games-arcade/stardork/metadata.xml b/games-arcade/stardork/metadata.xml
index 53bc8d9c3aa4..8242fea16502 100644
--- a/games-arcade/stardork/metadata.xml
+++ b/games-arcade/stardork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardork</remote-id>
 	</upstream>
diff --git a/games-arcade/supertransball2/metadata.xml b/games-arcade/supertransball2/metadata.xml
index 5b15491578f4..56bcd1376457 100644
--- a/games-arcade/supertransball2/metadata.xml
+++ b/games-arcade/supertransball2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 "Super Transbal 2" is the sequel of "Transball" and "Transball 2", Inspired in
 THRUST type of games (and concretely in ZARA THRUSTA for the Amiga 500). In each
diff --git a/games-arcade/supertux/metadata.xml b/games-arcade/supertux/metadata.xml
index cca95e798c8c..ea84a1f67116 100644
--- a/games-arcade/supertux/metadata.xml
+++ b/games-arcade/supertux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">super-tux</remote-id>
 		<remote-id type="github">SuperTux/supertux</remote-id>
diff --git a/games-arcade/syobon/metadata.xml b/games-arcade/syobon/metadata.xml
index a9fbbd57dbe8..49db2eef0d1c 100644
--- a/games-arcade/syobon/metadata.xml
+++ b/games-arcade/syobon/metadata.xml
@@ -5,7 +5,10 @@
 <email>joker@gentoo.org</email>
 <name>Christian Birchinger</name>
 </maintainer>
-<herd>games</herd>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Syobon Action (also known as Cat Mario or Neko Mario) is a platform game with a similar gameplay experience as Super Mario Bros, except it's a lot more difficult.
 </longdescription>
diff --git a/games-arcade/tecnoballz/metadata.xml b/games-arcade/tecnoballz/metadata.xml
index 798f46eea44e..abcbd82ea4a0 100644
--- a/games-arcade/tecnoballz/metadata.xml
+++ b/games-arcade/tecnoballz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 A exciting Brick Breaker with 50 levels of game and 11 special levels,
 distributed on the 2 modes of game to give the player a sophisticated system of
diff --git a/games-arcade/thinktanks-demo/metadata.xml b/games-arcade/thinktanks-demo/metadata.xml
index a6fb3cac2798..213c708c1af9 100644
--- a/games-arcade/thinktanks-demo/metadata.xml
+++ b/games-arcade/thinktanks-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 ThinkTanks is a tank combat game designed to be a blast for the new and 
 experienced gamer alike with lighthearted, fast paced pandemonium. Either 
diff --git a/games-arcade/tomatoes/metadata.xml b/games-arcade/tomatoes/metadata.xml
index 50b7cfeb4fb4..9c7aa182c5d2 100644
--- a/games-arcade/tomatoes/metadata.xml
+++ b/games-arcade/tomatoes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tomatoes</remote-id>
 	</upstream>
diff --git a/games-arcade/trailblazer/metadata.xml b/games-arcade/trailblazer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/trailblazer/metadata.xml
+++ b/games-arcade/trailblazer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/triplexinvaders/metadata.xml b/games-arcade/triplexinvaders/metadata.xml
index e60905ac4c14..358b8b0de292 100644
--- a/games-arcade/triplexinvaders/metadata.xml
+++ b/games-arcade/triplexinvaders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription lang="en">
 In Triplex Invaders, the player pilots a spaceship against a never ending horde
 of enemy ships. It has psychedelic 3d graphics (but 2d gameplay).
diff --git a/games-arcade/tuxanci/metadata.xml b/games-arcade/tuxanci/metadata.xml
index 66221545ba2f..a4060ae7aee9 100644
--- a/games-arcade/tuxanci/metadata.xml
+++ b/games-arcade/tuxanci/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	  <email>scarabeus@gentoo.org</email>
 </maintainer>
+<maintainer>
+	  <email>games@gentoo.org</email>
+	  <name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="sound">Enable sound</flag>
 	<flag name="physfs">Use <pkg>dev-games/physfs</pkg> instead of
diff --git a/games-arcade/tuxdash/metadata.xml b/games-arcade/tuxdash/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/tuxdash/metadata.xml
+++ b/games-arcade/tuxdash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/tuxpuck/metadata.xml b/games-arcade/tuxpuck/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/tuxpuck/metadata.xml
+++ b/games-arcade/tuxpuck/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/vor/metadata.xml b/games-arcade/vor/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/vor/metadata.xml
+++ b/games-arcade/vor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/watermelons/metadata.xml b/games-arcade/watermelons/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/watermelons/metadata.xml
+++ b/games-arcade/watermelons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/whichwayisup/metadata.xml b/games-arcade/whichwayisup/metadata.xml
index d0b9efb23429..ad363bb224b3 100644
--- a/games-arcade/whichwayisup/metadata.xml
+++ b/games-arcade/whichwayisup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>A traditional and challenging 2D platformer game with a
     slight rotational twist. Help a mysterious big-eared salaryman named Guy
     find his keys in a labyrinth of dangers and bad dialogue.</longdescription>
diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/wop/metadata.xml
+++ b/games-arcade/wop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xbill/metadata.xml b/games-arcade/xbill/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xbill/metadata.xml
+++ b/games-arcade/xbill/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xbubble/metadata.xml b/games-arcade/xbubble/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xbubble/metadata.xml
+++ b/games-arcade/xbubble/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xevil/metadata.xml b/games-arcade/xevil/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xevil/metadata.xml
+++ b/games-arcade/xevil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xgalaga/metadata.xml b/games-arcade/xgalaga/metadata.xml
index a7e89402ccfe..8adb3fd164ae 100644
--- a/games-arcade/xgalaga/metadata.xml
+++ b/games-arcade/xgalaga/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xgalaga</remote-id>
 	</upstream>
diff --git a/games-arcade/xjump/metadata.xml b/games-arcade/xjump/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xjump/metadata.xml
+++ b/games-arcade/xjump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xrick/metadata.xml b/games-arcade/xrick/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xrick/metadata.xml
+++ b/games-arcade/xrick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xscavenger/metadata.xml b/games-arcade/xscavenger/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-arcade/xscavenger/metadata.xml
+++ b/games-arcade/xscavenger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xsfcave/metadata.xml b/games-arcade/xsfcave/metadata.xml
index 956df4cb2502..f24dbcfd9078 100644
--- a/games-arcade/xsfcave/metadata.xml
+++ b/games-arcade/xsfcave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 xsfcave is a X11 sfcave clone. The game consist of surviving in a tunel by not
 hitting in the walls and obstacles. The first versions of the game are greatly
diff --git a/games-arcade/xtux/metadata.xml b/games-arcade/xtux/metadata.xml
index 951624d07101..7a59ab490911 100644
--- a/games-arcade/xtux/metadata.xml
+++ b/games-arcade/xtux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xtux</remote-id>
 	</upstream>
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
index d5cb5faefdfd..bd99969f380a 100644
--- a/games-arcade/yarsrevenge/metadata.xml
+++ b/games-arcade/yarsrevenge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 A rather wierd shoot-em-up game that originated on the Atari 2600. It's more fun 
 than it looks. Just released so might be tweaked.
diff --git a/games-board/ace/metadata.xml b/games-board/ace/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/ace/metadata.xml
+++ b/games-board/ace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/ascal/metadata.xml b/games-board/ascal/metadata.xml
index c91d82b15a7d..8bfebbb4aebc 100644
--- a/games-board/ascal/metadata.xml
+++ b/games-board/ascal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Lasca (or Laska) is a game similar to Draughts but with some really cool
 enhancements. You'll find a great description in the help system of Ascal. In
diff --git a/games-board/atakks/metadata.xml b/games-board/atakks/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/atakks/metadata.xml
+++ b/games-board/atakks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/awale/metadata.xml b/games-board/awale/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-board/awale/metadata.xml
+++ b/games-board/awale/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-board/biloba/metadata.xml b/games-board/biloba/metadata.xml
index e7b40101147b..afeab9791a20 100644
--- a/games-board/biloba/metadata.xml
+++ b/games-board/biloba/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">biloba</remote-id>
 	</upstream>
diff --git a/games-board/blokish/metadata.xml b/games-board/blokish/metadata.xml
index 99e24ee1d027..9d7ce13c77b9 100644
--- a/games-board/blokish/metadata.xml
+++ b/games-board/blokish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">blokish</remote-id>
 	</upstream>
diff --git a/games-board/camato/metadata.xml b/games-board/camato/metadata.xml
index c88119d0aa18..56fd5026e076 100644
--- a/games-board/camato/metadata.xml
+++ b/games-board/camato/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>Camato is a map editor for the game gnocatan. It is made with Ruby and the library Ruby-GTK.</longdescription>
 </pkgmetadata>
diff --git a/games-board/capicity/metadata.xml b/games-board/capicity/metadata.xml
index e000fe16f06e..2aeddc6df78b 100644
--- a/games-board/capicity/metadata.xml
+++ b/games-board/capicity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">capitalism</remote-id>
 	</upstream>
diff --git a/games-board/ccgo/metadata.xml b/games-board/ccgo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/ccgo/metadata.xml
+++ b/games-board/ccgo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/cgoban/metadata.xml b/games-board/cgoban/metadata.xml
index e3ef098ef564..51f938cf4bb0 100644
--- a/games-board/cgoban/metadata.xml
+++ b/games-board/cgoban/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cgoban1</remote-id>
 	</upstream>
diff --git a/games-board/cgoban2/metadata.xml b/games-board/cgoban2/metadata.xml
index b4647c10eaf6..de30961cfb7e 100644
--- a/games-board/cgoban2/metadata.xml
+++ b/games-board/cgoban2/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>mr_bones_@gentoo.org</email>
 <name>Michael Sterrett</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/chessx/metadata.xml b/games-board/chessx/metadata.xml
index 8f2ce1eef0cb..1c9aa8be1ccf 100644
--- a/games-board/chessx/metadata.xml
+++ b/games-board/chessx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chessx</remote-id>
 	</upstream>
diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
index fde850bccf65..6130c4c05508 100644
--- a/games-board/cockatrice/metadata.xml
+++ b/games-board/cockatrice/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 		<name>Diego Elio Pettenò</name>
 	</maintainer>
+	<maintainer>
+        <email>games@gentoo.org</email>
+        <name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
                 <email>brukie@gmx.net</email>
diff --git a/games-board/crafty/metadata.xml b/games-board/crafty/metadata.xml
index f21032049697..25f325d1fe29 100644
--- a/games-board/crafty/metadata.xml
+++ b/games-board/crafty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="no-opts">Don't try to enable crazy CFLAG options</flag>
   </use>
diff --git a/games-board/domination/metadata.xml b/games-board/domination/metadata.xml
index 3a3a4a6bd732..078d7a1970d9 100644
--- a/games-board/domination/metadata.xml
+++ b/games-board/domination/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">domination</remote-id>
 	</upstream>
diff --git a/games-board/eboard/metadata.xml b/games-board/eboard/metadata.xml
index c3bbae001dec..1d3d6337689d 100644
--- a/games-board/eboard/metadata.xml
+++ b/games-board/eboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">eboard</remote-id>
 	</upstream>
diff --git a/games-board/four-in-a-row/metadata.xml b/games-board/four-in-a-row/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/four-in-a-row/metadata.xml
+++ b/games-board/four-in-a-row/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
index 336865a45f21..303b5964ffb9 100644
--- a/games-board/freedoko/metadata.xml
+++ b/games-board/freedoko/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription lang="en">
 The Linux version of the popular german cardgame "Doppelkopf"
 </longdescription>
diff --git a/games-board/fruit/metadata.xml b/games-board/fruit/metadata.xml
index b02037f1efca..fe480212ead4 100644
--- a/games-board/fruit/metadata.xml
+++ b/games-board/fruit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Fruit is a UCI-only chess engine.
 </longdescription>
diff --git a/games-board/gamazons/metadata.xml b/games-board/gamazons/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gamazons/metadata.xml
+++ b/games-board/gamazons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gmchess/metadata.xml b/games-board/gmchess/metadata.xml
index d74c0a868c5b..1702fe892547 100644
--- a/games-board/gmchess/metadata.xml
+++ b/games-board/gmchess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">gmchess</remote-id>
 	</upstream>
diff --git a/games-board/gnome-chess/metadata.xml b/games-board/gnome-chess/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/gnome-chess/metadata.xml
+++ b/games-board/gnome-chess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnome-hearts/metadata.xml b/games-board/gnome-hearts/metadata.xml
index 3057a54e98e6..6a8aa7a80ec8 100644
--- a/games-board/gnome-hearts/metadata.xml
+++ b/games-board/gnome-hearts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>games</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnome-mahjongg/metadata.xml b/games-board/gnome-mahjongg/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/gnome-mahjongg/metadata.xml
+++ b/games-board/gnome-mahjongg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnome-mastermind/metadata.xml b/games-board/gnome-mastermind/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnome-mastermind/metadata.xml
+++ b/games-board/gnome-mastermind/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnome-mines/metadata.xml b/games-board/gnome-mines/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/gnome-mines/metadata.xml
+++ b/games-board/gnome-mines/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnono/metadata.xml b/games-board/gnono/metadata.xml
index 75dd96ff216d..b75f922741ec 100644
--- a/games-board/gnono/metadata.xml
+++ b/games-board/gnono/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnono</remote-id>
 	</upstream>
diff --git a/games-board/gnubg/metadata.xml b/games-board/gnubg/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnubg/metadata.xml
+++ b/games-board/gnubg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnuchess-book/metadata.xml b/games-board/gnuchess-book/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnuchess-book/metadata.xml
+++ b/games-board/gnuchess-book/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnuchess/metadata.xml b/games-board/gnuchess/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnuchess/metadata.xml
+++ b/games-board/gnuchess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnugo/metadata.xml b/games-board/gnugo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnugo/metadata.xml
+++ b/games-board/gnugo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnushogi/metadata.xml b/games-board/gnushogi/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gnushogi/metadata.xml
+++ b/games-board/gnushogi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/goatee-gtk/metadata.xml b/games-board/goatee-gtk/metadata.xml
index 2ad2762eb324..9fd6ef2f504d 100644
--- a/games-board/goatee-gtk/metadata.xml
+++ b/games-board/goatee-gtk/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Goatee is a Go library and game editor, written in Haskell.  It provides a
 		GUI for recording, studying, and editing game records.  Underneath this is a
diff --git a/games-board/grhino/metadata.xml b/games-board/grhino/metadata.xml
index 5fac398972dc..78667f5f29c8 100644
--- a/games-board/grhino/metadata.xml
+++ b/games-board/grhino/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription lang="en">
 An Othello game with strong AI.
 </longdescription>
diff --git a/games-board/gtkatlantic/metadata.xml b/games-board/gtkatlantic/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/gtkatlantic/metadata.xml
+++ b/games-board/gtkatlantic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/gtkboard/metadata.xml b/games-board/gtkboard/metadata.xml
index 3ed92536ef9b..ad528f9fa2b9 100644
--- a/games-board/gtkboard/metadata.xml
+++ b/games-board/gtkboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkboard</remote-id>
 	</upstream>
diff --git a/games-board/hexxagon/metadata.xml b/games-board/hexxagon/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/hexxagon/metadata.xml
+++ b/games-board/hexxagon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
index c081b162032f..b66d2c4f2729 100644
--- a/games-board/holdingnuts/metadata.xml
+++ b/games-board/holdingnuts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">downloads</remote-id>
   </upstream>
diff --git a/games-board/iagno/metadata.xml b/games-board/iagno/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/iagno/metadata.xml
+++ b/games-board/iagno/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/kcheckers/metadata.xml b/games-board/kcheckers/metadata.xml
index 7fb9d8d774e1..256a3edc39e8 100644
--- a/games-board/kcheckers/metadata.xml
+++ b/games-board/kcheckers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qcheckers</remote-id>
 	</upstream>
diff --git a/games-board/knights/metadata.xml b/games-board/knights/metadata.xml
index 3eb93fed81fd..f105de823ed1 100644
--- a/games-board/knights/metadata.xml
+++ b/games-board/knights/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-board/mah-jong/metadata.xml b/games-board/mah-jong/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/mah-jong/metadata.xml
+++ b/games-board/mah-jong/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/maitretarot/metadata.xml b/games-board/maitretarot/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/maitretarot/metadata.xml
+++ b/games-board/maitretarot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/megamek/metadata.xml b/games-board/megamek/metadata.xml
index 34598d2fac55..89092b825128 100644
--- a/games-board/megamek/metadata.xml
+++ b/games-board/megamek/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">megamek</remote-id>
 	</upstream>
diff --git a/games-board/mt_dolphin_ia/metadata.xml b/games-board/mt_dolphin_ia/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/mt_dolphin_ia/metadata.xml
+++ b/games-board/mt_dolphin_ia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/mt_gtk_client/metadata.xml b/games-board/mt_gtk_client/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/mt_gtk_client/metadata.xml
+++ b/games-board/mt_gtk_client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/mt_ncurses_client/metadata.xml b/games-board/mt_ncurses_client/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/mt_ncurses_client/metadata.xml
+++ b/games-board/mt_ncurses_client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/natch/metadata.xml b/games-board/natch/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/natch/metadata.xml
+++ b/games-board/natch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/openyahtzee/metadata.xml b/games-board/openyahtzee/metadata.xml
index ec3a69c721bb..bc9514a12110 100644
--- a/games-board/openyahtzee/metadata.xml
+++ b/games-board/openyahtzee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Open Yhatzee is an open-source (free) version of the classic dice game Yahtzee.
 </longdescription>
diff --git a/games-board/pasang-emas/metadata.xml b/games-board/pasang-emas/metadata.xml
index 96bb4cea5ac1..1bfd929b2762 100644
--- a/games-board/pasang-emas/metadata.xml
+++ b/games-board/pasang-emas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="extras">Install some extra themes</flag>
   </use>
diff --git a/games-board/peg-e/metadata.xml b/games-board/peg-e/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/peg-e/metadata.xml
+++ b/games-board/peg-e/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/phalanx/metadata.xml b/games-board/phalanx/metadata.xml
index 59fa5463a179..2518145601ea 100644
--- a/games-board/phalanx/metadata.xml
+++ b/games-board/phalanx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 This is the Phalanx chess engine. Phalanx's playing style is quite human-like;
 when it plays at full strength, it may be compared to a intermediate-to-strong
diff --git a/games-board/pioneers/metadata.xml b/games-board/pioneers/metadata.xml
index fd23dc88c4b9..4f96777e4f2c 100644
--- a/games-board/pioneers/metadata.xml
+++ b/games-board/pioneers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 	Pio (Pioneers) is a clone of the board game The Settlers of Catan.
 </longdescription>
diff --git a/games-board/pokerth/metadata.xml b/games-board/pokerth/metadata.xml
index 9a9ac85b756c..0b341f319ade 100644
--- a/games-board/pokerth/metadata.xml
+++ b/games-board/pokerth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pokerth</remote-id>
   </upstream>
diff --git a/games-board/pouetchess/metadata.xml b/games-board/pouetchess/metadata.xml
index 2deafbec1ca3..827015003f33 100644
--- a/games-board/pouetchess/metadata.xml
+++ b/games-board/pouetchess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pouetchess</remote-id>
 	</upstream>
diff --git a/games-board/pychess/metadata.xml b/games-board/pychess/metadata.xml
index 19399130691b..58fd4fcd5760 100644
--- a/games-board/pychess/metadata.xml
+++ b/games-board/pychess/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pychess</remote-id>
 	</upstream>
diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml
index a439022fc46c..f741ba6bdbe6 100644
--- a/games-board/pysolfc/metadata.xml
+++ b/games-board/pysolfc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="extra-cardsets">Install extra cardsets</flag>
     <flag name="sound">Enable sound support using <pkg>dev-python/pygame</pkg></flag>
diff --git a/games-board/qcheckers/metadata.xml b/games-board/qcheckers/metadata.xml
index 3b41977892d3..ab5587a1046b 100644
--- a/games-board/qcheckers/metadata.xml
+++ b/games-board/qcheckers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">qcheckers</remote-id>
 	</upstream>
diff --git a/games-board/qgo/metadata.xml b/games-board/qgo/metadata.xml
index df42681720f3..9811e7118fbe 100644
--- a/games-board/qgo/metadata.xml
+++ b/games-board/qgo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qgo</remote-id>
 	</upstream>
diff --git a/games-board/scid/metadata.xml b/games-board/scid/metadata.xml
index 031fb161aca2..6bf9dbcc5d08 100644
--- a/games-board/scid/metadata.xml
+++ b/games-board/scid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scid</remote-id>
 	</upstream>
diff --git a/games-board/simsu/metadata.xml b/games-board/simsu/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/simsu/metadata.xml
+++ b/games-board/simsu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/sirius/metadata.xml b/games-board/sirius/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/sirius/metadata.xml
+++ b/games-board/sirius/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/sjeng/metadata.xml b/games-board/sjeng/metadata.xml
index 1ce68b074d11..3da4514bca1f 100644
--- a/games-board/sjeng/metadata.xml
+++ b/games-board/sjeng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sjeng</remote-id>
 	</upstream>
diff --git a/games-board/spider/metadata.xml b/games-board/spider/metadata.xml
index 84627512f9ba..0e77034dbe3e 100644
--- a/games-board/spider/metadata.xml
+++ b/games-board/spider/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="athena">Enable athena widgets</flag>
   </use>
diff --git a/games-board/tali/metadata.xml b/games-board/tali/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-board/tali/metadata.xml
+++ b/games-board/tali/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/teg/metadata.xml b/games-board/teg/metadata.xml
index 750d71aa16e8..45594e845746 100644
--- a/games-board/teg/metadata.xml
+++ b/games-board/teg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">teg</remote-id>
 	</upstream>
diff --git a/games-board/tetzle/metadata.xml b/games-board/tetzle/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/tetzle/metadata.xml
+++ b/games-board/tetzle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/xboard/metadata.xml b/games-board/xboard/metadata.xml
index 8ad0acd7e3a8..d94c92e25f81 100644
--- a/games-board/xboard/metadata.xml
+++ b/games-board/xboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="zippy">Enable experimental zippy client</flag>
     <flag name="default-font">Install the default font that xboard uses</flag>
diff --git a/games-board/xfreecell/metadata.xml b/games-board/xfreecell/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/xfreecell/metadata.xml
+++ b/games-board/xfreecell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/xgammon/metadata.xml b/games-board/xgammon/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/xgammon/metadata.xml
+++ b/games-board/xgammon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/xmahjongg/metadata.xml b/games-board/xmahjongg/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/xmahjongg/metadata.xml
+++ b/games-board/xmahjongg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/xmille/metadata.xml b/games-board/xmille/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/xmille/metadata.xml
+++ b/games-board/xmille/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-board/xscrabble/metadata.xml b/games-board/xscrabble/metadata.xml
index c6ffe72d4ad9..c79df4c258b0 100644
--- a/games-board/xscrabble/metadata.xml
+++ b/games-board/xscrabble/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">xscrabble</remote-id>
 	</upstream>
diff --git a/games-board/xskat/metadata.xml b/games-board/xskat/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-board/xskat/metadata.xml
+++ b/games-board/xskat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/advancemame/metadata.xml b/games-emulation/advancemame/metadata.xml
index 794e37cdbea3..cc551d1aa2ea 100644
--- a/games-emulation/advancemame/metadata.xml
+++ b/games-emulation/advancemame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 AdvanceMAME and AdvanceMESS are unofficial MAME and MESS versions with an advanced video support for 
 helping the use with TVs, Arcade Monitors, Fixed Frequencies Monitors and also for PC Monitors.
diff --git a/games-emulation/advancemenu/metadata.xml b/games-emulation/advancemenu/metadata.xml
index 72ee3bbf50bc..50b5031d3d2e 100644
--- a/games-emulation/advancemenu/metadata.xml
+++ b/games-emulation/advancemenu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">advancemame</remote-id>
 	</upstream>
diff --git a/games-emulation/advancescan/metadata.xml b/games-emulation/advancescan/metadata.xml
index 72ee3bbf50bc..50b5031d3d2e 100644
--- a/games-emulation/advancescan/metadata.xml
+++ b/games-emulation/advancescan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">advancemame</remote-id>
 	</upstream>
diff --git a/games-emulation/atari800/metadata.xml b/games-emulation/atari800/metadata.xml
index cd61b7b57930..7f27f3d93f58 100644
--- a/games-emulation/atari800/metadata.xml
+++ b/games-emulation/atari800/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Atari800 is an Atari 800, 800XL, 130XE and 5200 emulator for Unix, Amiga, MS-DOS, Atari 
 TT/Falcon, SDL and WinCE. Our main objective is to create a freely distributable portable 
diff --git a/games-emulation/caps/metadata.xml b/games-emulation/caps/metadata.xml
index 7f38c4c23e0e..b74435448892 100644
--- a/games-emulation/caps/metadata.xml
+++ b/games-emulation/caps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		C.A.P.S., the Classic Amiga Preservation Society, as the name implies,
 		dedicates itself to the preservation of classic Amiga software for the
diff --git a/games-emulation/daphne/metadata.xml b/games-emulation/daphne/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/daphne/metadata.xml
+++ b/games-emulation/daphne/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/dboxfe/metadata.xml b/games-emulation/dboxfe/metadata.xml
index 921785cff2d7..cbd08ce34eba 100644
--- a/games-emulation/dboxfe/metadata.xml
+++ b/games-emulation/dboxfe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dboxfe.berlios</remote-id>
 	</upstream>
diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml
index c36000ab7b2e..143c53d753cc 100644
--- a/games-emulation/desmume/metadata.xml
+++ b/games-emulation/desmume/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">desmume</remote-id>
 	</upstream>
diff --git a/games-emulation/dgen-sdl/metadata.xml b/games-emulation/dgen-sdl/metadata.xml
index dd17d9838ef4..2a080071a448 100644
--- a/games-emulation/dgen-sdl/metadata.xml
+++ b/games-emulation/dgen-sdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dgen</remote-id>
 	</upstream>
diff --git a/games-emulation/dosbox/metadata.xml b/games-emulation/dosbox/metadata.xml
index fb84ca1f83e9..ce33b64a6826 100644
--- a/games-emulation/dosbox/metadata.xml
+++ b/games-emulation/dosbox/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dosbox</remote-id>
 	</upstream>
diff --git a/games-emulation/emutos/metadata.xml b/games-emulation/emutos/metadata.xml
index 054700e7f980..83e5313306e9 100644
--- a/games-emulation/emutos/metadata.xml
+++ b/games-emulation/emutos/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">emutos</remote-id>
 	</upstream>
diff --git a/games-emulation/fakenes/metadata.xml b/games-emulation/fakenes/metadata.xml
index 590648f50af5..10d6cfd90e56 100644
--- a/games-emulation/fakenes/metadata.xml
+++ b/games-emulation/fakenes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fakenes</remote-id>
 	</upstream>
diff --git a/games-emulation/fbzx/metadata.xml b/games-emulation/fbzx/metadata.xml
index b2e8a5cecf47..ba6cb65c70fe 100644
--- a/games-emulation/fbzx/metadata.xml
+++ b/games-emulation/fbzx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 		FBZX is a Sinclair Spectrum emulator, designed to work at full screen
 		using the FrameBuffer.
diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
index 33927f3e6a54..4755feaca9f2 100644
--- a/games-emulation/fceux/metadata.xml
+++ b/games-emulation/fceux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="logo">Enable the ability to add a logo screen when creating AVIs</flag>
 	</use>
diff --git a/games-emulation/gambatte/metadata.xml b/games-emulation/gambatte/metadata.xml
index 0d18f2550f7a..163f687179a0 100644
--- a/games-emulation/gambatte/metadata.xml
+++ b/games-emulation/gambatte/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gambatte</remote-id>
 	</upstream>
diff --git a/games-emulation/gcube/metadata.xml b/games-emulation/gcube/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/gcube/metadata.xml
+++ b/games-emulation/gcube/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/generator/metadata.xml b/games-emulation/generator/metadata.xml
index b21068e12a9f..867bbc0b055e 100644
--- a/games-emulation/generator/metadata.xml
+++ b/games-emulation/generator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="sdlaudio">Enable SDL Audio</flag>
   </use>
diff --git a/games-emulation/gens/metadata.xml b/games-emulation/gens/metadata.xml
index d3d009f0cfb8..9072fba9dd90 100644
--- a/games-emulation/gens/metadata.xml
+++ b/games-emulation/gens/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gens</remote-id>
 	</upstream>
diff --git a/games-emulation/gfceux/metadata.xml b/games-emulation/gfceux/metadata.xml
index ee1fe81755b2..f3df7f6aa35a 100644
--- a/games-emulation/gfceux/metadata.xml
+++ b/games-emulation/gfceux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fceultra</remote-id>
 	</upstream>
diff --git a/games-emulation/gngb/metadata.xml b/games-emulation/gngb/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/gngb/metadata.xml
+++ b/games-emulation/gngb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/gngeo/metadata.xml b/games-emulation/gngeo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/gngeo/metadata.xml
+++ b/games-emulation/gngeo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/gnuboy/metadata.xml b/games-emulation/gnuboy/metadata.xml
index 880ed7d90f0d..fb28de689aa9 100644
--- a/games-emulation/gnuboy/metadata.xml
+++ b/games-emulation/gnuboy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnuboy</remote-id>
 	</upstream>
diff --git a/games-emulation/gxmame/metadata.xml b/games-emulation/gxmame/metadata.xml
index 3172373dc41a..9548c72fd87c 100644
--- a/games-emulation/gxmame/metadata.xml
+++ b/games-emulation/gxmame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gxmame</remote-id>
 	</upstream>
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
index 70d1d1ce62e4..0bf61ae70e2b 100644
--- a/games-emulation/higan/metadata.xml
+++ b/games-emulation/higan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="profile_accuracy">
 			Compile a binary optimized for accuracy</flag>
diff --git a/games-emulation/hugo/metadata.xml b/games-emulation/hugo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/hugo/metadata.xml
+++ b/games-emulation/hugo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/kigb/metadata.xml b/games-emulation/kigb/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/kigb/metadata.xml
+++ b/games-emulation/kigb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/lxdream/metadata.xml b/games-emulation/lxdream/metadata.xml
index d8c6e59e27b0..a28137afb895 100644
--- a/games-emulation/lxdream/metadata.xml
+++ b/games-emulation/lxdream/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/mamory/metadata.xml b/games-emulation/mamory/metadata.xml
index 5c682e73e5bd..3330362f1023 100644
--- a/games-emulation/mamory/metadata.xml
+++ b/games-emulation/mamory/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mamory</remote-id>
 	</upstream>
diff --git a/games-emulation/mastergear-bin/metadata.xml b/games-emulation/mastergear-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/mastergear-bin/metadata.xml
+++ b/games-emulation/mastergear-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/mednafen/metadata.xml b/games-emulation/mednafen/metadata.xml
index 0b0501c446a4..fc7b2b408921 100644
--- a/games-emulation/mednafen/metadata.xml
+++ b/games-emulation/mednafen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="debugger">Build with internal debugger</flag>
 		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
diff --git a/games-emulation/mednaffe/metadata.xml b/games-emulation/mednaffe/metadata.xml
index da67c9ffc321..fcdce386a4b3 100644
--- a/games-emulation/mednaffe/metadata.xml
+++ b/games-emulation/mednaffe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">AmatCoder/mednaffe</remote-id>
 	</upstream>
diff --git a/games-emulation/mekanix/metadata.xml b/games-emulation/mekanix/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/mekanix/metadata.xml
+++ b/games-emulation/mekanix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/nestopia/metadata.xml b/games-emulation/nestopia/metadata.xml
index 542e07eb1484..9cf6cc13a7d7 100644
--- a/games-emulation/nestopia/metadata.xml
+++ b/games-emulation/nestopia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nestopiaue</remote-id>
 	</upstream>
diff --git a/games-emulation/nestra/metadata.xml b/games-emulation/nestra/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/nestra/metadata.xml
+++ b/games-emulation/nestra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/openmsx/metadata.xml b/games-emulation/openmsx/metadata.xml
index d10b4d57b45e..de09cd71901b 100644
--- a/games-emulation/openmsx/metadata.xml
+++ b/games-emulation/openmsx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openmsx</remote-id>
 	</upstream>
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index dc49038581b3..c557189002d4 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ykonotopov@gmail.com</email>
 		<name>Yuri Konotopov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index af37a744e679..e31d596a1e2d 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>robin9800xt@gmail.com</email>
 		<name>RobinDX</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="qt4">Adds support for the Qt GUI/Application Toolkit version 4.x</flag>
 		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
diff --git a/games-emulation/raine/metadata.xml b/games-emulation/raine/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/raine/metadata.xml
+++ b/games-emulation/raine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
index af2f98a13d86..22e4bf7fc0e0 100644
--- a/games-emulation/sdlmame/metadata.xml
+++ b/games-emulation/sdlmame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 SDLMAME is a port of the popular MAME[tm]. There are a few principles that guide it's development:
 
diff --git a/games-emulation/sdlmametools/metadata.xml b/games-emulation/sdlmametools/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/sdlmametools/metadata.xml
+++ b/games-emulation/sdlmametools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/sdlmess/metadata.xml b/games-emulation/sdlmess/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/sdlmess/metadata.xml
+++ b/games-emulation/sdlmess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 24e4956aa0b4..28c63d33f96b 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
 		<flag name="xrandr">Enable support for the X xrandr extension</flag>
diff --git a/games-emulation/stella/metadata.xml b/games-emulation/stella/metadata.xml
index a3b7e2075da3..6b3ca49fdad3 100644
--- a/games-emulation/stella/metadata.xml
+++ b/games-emulation/stella/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stella</remote-id>
 	</upstream>
diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
index 13e23a2dfd48..acfaabae4dcc 100644
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="link">Enable GBA linking functionality</flag>
 	</use>
diff --git a/games-emulation/vgba/metadata.xml b/games-emulation/vgba/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/vgba/metadata.xml
+++ b/games-emulation/vgba/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/virtualjaguar/metadata.xml b/games-emulation/virtualjaguar/metadata.xml
index f4da0e5349c7..cc8b59c8553b 100644
--- a/games-emulation/virtualjaguar/metadata.xml
+++ b/games-emulation/virtualjaguar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 The Virtual Atari Jaguar GCC/SDL portable Jaguar emulator which is based on
 the source code released by Cal2 of Potato Emulation.
diff --git a/games-emulation/visualboyadvance/metadata.xml b/games-emulation/visualboyadvance/metadata.xml
index 19b8e6d515c1..10b3dad36003 100644
--- a/games-emulation/visualboyadvance/metadata.xml
+++ b/games-emulation/visualboyadvance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vba</remote-id>
 	</upstream>
diff --git a/games-emulation/xe/metadata.xml b/games-emulation/xe/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/xe/metadata.xml
+++ b/games-emulation/xe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/yabause/metadata.xml b/games-emulation/yabause/metadata.xml
index 5a88bd848e32..3dfb4123d228 100644
--- a/games-emulation/yabause/metadata.xml
+++ b/games-emulation/yabause/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
 	</use>
diff --git a/games-emulation/zinc/metadata.xml b/games-emulation/zinc/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-emulation/zinc/metadata.xml
+++ b/games-emulation/zinc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/zsnes/metadata.xml b/games-emulation/zsnes/metadata.xml
index 9be2846979f1..81f8fa33cadc 100644
--- a/games-emulation/zsnes/metadata.xml
+++ b/games-emulation/zsnes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="debug">Enable the builtin debugger</flag>
     <flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
index 1c9acdb0dae6..412ce9fd86cd 100644
--- a/games-engines/exult/metadata.xml
+++ b/games-engines/exult/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">exult</remote-id>
 	</upstream>
diff --git a/games-engines/frobtads/metadata.xml b/games-engines/frobtads/metadata.xml
index 3a1d0ec34eff..40b20a3a87ea 100644
--- a/games-engines/frobtads/metadata.xml
+++ b/games-engines/frobtads/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="tads2compiler">Build TADS2 compiler</flag>
     <flag name="tads3compiler">Build TADS3 compiler</flag>
diff --git a/games-engines/frotz/metadata.xml b/games-engines/frotz/metadata.xml
index 555170a9f23a..abb082d67560 100644
--- a/games-engines/frotz/metadata.xml
+++ b/games-engines/frotz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">frotz</remote-id>
 	</upstream>
diff --git a/games-engines/gargoyle/metadata.xml b/games-engines/gargoyle/metadata.xml
index 6f0c8bf6f93f..22855be36e69 100644
--- a/games-engines/gargoyle/metadata.xml
+++ b/games-engines/gargoyle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">garglk</remote-id>
 	</upstream>
diff --git a/games-engines/gemrb/metadata.xml b/games-engines/gemrb/metadata.xml
index 3e4eb6496d81..5eb9b29e859d 100644
--- a/games-engines/gemrb/metadata.xml
+++ b/games-engines/gemrb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gemrb</remote-id>
 	</upstream>
diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml
index d8c6e59e27b0..a28137afb895 100644
--- a/games-engines/love/metadata.xml
+++ b/games-engines/love/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-engines/nazghul/metadata.xml b/games-engines/nazghul/metadata.xml
index a364fd4a2c28..4a2ae4a6dd70 100644
--- a/games-engines/nazghul/metadata.xml
+++ b/games-engines/nazghul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nazghul</remote-id>
 	</upstream>
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 2f40288d1525..af3c321a8234 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mwoodj@knology.net</email>
 		<name>Mike Wood</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="odalaunch">Build the wxwidgets based launcher.</flag>
 		<flag name="master">Build master server target (advertises odamex server list)</flag>
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index 02370cbc840b..32bd783cf103 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -5,7 +5,10 @@
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="devtools">Install development tools like
 			bsatool, esmtool and opencs.</flag>
diff --git a/games-engines/openxcom/metadata.xml b/games-engines/openxcom/metadata.xml
index 68f685986c3e..7f5c84fd15cc 100644
--- a/games-engines/openxcom/metadata.xml
+++ b/games-engines/openxcom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">SupSuper/OpenXcom</remote-id>
 	</upstream>
diff --git a/games-engines/qtads/metadata.xml b/games-engines/qtads/metadata.xml
index eef6bd6fadd6..20ed3c0f4677 100644
--- a/games-engines/qtads/metadata.xml
+++ b/games-engines/qtads/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qtads</remote-id>
   </upstream>
diff --git a/games-engines/renpy/metadata.xml b/games-engines/renpy/metadata.xml
index e2ff5c78ec5c..25e8fedaf757 100644
--- a/games-engines/renpy/metadata.xml
+++ b/games-engines/renpy/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -13,6 +11,14 @@
 		<name>Maks Verver</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Ren'Py is a free and cross-platform visual novel engine that
 		helps you use words,
diff --git a/games-engines/residualvm/metadata.xml b/games-engines/residualvm/metadata.xml
index 6e55bbad6584..1e8f197969e7 100644
--- a/games-engines/residualvm/metadata.xml
+++ b/games-engines/residualvm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">residualvm</remote-id>
 	</upstream>
diff --git a/games-engines/scummvm-tools/metadata.xml b/games-engines/scummvm-tools/metadata.xml
index f325c8eea004..ece66e2dd396 100644
--- a/games-engines/scummvm-tools/metadata.xml
+++ b/games-engines/scummvm-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scummvm</remote-id>
 	</upstream>
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index f61ea7f15ced..4f6e9bb86702 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="fluidsynth">compile with support for fluidsynth</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
index cbf45f5053b0..4be84d23b8b8 100644
--- a/games-engines/solarus/metadata.xml
+++ b/games-engines/solarus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Install doxygen developer documentation.</flag>
 		<flag name="luajit">Use LuaJIT instead of default Lua.</flag>
diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratagus/metadata.xml
index fc00320b8c70..a120ea497b31 100644
--- a/games-engines/stratagus/metadata.xml
+++ b/games-engines/stratagus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="fluidsynth">compile with support for fluidsynth</flag>
 	</use>
diff --git a/games-engines/xzip/metadata.xml b/games-engines/xzip/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-engines/xzip/metadata.xml
+++ b/games-engines/xzip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-engines/zoom/metadata.xml b/games-engines/zoom/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-engines/zoom/metadata.xml
+++ b/games-engines/zoom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/aaquake2/metadata.xml b/games-fps/aaquake2/metadata.xml
index df801fb2ef93..f0b060c4877b 100644
--- a/games-fps/aaquake2/metadata.xml
+++ b/games-fps/aaquake2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 aaquake2 - Text Mode Quake II
 
diff --git a/games-fps/aaut/metadata.xml b/games-fps/aaut/metadata.xml
index 16a4a6bdd2ba..e7390802c9a5 100644
--- a/games-fps/aaut/metadata.xml
+++ b/games-fps/aaut/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 AAUT: Text Mode Unreal Tournament
 Remember, Kids. It's not big, and it's not clever
diff --git a/games-fps/alephone-infinity/metadata.xml b/games-fps/alephone-infinity/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/alephone-infinity/metadata.xml
+++ b/games-fps/alephone-infinity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml
index c69d4eeed595..64881fbb173e 100644
--- a/games-fps/alephone/metadata.xml
+++ b/games-fps/alephone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">marathon</remote-id>
 	</upstream>
diff --git a/games-fps/alienarena/metadata.xml b/games-fps/alienarena/metadata.xml
index 58b3ab039e52..ac65880e5f86 100644
--- a/games-fps/alienarena/metadata.xml
+++ b/games-fps/alienarena/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="vidmode">Link against <pkg>x11-libs/libXxf86vm</pkg>.
 	Required for full-screen support.</flag>
diff --git a/games-fps/avp/metadata.xml b/games-fps/avp/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/avp/metadata.xml
+++ b/games-fps/avp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/blackshades/metadata.xml b/games-fps/blackshades/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/blackshades/metadata.xml
+++ b/games-fps/blackshades/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/darkplaces/metadata.xml b/games-fps/darkplaces/metadata.xml
index bf95b7a756e2..7267c4e80b7f 100644
--- a/games-fps/darkplaces/metadata.xml
+++ b/games-fps/darkplaces/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="cdsound">Enables using CD audio in the engine</flag>
     <flag name="demo">Uses the demo data from quake1 (quake1-demodata)</flag>
diff --git a/games-fps/doom-data/metadata.xml b/games-fps/doom-data/metadata.xml
index c6592feff3b3..5e369fc6eb71 100644
--- a/games-fps/doom-data/metadata.xml
+++ b/games-fps/doom-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="doomsday">Add wrapper to run it within doomsday</flag>
   </use>
diff --git a/games-fps/doom3-cdoom/metadata.xml b/games-fps/doom3-cdoom/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-cdoom/metadata.xml
+++ b/games-fps/doom3-cdoom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-chextrek/metadata.xml b/games-fps/doom3-chextrek/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-chextrek/metadata.xml
+++ b/games-fps/doom3-chextrek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-data/metadata.xml b/games-fps/doom3-data/metadata.xml
index 014b5dd07f0e..c47ba146c12e 100644
--- a/games-fps/doom3-data/metadata.xml
+++ b/games-fps/doom3-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 This is the data portion of the commercial Id Software game Doom III.  This is
 commercial software and requires the purchase of Doom III from any retailer.
diff --git a/games-fps/doom3-demo/metadata.xml b/games-fps/doom3-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-demo/metadata.xml
+++ b/games-fps/doom3-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-ducttape/metadata.xml b/games-fps/doom3-ducttape/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-ducttape/metadata.xml
+++ b/games-fps/doom3-ducttape/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-eventhorizon/metadata.xml b/games-fps/doom3-eventhorizon/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-eventhorizon/metadata.xml
+++ b/games-fps/doom3-eventhorizon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-hellcampaign/metadata.xml b/games-fps/doom3-hellcampaign/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-hellcampaign/metadata.xml
+++ b/games-fps/doom3-hellcampaign/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-inhell/metadata.xml b/games-fps/doom3-inhell/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-inhell/metadata.xml
+++ b/games-fps/doom3-inhell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-lms/metadata.xml b/games-fps/doom3-lms/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-lms/metadata.xml
+++ b/games-fps/doom3-lms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-mitm/metadata.xml b/games-fps/doom3-mitm/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/doom3-mitm/metadata.xml
+++ b/games-fps/doom3-mitm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/doom3-roe/metadata.xml b/games-fps/doom3-roe/metadata.xml
index d2321302edc6..cb7fd0ee1aef 100644
--- a/games-fps/doom3-roe/metadata.xml
+++ b/games-fps/doom3-roe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Science has unlocked the gates to the unknown, and now only one man stands
 between Hell and Earth. A sci-fi horror masterpiece, DOOM 3 is like nothing you
diff --git a/games-fps/doom3/metadata.xml b/games-fps/doom3/metadata.xml
index d8046bc3b532..b25e1e90c7cb 100644
--- a/games-fps/doom3/metadata.xml
+++ b/games-fps/doom3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Science has unlocked the gates to the unknown, and now only one man stands
 between Hell and Earth. A sci-fi horror masterpiece, DOOM 3 is like nothing you
diff --git a/games-fps/doomsday-resources/metadata.xml b/games-fps/doomsday-resources/metadata.xml
index 37f93d5031f9..5a9dadcb0f9b 100644
--- a/games-fps/doomsday-resources/metadata.xml
+++ b/games-fps/doomsday-resources/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">deng</remote-id>
 	</upstream>
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 49c5cbefa2d7..dc2e8448e447 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
 		<flag name="doom">Install launcher for jdoom game</flag>
diff --git a/games-fps/duke3d-data/metadata.xml b/games-fps/duke3d-data/metadata.xml
index 5efb97b70b2d..21164c089b00 100644
--- a/games-fps/duke3d-data/metadata.xml
+++ b/games-fps/duke3d-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="gog">Extract the data from the GOG.com installer.</flag>
 	</use>
diff --git a/games-fps/duke3d-demodata/metadata.xml b/games-fps/duke3d-demodata/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-fps/duke3d-demodata/metadata.xml
+++ b/games-fps/duke3d-demodata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-fps/duke3d/metadata.xml b/games-fps/duke3d/metadata.xml
index b4e1d35f5792..ca44a4066a13 100644
--- a/games-fps/duke3d/metadata.xml
+++ b/games-fps/duke3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 The third chapter in the series, and the first with a 3D perspective 
 (the original Duke Nukem and the sequel, Duke Nukem II, are side 
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 01ac6432a4ee..cae1e53d6890 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="demo">Install <pkg>games-fps/duke3d-demodata</pkg>
 			as well</flag>
diff --git a/games-fps/enemy-territory-etpro/metadata.xml b/games-fps/enemy-territory-etpro/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/enemy-territory-etpro/metadata.xml
+++ b/games-fps/enemy-territory-etpro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/enemy-territory-omnibot/metadata.xml b/games-fps/enemy-territory-omnibot/metadata.xml
index 026dfe459d51..1e7433d1848a 100644
--- a/games-fps/enemy-territory-omnibot/metadata.xml
+++ b/games-fps/enemy-territory-omnibot/metadata.xml
@@ -5,5 +5,8 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-	<herd>games</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/games-fps/enemy-territory-truecombat/metadata.xml b/games-fps/enemy-territory-truecombat/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/enemy-territory-truecombat/metadata.xml
+++ b/games-fps/enemy-territory-truecombat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/enemy-territory/metadata.xml b/games-fps/enemy-territory/metadata.xml
index d45982b39d58..3c11edaf39ce 100644
--- a/games-fps/enemy-territory/metadata.xml
+++ b/games-fps/enemy-territory/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Enemy Territory is a first-person 3-D shooter based loosely on the original Wolfenstein series by id software.  The game takes place in North Africa and Europe during World War II and allows you to play as either the Axis or the Allies.  There are several classes of characters you can play, each with their own special abilities and weapon choices.  You can also gain proficiency in your specialties and increase your abilities by performing your class's specialized duties, which helps promote teamwork.  Enemy Territory was originally to be a single and milti-player add-on for Return to Castle Wofenstein, but John Carmack and company were not happy with the progress they had made on it, so instead, they released it as a multi-player stand-alone game.
 </longdescription>
diff --git a/games-fps/etqw-bin/metadata.xml b/games-fps/etqw-bin/metadata.xml
index 668ca6c70661..bb9ce27abbfe 100644
--- a/games-fps/etqw-bin/metadata.xml
+++ b/games-fps/etqw-bin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>tristan@gentoo.org</email>
 		<name>Tristan Heaven</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-fps/etqw-data/metadata.xml b/games-fps/etqw-data/metadata.xml
index 668ca6c70661..bb9ce27abbfe 100644
--- a/games-fps/etqw-data/metadata.xml
+++ b/games-fps/etqw-data/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>tristan@gentoo.org</email>
 		<name>Tristan Heaven</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-fps/etqw-demo/metadata.xml b/games-fps/etqw-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/etqw-demo/metadata.xml
+++ b/games-fps/etqw-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ezquake-bin/metadata.xml b/games-fps/ezquake-bin/metadata.xml
index e660f9c84b2b..a937fda73d3a 100644
--- a/games-fps/ezquake-bin/metadata.xml
+++ b/games-fps/ezquake-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">ezquake</remote-id>
   </upstream>
diff --git a/games-fps/freedoom/metadata.xml b/games-fps/freedoom/metadata.xml
index f72870c0c28d..e86d7ab2b7bf 100644
--- a/games-fps/freedoom/metadata.xml
+++ b/games-fps/freedoom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-fps/glxquake-bin/metadata.xml b/games-fps/glxquake-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/glxquake-bin/metadata.xml
+++ b/games-fps/glxquake-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/industri/metadata.xml b/games-fps/industri/metadata.xml
index 6452dd7efd3d..9fb888489e22 100644
--- a/games-fps/industri/metadata.xml
+++ b/games-fps/industri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 industri is a Quake based, single player game using a modified version of the 
 Tenebrae 1.x engine. The Tenebrae engine is an Open Source (GNU GPL) modification 
diff --git a/games-fps/legends/metadata.xml b/games-fps/legends/metadata.xml
index 14fe61de7623..663e5d442962 100644
--- a/games-fps/legends/metadata.xml
+++ b/games-fps/legends/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Legends is a fast-paced first-person-perspective online multiplayer 
 game. The game is designed to take advantage of the beautiful 
diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
index 9240e8836b0d..d8bd5447229d 100644
--- a/games-fps/lsdldoom/metadata.xml
+++ b/games-fps/lsdldoom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="net">Enables network game support</flag>
 	<flag name="shareware">Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
diff --git a/games-fps/nexuiz/metadata.xml b/games-fps/nexuiz/metadata.xml
index c4fa7252526e..136f0dab9483 100644
--- a/games-fps/nexuiz/metadata.xml
+++ b/games-fps/nexuiz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="maps">Install the community map pack</flag>
   </use>
diff --git a/games-fps/openarena/metadata.xml b/games-fps/openarena/metadata.xml
index babae5de4cac..b8340b053339 100644
--- a/games-fps/openarena/metadata.xml
+++ b/games-fps/openarena/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">oarena</remote-id>
 	</upstream>
diff --git a/games-fps/postal2/metadata.xml b/games-fps/postal2/metadata.xml
index 668ca6c70661..bb9ce27abbfe 100644
--- a/games-fps/postal2/metadata.xml
+++ b/games-fps/postal2/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>tristan@gentoo.org</email>
 		<name>Tristan Heaven</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-fps/postal2mp-demo/metadata.xml b/games-fps/postal2mp-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/postal2mp-demo/metadata.xml
+++ b/games-fps/postal2mp-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/prboom/metadata.xml b/games-fps/prboom/metadata.xml
index e8df2816a78c..b8e90a84390a 100644
--- a/games-fps/prboom/metadata.xml
+++ b/games-fps/prboom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">prboom</remote-id>
 	</upstream>
diff --git a/games-fps/quake1-data/metadata.xml b/games-fps/quake1-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-data/metadata.xml
+++ b/games-fps/quake1-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-demodata/metadata.xml b/games-fps/quake1-demodata/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-demodata/metadata.xml
+++ b/games-fps/quake1-demodata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-killer/metadata.xml b/games-fps/quake1-killer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-killer/metadata.xml
+++ b/games-fps/quake1-killer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-movies/metadata.xml b/games-fps/quake1-movies/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-movies/metadata.xml
+++ b/games-fps/quake1-movies/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-rally/metadata.xml b/games-fps/quake1-rally/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-rally/metadata.xml
+++ b/games-fps/quake1-rally/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-teamfortress/metadata.xml b/games-fps/quake1-teamfortress/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-teamfortress/metadata.xml
+++ b/games-fps/quake1-teamfortress/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake1-textures/metadata.xml b/games-fps/quake1-textures/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake1-textures/metadata.xml
+++ b/games-fps/quake1-textures/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake2-data/metadata.xml b/games-fps/quake2-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake2-data/metadata.xml
+++ b/games-fps/quake2-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake2-demodata/metadata.xml b/games-fps/quake2-demodata/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake2-demodata/metadata.xml
+++ b/games-fps/quake2-demodata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake2-icculus/metadata.xml b/games-fps/quake2-icculus/metadata.xml
index 8b23c32d0e2a..041a4de70b0d 100644
--- a/games-fps/quake2-icculus/metadata.xml
+++ b/games-fps/quake2-icculus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="demo">Install the demo files (quake2-demodata) and configure for use</flag>
     <flag name="qmax">Build the pretty version (quake max)</flag>
diff --git a/games-fps/quake2-textures/metadata.xml b/games-fps/quake2-textures/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake2-textures/metadata.xml
+++ b/games-fps/quake2-textures/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-alliance/metadata.xml b/games-fps/quake3-alliance/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-alliance/metadata.xml
+++ b/games-fps/quake3-alliance/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-alternatefire/metadata.xml b/games-fps/quake3-alternatefire/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-alternatefire/metadata.xml
+++ b/games-fps/quake3-alternatefire/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-bfp/metadata.xml b/games-fps/quake3-bfp/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-bfp/metadata.xml
+++ b/games-fps/quake3-bfp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-bin/metadata.xml b/games-fps/quake3-bin/metadata.xml
index 1532777984a0..5dc0e7231993 100644
--- a/games-fps/quake3-bin/metadata.xml
+++ b/games-fps/quake3-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Quake III Arena is the third installment of the extremely popular and 
 successful Quake series by id software.  The game was released by id 
diff --git a/games-fps/quake3-cpma/metadata.xml b/games-fps/quake3-cpma/metadata.xml
index 483f24c94145..6439683c50ce 100644
--- a/games-fps/quake3-cpma/metadata.xml
+++ b/games-fps/quake3-cpma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 The Challenge Pro Mode (CPM) project was created by Richard 'Hoony' Sandlant in May 1999 
 (when the 'Q3test' was released) after he realised that Quake 3 Arena was going to have a 
diff --git a/games-fps/quake3-data/metadata.xml b/games-fps/quake3-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-data/metadata.xml
+++ b/games-fps/quake3-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-defrag/metadata.xml b/games-fps/quake3-defrag/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-defrag/metadata.xml
+++ b/games-fps/quake3-defrag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-demo/metadata.xml b/games-fps/quake3-demo/metadata.xml
index ec9701ac03a5..f9611654b54c 100644
--- a/games-fps/quake3-demo/metadata.xml
+++ b/games-fps/quake3-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="dedicated">install only as a dedicated game serer</flag>
 </use>
diff --git a/games-fps/quake3-excessiveplus/metadata.xml b/games-fps/quake3-excessiveplus/metadata.xml
index 4db49d924792..e31e87a7d4ac 100644
--- a/games-fps/quake3-excessiveplus/metadata.xml
+++ b/games-fps/quake3-excessiveplus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Excessive Plus is a Quake III Arena modification. It is a remake of the
 ingenious Mr. Pants' Excessive Overkill for Quake III Arena
diff --git a/games-fps/quake3-lrctf/metadata.xml b/games-fps/quake3-lrctf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-lrctf/metadata.xml
+++ b/games-fps/quake3-lrctf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-matrix/metadata.xml b/games-fps/quake3-matrix/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-matrix/metadata.xml
+++ b/games-fps/quake3-matrix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-nsco/metadata.xml b/games-fps/quake3-nsco/metadata.xml
index fe0152879354..1fd4e626fa93 100644
--- a/games-fps/quake3-nsco/metadata.xml
+++ b/games-fps/quake3-nsco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 
 
 	<longdescription>
diff --git a/games-fps/quake3-osp/metadata.xml b/games-fps/quake3-osp/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-osp/metadata.xml
+++ b/games-fps/quake3-osp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-ra3/metadata.xml b/games-fps/quake3-ra3/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-ra3/metadata.xml
+++ b/games-fps/quake3-ra3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-reaction/metadata.xml b/games-fps/quake3-reaction/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-reaction/metadata.xml
+++ b/games-fps/quake3-reaction/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-ruinhunters/metadata.xml b/games-fps/quake3-ruinhunters/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-ruinhunters/metadata.xml
+++ b/games-fps/quake3-ruinhunters/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-teamarena/metadata.xml b/games-fps/quake3-teamarena/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-teamarena/metadata.xml
+++ b/games-fps/quake3-teamarena/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3-threewave/metadata.xml b/games-fps/quake3-threewave/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake3-threewave/metadata.xml
+++ b/games-fps/quake3-threewave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake3/metadata.xml b/games-fps/quake3/metadata.xml
index 360c025739d2..60e7c26b5c3a 100644
--- a/games-fps/quake3/metadata.xml
+++ b/games-fps/quake3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Quake III Arena is the third installment of the extremely popular and 
 successful Quake series by id software.  The game was released by id 
diff --git a/games-fps/quake4-bin/metadata.xml b/games-fps/quake4-bin/metadata.xml
index c833f8d5ea1f..c680d6d1214e 100644
--- a/games-fps/quake4-bin/metadata.xml
+++ b/games-fps/quake4-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 In a desparate war for Earth's survival against and unrelenting alient enemy,
 the only way to defeat them is to become one of them.
diff --git a/games-fps/quake4-data/metadata.xml b/games-fps/quake4-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/quake4-data/metadata.xml
+++ b/games-fps/quake4-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/quake4-demo/metadata.xml b/games-fps/quake4-demo/metadata.xml
index 83edc89772ba..b0709194f99d 100644
--- a/games-fps/quake4-demo/metadata.xml
+++ b/games-fps/quake4-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 In a desparate war for Earth's survival against and unrelenting alient enemy,
 the only way to defeat them is to become one of them.
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index d3995b1c6533..90bc68b55a8e 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 QuakeForge is a 3D graphics game engine based on id Software's legendary 
 Quake and QuakeWorld game engine. Our purpose? To improve the state of 
diff --git a/games-fps/qudos/metadata.xml b/games-fps/qudos/metadata.xml
index 0dd51f0c44b4..17cae562a809 100644
--- a/games-fps/qudos/metadata.xml
+++ b/games-fps/qudos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="demo">Install the demo files (quake2-demodata) and configure for use</flag>
     <flag name="mods">Build support for the quake2 mission packs</flag>
diff --git a/games-fps/red-blue-quake2/metadata.xml b/games-fps/red-blue-quake2/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/red-blue-quake2/metadata.xml
+++ b/games-fps/red-blue-quake2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/rott/metadata.xml b/games-fps/rott/metadata.xml
index 06796f166e2f..374aed29a795 100644
--- a/games-fps/rott/metadata.xml
+++ b/games-fps/rott/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 THE STORY
 
diff --git a/games-fps/rtcw/metadata.xml b/games-fps/rtcw/metadata.xml
index a3e346eff6e9..9f3101d63cc3 100644
--- a/games-fps/rtcw/metadata.xml
+++ b/games-fps/rtcw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Return to Castle Wolfenstein is a first-person 3-D shooter based loosely on the original Wolfenstein series by id software.  The game takes place in Europe during World War II.  In the single player game, you play as a US military special operative sent behind enemy lines to stop the Nazi studies into the supernatural and the occult.  The multi-player game is a team-based, goal-oriented series of missions and allows you to play as either the Axis or the Allies.  There are several classes of characters you can play, each with their own special abilities and weapon choices.  The port to Linux was done by TTimo of id software and is an unsupported binary release.  This game is commercial software and requires data from the retail Windows version to play.
 </longdescription>
diff --git a/games-fps/rtcwmp-demo/metadata.xml b/games-fps/rtcwmp-demo/metadata.xml
index bf237e2b6f2e..d929edbaafc2 100644
--- a/games-fps/rtcwmp-demo/metadata.xml
+++ b/games-fps/rtcwmp-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 The sequel to id Software's classic Wolfenstein 3-D.  This version of the demo is only for multi-player.
 </longdescription>
diff --git a/games-fps/rtcwsp-demo/metadata.xml b/games-fps/rtcwsp-demo/metadata.xml
index 9d3fe203e572..dac1d379216a 100644
--- a/games-fps/rtcwsp-demo/metadata.xml
+++ b/games-fps/rtcwsp-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 The sequel to id Software's classic Wolfenstein 3-D.  This version of the demo
 is only for single-player.
diff --git a/games-fps/sauerbraten/metadata.xml b/games-fps/sauerbraten/metadata.xml
index b74f1a8331a6..64c0daf8f0c8 100644
--- a/games-fps/sauerbraten/metadata.xml
+++ b/games-fps/sauerbraten/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="server">Compile server support</flag>
 	</use>
diff --git a/games-fps/soldieroffortune-demo/metadata.xml b/games-fps/soldieroffortune-demo/metadata.xml
index 6f23b7752861..e79d80aca101 100644
--- a/games-fps/soldieroffortune-demo/metadata.xml
+++ b/games-fps/soldieroffortune-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Soldier of Fortune is a first-person 3-D shooter based on the mercenary trade.  You play as John, an ex-military mercinary who still has plenty of good friends on the inside.  For a wad of bucks, you'll do the job -- no cares, no worries. Just get the gun, play for keeps, get paid, on to the next one -- that's your life. That's what you do. And you're good at it, one of the best even. But now is the time for your biggest challenge ever.  This is the demo version of the game.
 </longdescription>
diff --git a/games-fps/soldieroffortune/metadata.xml b/games-fps/soldieroffortune/metadata.xml
index 9200a54f5b3b..756e4fec0a24 100644
--- a/games-fps/soldieroffortune/metadata.xml
+++ b/games-fps/soldieroffortune/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Soldier of Fortune is a first-person 3-D shooter based on the mercenary trade.  You play as John, an ex-military mercinary who still has plenty of good friends on the inside.  For a wad of bucks, you'll do the job -- no cares, no worries. Just get the gun, play for keeps, get paid, on to the next one -- that's your life. That's what you do. And you're good at it, one of the best even. But now is the time for your biggest challenge ever.  The game was ported to Linux by the now defunct Loki Entertainment and is commercial software.  You can still pick up a copy from Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher is no longer in business.
 </longdescription>
diff --git a/games-fps/tenebrae/metadata.xml b/games-fps/tenebrae/metadata.xml
index a9b54b987180..e2dc0a678c7c 100644
--- a/games-fps/tenebrae/metadata.xml
+++ b/games-fps/tenebrae/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 Tenebrae is a modification of the quake source that adds stencil shadows 
 and per pixel lights to quake. Stencil shadows allow for realistic 
diff --git a/games-fps/transfusion-bin/metadata.xml b/games-fps/transfusion-bin/metadata.xml
index b23a3240761b..e359081f9006 100644
--- a/games-fps/transfusion-bin/metadata.xml
+++ b/games-fps/transfusion-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">blood</remote-id>
 	</upstream>
diff --git a/games-fps/tribes2/metadata.xml b/games-fps/tribes2/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/tribes2/metadata.xml
+++ b/games-fps/tribes2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
index 4b3e94fddae2..a616db101cd3 100644
--- a/games-fps/turtlearena/metadata.xml
+++ b/games-fps/turtlearena/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+	    <email>games@gentoo.org</email>
+	    <name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 	    <flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
 		<flag name="server">Build server target</flag>
diff --git a/games-fps/unreal-tournament-bonuspacks/metadata.xml b/games-fps/unreal-tournament-bonuspacks/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/unreal-tournament-bonuspacks/metadata.xml
+++ b/games-fps/unreal-tournament-bonuspacks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/unreal-tournament-goty/metadata.xml b/games-fps/unreal-tournament-goty/metadata.xml
index 2fb907b81322..491ed1b35e69 100644
--- a/games-fps/unreal-tournament-goty/metadata.xml
+++ b/games-fps/unreal-tournament-goty/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>vapier@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 In the single player mode, the player squares off 
 against computer controlled Bots in all the game modes 
diff --git a/games-fps/unreal-tournament-strikeforce/metadata.xml b/games-fps/unreal-tournament-strikeforce/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/unreal-tournament-strikeforce/metadata.xml
+++ b/games-fps/unreal-tournament-strikeforce/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/unreal-tournament/metadata.xml b/games-fps/unreal-tournament/metadata.xml
index fcb75f57e0db..7a260e007f5a 100644
--- a/games-fps/unreal-tournament/metadata.xml
+++ b/games-fps/unreal-tournament/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 In the single player mode, the player squares off 
 against computer controlled Bots in all the game modes 
diff --git a/games-fps/unreal/metadata.xml b/games-fps/unreal/metadata.xml
index 8b45008de986..d76353ce7c13 100644
--- a/games-fps/unreal/metadata.xml
+++ b/games-fps/unreal/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 In Unreal, players take on the role of a criminal whose transfer ship 
 has crashed on the mysterious planet Gryphon, where a peaceful race 
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index ca7d09f3049e..3f503931e717 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="altgamma">Clearskies - X11-based gamma for Linux</flag>
 		<flag name="server">Build server target</flag>
diff --git a/games-fps/ut2003-bonuspack-cm/metadata.xml b/games-fps/ut2003-bonuspack-cm/metadata.xml
index 9da2490bda56..534951463a21 100644
--- a/games-fps/ut2003-bonuspack-cm/metadata.xml
+++ b/games-fps/ut2003-bonuspack-cm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
 </longdescription>
diff --git a/games-fps/ut2003-bonuspack-de/metadata.xml b/games-fps/ut2003-bonuspack-de/metadata.xml
index 9da2490bda56..534951463a21 100644
--- a/games-fps/ut2003-bonuspack-de/metadata.xml
+++ b/games-fps/ut2003-bonuspack-de/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
 </longdescription>
diff --git a/games-fps/ut2003-bonuspack-epic/metadata.xml b/games-fps/ut2003-bonuspack-epic/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2003-bonuspack-epic/metadata.xml
+++ b/games-fps/ut2003-bonuspack-epic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2003-data/metadata.xml b/games-fps/ut2003-data/metadata.xml
index 9da2490bda56..534951463a21 100644
--- a/games-fps/ut2003-data/metadata.xml
+++ b/games-fps/ut2003-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
 </longdescription>
diff --git a/games-fps/ut2003-demo/metadata.xml b/games-fps/ut2003-demo/metadata.xml
index d577ee65eb60..2ba653e9743e 100644
--- a/games-fps/ut2003-demo/metadata.xml
+++ b/games-fps/ut2003-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is a playable demo of the full commercial version.
 </longdescription>
diff --git a/games-fps/ut2003/metadata.xml b/games-fps/ut2003/metadata.xml
index 9da2490bda56..534951463a21 100644
--- a/games-fps/ut2003/metadata.xml
+++ b/games-fps/ut2003/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
 </longdescription>
diff --git a/games-fps/ut2004-action/metadata.xml b/games-fps/ut2004-action/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-action/metadata.xml
+++ b/games-fps/ut2004-action/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-airbuccaneers/metadata.xml b/games-fps/ut2004-airbuccaneers/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-airbuccaneers/metadata.xml
+++ b/games-fps/ut2004-airbuccaneers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-alienswarm/metadata.xml b/games-fps/ut2004-alienswarm/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-alienswarm/metadata.xml
+++ b/games-fps/ut2004-alienswarm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-cbp1/metadata.xml b/games-fps/ut2004-bonuspack-cbp1/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-bonuspack-cbp1/metadata.xml
+++ b/games-fps/ut2004-bonuspack-cbp1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-cbp2/metadata.xml b/games-fps/ut2004-bonuspack-cbp2/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-bonuspack-cbp2/metadata.xml
+++ b/games-fps/ut2004-bonuspack-cbp2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-ece/metadata.xml b/games-fps/ut2004-bonuspack-ece/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-bonuspack-ece/metadata.xml
+++ b/games-fps/ut2004-bonuspack-ece/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-mega/metadata.xml b/games-fps/ut2004-bonuspack-mega/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-bonuspack-mega/metadata.xml
+++ b/games-fps/ut2004-bonuspack-mega/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-cor/metadata.xml b/games-fps/ut2004-cor/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-cor/metadata.xml
+++ b/games-fps/ut2004-cor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-crossfire/metadata.xml b/games-fps/ut2004-crossfire/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-crossfire/metadata.xml
+++ b/games-fps/ut2004-crossfire/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-data/metadata.xml b/games-fps/ut2004-data/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-data/metadata.xml
+++ b/games-fps/ut2004-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-deathball/metadata.xml b/games-fps/ut2004-deathball/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-deathball/metadata.xml
+++ b/games-fps/ut2004-deathball/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-demo/metadata.xml b/games-fps/ut2004-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-demo/metadata.xml
+++ b/games-fps/ut2004-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-fragops/metadata.xml b/games-fps/ut2004-fragops/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-fragops/metadata.xml
+++ b/games-fps/ut2004-fragops/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-hamsterbash/metadata.xml b/games-fps/ut2004-hamsterbash/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-hamsterbash/metadata.xml
+++ b/games-fps/ut2004-hamsterbash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-muralis/metadata.xml b/games-fps/ut2004-muralis/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-muralis/metadata.xml
+++ b/games-fps/ut2004-muralis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-strikeforce/metadata.xml b/games-fps/ut2004-strikeforce/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-strikeforce/metadata.xml
+++ b/games-fps/ut2004-strikeforce/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-troopers/metadata.xml b/games-fps/ut2004-troopers/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-troopers/metadata.xml
+++ b/games-fps/ut2004-troopers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004-unwheel/metadata.xml b/games-fps/ut2004-unwheel/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004-unwheel/metadata.xml
+++ b/games-fps/ut2004-unwheel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/ut2004/metadata.xml b/games-fps/ut2004/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-fps/ut2004/metadata.xml
+++ b/games-fps/ut2004/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-fps/warsow/metadata.xml b/games-fps/warsow/metadata.xml
index faba8100746c..a05fdc2bb72a 100644
--- a/games-fps/warsow/metadata.xml
+++ b/games-fps/warsow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
 	<flag name="irc">Enable IRC support</flag>
 	<flag name="server">Build server binaries additionally</flag>
diff --git a/games-fps/wolfgl/metadata.xml b/games-fps/wolfgl/metadata.xml
index d2cb0119470c..092f341cc7f4 100644
--- a/games-fps/wolfgl/metadata.xml
+++ b/games-fps/wolfgl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wolfgl</remote-id>
   </upstream>
diff --git a/games-fps/worldofpadman/metadata.xml b/games-fps/worldofpadman/metadata.xml
index 56ae7082b57e..7de866d9d903 100644
--- a/games-fps/worldofpadman/metadata.xml
+++ b/games-fps/worldofpadman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="maps">Install extra maps (PadPack)</flag>
   </use>
diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index 1a4019ae7fcd..5df01383dee9 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="ode">Enable support for physics engine from <pkg>dev-games/ode</pkg></flag>
 </use>
diff --git a/games-kids/childsplay/metadata.xml b/games-kids/childsplay/metadata.xml
index 0aefcf9cc3b4..3463824a6a67 100644
--- a/games-kids/childsplay/metadata.xml
+++ b/games-kids/childsplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Childsplay is a suite of educational games for young children, like gcompris,
 but without the overkill of c/c++ and the gnome environ.
diff --git a/games-kids/crayon-physics/metadata.xml b/games-kids/crayon-physics/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-kids/crayon-physics/metadata.xml
+++ b/games-kids/crayon-physics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-kids/cubetest/metadata.xml b/games-kids/cubetest/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-kids/cubetest/metadata.xml
+++ b/games-kids/cubetest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml
index f72870c0c28d..e86d7ab2b7bf 100644
--- a/games-kids/gcompris/metadata.xml
+++ b/games-kids/gcompris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-kids/gmult/metadata.xml b/games-kids/gmult/metadata.xml
index 3f66285f8506..26f263543cf5 100644
--- a/games-kids/gmult/metadata.xml
+++ b/games-kids/gmult/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gmult</remote-id>
 	</upstream>
diff --git a/games-kids/lletters/metadata.xml b/games-kids/lletters/metadata.xml
index e3c708e396e2..9f68d0deef89 100644
--- a/games-kids/lletters/metadata.xml
+++ b/games-kids/lletters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lln</remote-id>
 	</upstream>
diff --git a/games-kids/memonix/metadata.xml b/games-kids/memonix/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-kids/memonix/metadata.xml
+++ b/games-kids/memonix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-kids/pytraffic/metadata.xml b/games-kids/pytraffic/metadata.xml
index e337a6e70f15..b242b2fdbc6f 100644
--- a/games-kids/pytraffic/metadata.xml
+++ b/games-kids/pytraffic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">pytraffic</remote-id>
 	</upstream>
diff --git a/games-kids/tuxmath/metadata.xml b/games-kids/tuxmath/metadata.xml
index 8e44372ac61b..c2daecf392b2 100644
--- a/games-kids/tuxmath/metadata.xml
+++ b/games-kids/tuxmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tuxmath</remote-id>
 	</upstream>
diff --git a/games-kids/tuxmathscrabble/metadata.xml b/games-kids/tuxmathscrabble/metadata.xml
index d55f8c0d374d..5f9e741d8f6c 100644
--- a/games-kids/tuxmathscrabble/metadata.xml
+++ b/games-kids/tuxmathscrabble/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">asymptopia/tuxmathscrabble</remote-id>
 	</upstream>
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-kids/tuxtype/metadata.xml
+++ b/games-kids/tuxtype/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/OilWar/metadata.xml b/games-misc/OilWar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/OilWar/metadata.xml
+++ b/games-misc/OilWar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/asr-manpages/metadata.xml b/games-misc/asr-manpages/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/asr-manpages/metadata.xml
+++ b/games-misc/asr-manpages/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/bsd-games/metadata.xml b/games-misc/bsd-games/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/bsd-games/metadata.xml
+++ b/games-misc/bsd-games/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/bsod/metadata.xml b/games-misc/bsod/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/bsod/metadata.xml
+++ b/games-misc/bsod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/c++robots/metadata.xml b/games-misc/c++robots/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/c++robots/metadata.xml
+++ b/games-misc/c++robots/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/cowsay/metadata.xml b/games-misc/cowsay/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/cowsay/metadata.xml
+++ b/games-misc/cowsay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/dont-starve/metadata.xml b/games-misc/dont-starve/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/dont-starve/metadata.xml
+++ b/games-misc/dont-starve/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/exult-sound/metadata.xml b/games-misc/exult-sound/metadata.xml
index 1c9acdb0dae6..412ce9fd86cd 100644
--- a/games-misc/exult-sound/metadata.xml
+++ b/games-misc/exult-sound/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">exult</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-all/metadata.xml b/games-misc/fortune-mod-all/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-all/metadata.xml
+++ b/games-misc/fortune-mod-all/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-at-linux/metadata.xml b/games-misc/fortune-mod-at-linux/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-at-linux/metadata.xml
+++ b/games-misc/fortune-mod-at-linux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-bofh-excuses/metadata.xml b/games-misc/fortune-mod-bofh-excuses/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-bofh-excuses/metadata.xml
+++ b/games-misc/fortune-mod-bofh-excuses/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-calvin/metadata.xml b/games-misc/fortune-mod-calvin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-calvin/metadata.xml
+++ b/games-misc/fortune-mod-calvin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-chucknorris/metadata.xml b/games-misc/fortune-mod-chucknorris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-chucknorris/metadata.xml
+++ b/games-misc/fortune-mod-chucknorris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-cs/metadata.xml b/games-misc/fortune-mod-cs/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-cs/metadata.xml
+++ b/games-misc/fortune-mod-cs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-debilneho/metadata.xml b/games-misc/fortune-mod-debilneho/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-debilneho/metadata.xml
+++ b/games-misc/fortune-mod-debilneho/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-discworld/metadata.xml b/games-misc/fortune-mod-discworld/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-discworld/metadata.xml
+++ b/games-misc/fortune-mod-discworld/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-dubya/metadata.xml b/games-misc/fortune-mod-dubya/metadata.xml
index 39a9fb9cd378..d6b3bc689221 100644
--- a/games-misc/fortune-mod-dubya/metadata.xml
+++ b/games-misc/fortune-mod-dubya/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 	dubya is a module for fortune-mod, and contains many quotes from George W.
 	Bush.  The great majority, if not all, of these quotes were originally
diff --git a/games-misc/fortune-mod-dune/metadata.xml b/games-misc/fortune-mod-dune/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-dune/metadata.xml
+++ b/games-misc/fortune-mod-dune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-familyguy/metadata.xml b/games-misc/fortune-mod-familyguy/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-familyguy/metadata.xml
+++ b/games-misc/fortune-mod-familyguy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-firefly/metadata.xml b/games-misc/fortune-mod-firefly/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-firefly/metadata.xml
+++ b/games-misc/fortune-mod-firefly/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-flashrider/metadata.xml b/games-misc/fortune-mod-flashrider/metadata.xml
index d0f7034945d3..cf1d04477386 100644
--- a/games-misc/fortune-mod-flashrider/metadata.xml
+++ b/games-misc/fortune-mod-flashrider/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>zzam@gentoo.org</email>
 		<name>Matthias Schwarzott</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-futurama/metadata.xml b/games-misc/fortune-mod-futurama/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-futurama/metadata.xml
+++ b/games-misc/fortune-mod-futurama/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-fvl/metadata.xml b/games-misc/fortune-mod-fvl/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-fvl/metadata.xml
+++ b/games-misc/fortune-mod-fvl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-gentoo-dev/metadata.xml b/games-misc/fortune-mod-gentoo-dev/metadata.xml
index bbc3d9c80974..6c3e98194348 100644
--- a/games-misc/fortune-mod-gentoo-dev/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-dev/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 	<name>Robin H. Johnson</name>
 	<description>Maintainer. Also, please submit snippets for the fortunes to
 		me.</description>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-forums/metadata.xml b/games-misc/fortune-mod-gentoo-forums/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-gentoo-forums/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-forums/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-ru/metadata.xml b/games-misc/fortune-mod-gentoo-ru/metadata.xml
index c1f4cdf9b82d..a71777cb0cad 100644
--- a/games-misc/fortune-mod-gentoo-ru/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-ru/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 	</maintainer>
 	<maintainer>
 		<email>qnikst@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
 and other russian gentoo related resourses.</longdescription>
 	<upstream>
diff --git a/games-misc/fortune-mod-hitchhiker/metadata.xml b/games-misc/fortune-mod-hitchhiker/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-hitchhiker/metadata.xml
+++ b/games-misc/fortune-mod-hitchhiker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-homer/metadata.xml b/games-misc/fortune-mod-homer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-homer/metadata.xml
+++ b/games-misc/fortune-mod-homer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-humorixfortunes/metadata.xml b/games-misc/fortune-mod-humorixfortunes/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-humorixfortunes/metadata.xml
+++ b/games-misc/fortune-mod-humorixfortunes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-it/metadata.xml b/games-misc/fortune-mod-it/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-it/metadata.xml
+++ b/games-misc/fortune-mod-it/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-kernelcookies/metadata.xml b/games-misc/fortune-mod-kernelcookies/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-kernelcookies/metadata.xml
+++ b/games-misc/fortune-mod-kernelcookies/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-mormon/metadata.xml b/games-misc/fortune-mod-mormon/metadata.xml
index fc42e0073f29..d0c5184cf4c5 100644
--- a/games-misc/fortune-mod-mormon/metadata.xml
+++ b/games-misc/fortune-mod-mormon/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>theology</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
+++ b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-osfortune/metadata.xml b/games-misc/fortune-mod-osfortune/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-osfortune/metadata.xml
+++ b/games-misc/fortune-mod-osfortune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-powerpuff/metadata.xml b/games-misc/fortune-mod-powerpuff/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-powerpuff/metadata.xml
+++ b/games-misc/fortune-mod-powerpuff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-pqf/metadata.xml b/games-misc/fortune-mod-pqf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-pqf/metadata.xml
+++ b/games-misc/fortune-mod-pqf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-rss/metadata.xml b/games-misc/fortune-mod-rss/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-rss/metadata.xml
+++ b/games-misc/fortune-mod-rss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-scriptures/metadata.xml b/games-misc/fortune-mod-scriptures/metadata.xml
index fc42e0073f29..d0c5184cf4c5 100644
--- a/games-misc/fortune-mod-scriptures/metadata.xml
+++ b/games-misc/fortune-mod-scriptures/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>theology</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml b/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
+++ b/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-slackware/metadata.xml b/games-misc/fortune-mod-slackware/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-slackware/metadata.xml
+++ b/games-misc/fortune-mod-slackware/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-smac/metadata.xml b/games-misc/fortune-mod-smac/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-smac/metadata.xml
+++ b/games-misc/fortune-mod-smac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-sp-fortunes/metadata.xml b/games-misc/fortune-mod-sp-fortunes/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-sp-fortunes/metadata.xml
+++ b/games-misc/fortune-mod-sp-fortunes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-starwars/metadata.xml b/games-misc/fortune-mod-starwars/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-starwars/metadata.xml
+++ b/games-misc/fortune-mod-starwars/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-strangelove/metadata.xml b/games-misc/fortune-mod-strangelove/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-strangelove/metadata.xml
+++ b/games-misc/fortune-mod-strangelove/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-tao/metadata.xml b/games-misc/fortune-mod-tao/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-tao/metadata.xml
+++ b/games-misc/fortune-mod-tao/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-taow/metadata.xml b/games-misc/fortune-mod-taow/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-taow/metadata.xml
+++ b/games-misc/fortune-mod-taow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
+++ b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-woody-allen-it/metadata.xml b/games-misc/fortune-mod-woody-allen-it/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-woody-allen-it/metadata.xml
+++ b/games-misc/fortune-mod-woody-allen-it/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-zx-error/metadata.xml b/games-misc/fortune-mod-zx-error/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-zx-error/metadata.xml
+++ b/games-misc/fortune-mod-zx-error/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod/metadata.xml b/games-misc/fortune-mod/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod/metadata.xml
+++ b/games-misc/fortune-mod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/funny-manpages/metadata.xml b/games-misc/funny-manpages/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/funny-manpages/metadata.xml
+++ b/games-misc/funny-manpages/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/gBhed/metadata.xml b/games-misc/gBhed/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/gBhed/metadata.xml
+++ b/games-misc/gBhed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/games-envd/metadata.xml b/games-misc/games-envd/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/games-envd/metadata.xml
+++ b/games-misc/games-envd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/ggencoder/metadata.xml b/games-misc/ggencoder/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/ggencoder/metadata.xml
+++ b/games-misc/ggencoder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/gtklife/metadata.xml b/games-misc/gtklife/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/gtklife/metadata.xml
+++ b/games-misc/gtklife/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/katawa-shoujo/metadata.xml b/games-misc/katawa-shoujo/metadata.xml
index e2230c40ed48..d919d15ebc8f 100644
--- a/games-misc/katawa-shoujo/metadata.xml
+++ b/games-misc/katawa-shoujo/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maksverver@geocities.com</email>
 		<name>Maks Verver</name>
@@ -13,6 +11,14 @@
 		<name>Alex Xu</name>
 		<description>Proxied maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="system-renpy">Use <pkg>games-engines/renpy</pkg> instead of the bundled one (experimental)</flag>
 	</use>
diff --git a/games-misc/little-inferno/metadata.xml b/games-misc/little-inferno/metadata.xml
index 2133b024aaef..4f2cd2a3bba5 100644
--- a/games-misc/little-inferno/metadata.xml
+++ b/games-misc/little-inferno/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
diff --git a/games-misc/lolcat/metadata.xml b/games-misc/lolcat/metadata.xml
index 8a24ef8c3bd0..b4e05ca8d01e 100644
--- a/games-misc/lolcat/metadata.xml
+++ b/games-misc/lolcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">busyloop/lolcat</remote-id>
 	</upstream>
diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
index 2f384c0e3613..f0276886f7ec 100644
--- a/games-misc/lucidlife/metadata.xml
+++ b/games-misc/lucidlife/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/nyancat/metadata.xml b/games-misc/nyancat/metadata.xml
index bc44a06a0e1e..3399fa888fbd 100644
--- a/games-misc/nyancat/metadata.xml
+++ b/games-misc/nyancat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">klange/nyancat</remote-id>
 	</upstream>
diff --git a/games-misc/opengfx/metadata.xml b/games-misc/opengfx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/opengfx/metadata.xml
+++ b/games-misc/opengfx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/openmsx/metadata.xml b/games-misc/openmsx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/openmsx/metadata.xml
+++ b/games-misc/openmsx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/opensfx/metadata.xml b/games-misc/opensfx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/opensfx/metadata.xml
+++ b/games-misc/opensfx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/papers-please/metadata.xml b/games-misc/papers-please/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/papers-please/metadata.xml
+++ b/games-misc/papers-please/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/qlife/metadata.xml b/games-misc/qlife/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/qlife/metadata.xml
+++ b/games-misc/qlife/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/rfksay/metadata.xml b/games-misc/rfksay/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/rfksay/metadata.xml
+++ b/games-misc/rfksay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/robotfindskitten/metadata.xml b/games-misc/robotfindskitten/metadata.xml
index aac5d18a769d..cc673760de96 100644
--- a/games-misc/robotfindskitten/metadata.xml
+++ b/games-misc/robotfindskitten/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rfk</remote-id>
 	</upstream>
diff --git a/games-misc/sdljoytest/metadata.xml b/games-misc/sdljoytest/metadata.xml
index 7a55811def1a..c5d4d9f9ffd2 100644
--- a/games-misc/sdljoytest/metadata.xml
+++ b/games-misc/sdljoytest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdljoytest</remote-id>
 	</upstream>
diff --git a/games-misc/sex/metadata.xml b/games-misc/sex/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/sex/metadata.xml
+++ b/games-misc/sex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/typespeed/metadata.xml b/games-misc/typespeed/metadata.xml
index 712b1eb014a5..c2df896a988a 100644
--- a/games-misc/typespeed/metadata.xml
+++ b/games-misc/typespeed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">typespeed</remote-id>
 	</upstream>
diff --git a/games-misc/wtf/metadata.xml b/games-misc/wtf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/wtf/metadata.xml
+++ b/games-misc/wtf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/wumpus/metadata.xml b/games-misc/wumpus/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/wumpus/metadata.xml
+++ b/games-misc/wumpus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/xcruiser/metadata.xml b/games-misc/xcruiser/metadata.xml
index 1a97e4bca997..cca3221afe60 100644
--- a/games-misc/xcruiser/metadata.xml
+++ b/games-misc/xcruiser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xcruiser</remote-id>
 	</upstream>
diff --git a/games-misc/xpenguins/metadata.xml b/games-misc/xpenguins/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/xpenguins/metadata.xml
+++ b/games-misc/xpenguins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/yadex/metadata.xml b/games-misc/yadex/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/yadex/metadata.xml
+++ b/games-misc/yadex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/circlemud/metadata.xml b/games-mud/circlemud/metadata.xml
index fdb2e1e3c87a..50d5a753d5a8 100644
--- a/games-mud/circlemud/metadata.xml
+++ b/games-mud/circlemud/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 CircleMUD is a multi-user dungeon game system (MUD) written by Jeremy Elson, originally at 
 Johns Hopkins University's Department of Computer Science (I graduated in May of 1996). 
diff --git a/games-mud/crystal/metadata.xml b/games-mud/crystal/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/crystal/metadata.xml
+++ b/games-mud/crystal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/gmudix/metadata.xml b/games-mud/gmudix/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/gmudix/metadata.xml
+++ b/games-mud/gmudix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/gnome-mud/metadata.xml b/games-mud/gnome-mud/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/gnome-mud/metadata.xml
+++ b/games-mud/gnome-mud/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/kildclient/metadata.xml b/games-mud/kildclient/metadata.xml
index 24170aebd0a0..c26669b268b9 100644
--- a/games-mud/kildclient/metadata.xml
+++ b/games-mud/kildclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kildclient</remote-id>
 	</upstream>
diff --git a/games-mud/kmuddy/metadata.xml b/games-mud/kmuddy/metadata.xml
index ea290d70f97c..ba21ebe62be2 100644
--- a/games-mud/kmuddy/metadata.xml
+++ b/games-mud/kmuddy/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
-<herd>kde</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/lyntin/metadata.xml b/games-mud/lyntin/metadata.xml
index 13ee14f49b0f..f47a7a05a902 100644
--- a/games-mud/lyntin/metadata.xml
+++ b/games-mud/lyntin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lyntin</remote-id>
 	</upstream>
diff --git a/games-mud/mudix/metadata.xml b/games-mud/mudix/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/mudix/metadata.xml
+++ b/games-mud/mudix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/powwow/metadata.xml b/games-mud/powwow/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/powwow/metadata.xml
+++ b/games-mud/powwow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/tf/metadata.xml b/games-mud/tf/metadata.xml
index 12c9d5c70935..8e3b0e55d1ee 100644
--- a/games-mud/tf/metadata.xml
+++ b/games-mud/tf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="atcp">enable ATCP support.</flag>
     <flag name="gmcp">enable GMCP support.</flag>
diff --git a/games-mud/tintin/metadata.xml b/games-mud/tintin/metadata.xml
index 61867dc41b23..0dbabfc50b88 100644
--- a/games-mud/tintin/metadata.xml
+++ b/games-mud/tintin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tintin</remote-id>
 	</upstream>
diff --git a/games-mud/tkmoo/metadata.xml b/games-mud/tkmoo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-mud/tkmoo/metadata.xml
+++ b/games-mud/tkmoo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-mud/trebuchet/metadata.xml b/games-mud/trebuchet/metadata.xml
index 565ebc79b0bb..0f5bfc3c7e76 100644
--- a/games-mud/trebuchet/metadata.xml
+++ b/games-mud/trebuchet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">trebuchet</remote-id>
 	</upstream>
diff --git a/games-puzzle/4stattack/metadata.xml b/games-puzzle/4stattack/metadata.xml
index 8a762d2d0fc2..77a410185f09 100644
--- a/games-puzzle/4stattack/metadata.xml
+++ b/games-puzzle/4stattack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">forcedattack</remote-id>
 	</upstream>
diff --git a/games-puzzle/amoebax/metadata.xml b/games-puzzle/amoebax/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/amoebax/metadata.xml
+++ b/games-puzzle/amoebax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/anagramarama/metadata.xml b/games-puzzle/anagramarama/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/anagramarama/metadata.xml
+++ b/games-puzzle/anagramarama/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/angrydd/metadata.xml b/games-puzzle/angrydd/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/angrydd/metadata.xml
+++ b/games-puzzle/angrydd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/arrows/metadata.xml b/games-puzzle/arrows/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/arrows/metadata.xml
+++ b/games-puzzle/arrows/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/atomix/metadata.xml b/games-puzzle/atomix/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-puzzle/atomix/metadata.xml
+++ b/games-puzzle/atomix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/bastet/metadata.xml b/games-puzzle/bastet/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/bastet/metadata.xml
+++ b/games-puzzle/bastet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/biniax2/metadata.xml b/games-puzzle/biniax2/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/biniax2/metadata.xml
+++ b/games-puzzle/biniax2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/braincurses/metadata.xml b/games-puzzle/braincurses/metadata.xml
index f8159f79ec81..4595a506e5e9 100644
--- a/games-puzzle/braincurses/metadata.xml
+++ b/games-puzzle/braincurses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">braincurses</remote-id>
 		<remote-id type="freshmeat">braincurses</remote-id>
diff --git a/games-puzzle/brainparty/metadata.xml b/games-puzzle/brainparty/metadata.xml
index edd52d2870d2..13879a489aca 100644
--- a/games-puzzle/brainparty/metadata.xml
+++ b/games-puzzle/brainparty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">brainparty</remote-id>
 	</upstream>
diff --git a/games-puzzle/brainworkshop/metadata.xml b/games-puzzle/brainworkshop/metadata.xml
index 6c54b4173f44..fb504949b568 100644
--- a/games-puzzle/brainworkshop/metadata.xml
+++ b/games-puzzle/brainworkshop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">brainworkshop</remote-id>
 	</upstream>
diff --git a/games-puzzle/bubble-chains/metadata.xml b/games-puzzle/bubble-chains/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/bubble-chains/metadata.xml
+++ b/games-puzzle/bubble-chains/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/colorcode/metadata.xml b/games-puzzle/colorcode/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/colorcode/metadata.xml
+++ b/games-puzzle/colorcode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/concentration/metadata.xml b/games-puzzle/concentration/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/concentration/metadata.xml
+++ b/games-puzzle/concentration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/connectagram/metadata.xml b/games-puzzle/connectagram/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/connectagram/metadata.xml
+++ b/games-puzzle/connectagram/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/construo/metadata.xml b/games-puzzle/construo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/construo/metadata.xml
+++ b/games-puzzle/construo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/cutemaze/metadata.xml b/games-puzzle/cutemaze/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/cutemaze/metadata.xml
+++ b/games-puzzle/cutemaze/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
index 658a1ecd0c6d..f86815793878 100644
--- a/games-puzzle/cuyo/metadata.xml
+++ b/games-puzzle/cuyo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="music">Enable playing of background music</flag>
 </use>
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
index f83be4edcc0b..6863fd2e0f3f 100644
--- a/games-puzzle/einstein/metadata.xml
+++ b/games-puzzle/einstein/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">einsteinpuzzle</remote-id>
 	</upstream>
diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml
index 88fbd37387dd..e13254a7a919 100644
--- a/games-puzzle/enigma/metadata.xml
+++ b/games-puzzle/enigma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">enigma-game</remote-id>
 	</upstream>
diff --git a/games-puzzle/ensemblist/metadata.xml b/games-puzzle/ensemblist/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/ensemblist/metadata.xml
+++ b/games-puzzle/ensemblist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/fbg/metadata.xml b/games-puzzle/fbg/metadata.xml
index 24cdc6eef843..c1c37a851bca 100644
--- a/games-puzzle/fbg/metadata.xml
+++ b/games-puzzle/fbg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fbg</remote-id>
 	</upstream>
diff --git a/games-puzzle/fish-fillets/metadata.xml b/games-puzzle/fish-fillets/metadata.xml
index bb9d8fdaf249..103766d1c30b 100644
--- a/games-puzzle/fish-fillets/metadata.xml
+++ b/games-puzzle/fish-fillets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fillets</remote-id>
 	</upstream>
diff --git a/games-puzzle/five-or-more/metadata.xml b/games-puzzle/five-or-more/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/five-or-more/metadata.xml
+++ b/games-puzzle/five-or-more/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/flobopuyo/metadata.xml b/games-puzzle/flobopuyo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/flobopuyo/metadata.xml
+++ b/games-puzzle/flobopuyo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/freesweep/metadata.xml b/games-puzzle/freesweep/metadata.xml
index 3b43868cdaab..d133c0e7d207 100644
--- a/games-puzzle/freesweep/metadata.xml
+++ b/games-puzzle/freesweep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">freesweep</remote-id>
 	</upstream>
diff --git a/games-puzzle/galaxis/metadata.xml b/games-puzzle/galaxis/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/galaxis/metadata.xml
+++ b/games-puzzle/galaxis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gemdropx/metadata.xml b/games-puzzle/gemdropx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/gemdropx/metadata.xml
+++ b/games-puzzle/gemdropx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gfifteen/metadata.xml b/games-puzzle/gfifteen/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/gfifteen/metadata.xml
+++ b/games-puzzle/gfifteen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/glightoff/metadata.xml b/games-puzzle/glightoff/metadata.xml
index 81f551222572..09a426933775 100644
--- a/games-puzzle/glightoff/metadata.xml
+++ b/games-puzzle/glightoff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">glightoff</remote-id>
 	</upstream>
diff --git a/games-puzzle/gnome-klotski/metadata.xml b/games-puzzle/gnome-klotski/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/gnome-klotski/metadata.xml
+++ b/games-puzzle/gnome-klotski/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku/metadata.xml b/games-puzzle/gnome-sudoku/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/gnome-sudoku/metadata.xml
+++ b/games-puzzle/gnome-sudoku/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gnome-taquin/metadata.xml b/games-puzzle/gnome-taquin/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/gnome-taquin/metadata.xml
+++ b/games-puzzle/gnome-taquin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gnome-tetravex/metadata.xml b/games-puzzle/gnome-tetravex/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/gnome-tetravex/metadata.xml
+++ b/games-puzzle/gnome-tetravex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gnudoku/metadata.xml b/games-puzzle/gnudoku/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/gnudoku/metadata.xml
+++ b/games-puzzle/gnudoku/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gnurobbo/metadata.xml b/games-puzzle/gnurobbo/metadata.xml
index 979d97db6292..9c3bace5c736 100644
--- a/games-puzzle/gnurobbo/metadata.xml
+++ b/games-puzzle/gnurobbo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnurobbo</remote-id>
 	</upstream>
diff --git a/games-puzzle/gottet/metadata.xml b/games-puzzle/gottet/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/gottet/metadata.xml
+++ b/games-puzzle/gottet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/greedy/metadata.xml b/games-puzzle/greedy/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/greedy/metadata.xml
+++ b/games-puzzle/greedy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/groundhog/metadata.xml b/games-puzzle/groundhog/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/groundhog/metadata.xml
+++ b/games-puzzle/groundhog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml
index 37789ee7c5b2..767d860b6cd0 100644
--- a/games-puzzle/gtetrinet/metadata.xml
+++ b/games-puzzle/gtetrinet/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription>
 GTetrinet is a client program for the popular Tetrinet game, a 
 multiplayer tetris game that is played over the internet.
diff --git a/games-puzzle/gtkballs/metadata.xml b/games-puzzle/gtkballs/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/gtkballs/metadata.xml
+++ b/games-puzzle/gtkballs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gweled/metadata.xml b/games-puzzle/gweled/metadata.xml
index ca4a9ecfd3d7..c9f656c0cfb6 100644
--- a/games-puzzle/gweled/metadata.xml
+++ b/games-puzzle/gweled/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gweled</remote-id>
 	</upstream>
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/hangman/metadata.xml
+++ b/games-puzzle/hangman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/hexalate/metadata.xml b/games-puzzle/hexalate/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/hexalate/metadata.xml
+++ b/games-puzzle/hexalate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/hexamine/metadata.xml b/games-puzzle/hexamine/metadata.xml
index be0be9e8dd1a..1bc0186684f5 100644
--- a/games-puzzle/hexamine/metadata.xml
+++ b/games-puzzle/hexamine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hexamine</remote-id>
 	</upstream>
diff --git a/games-puzzle/hitori/metadata.xml b/games-puzzle/hitori/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/hitori/metadata.xml
+++ b/games-puzzle/hitori/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/hoh-bin/metadata.xml b/games-puzzle/hoh-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/hoh-bin/metadata.xml
+++ b/games-puzzle/hoh-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/icebreaker/metadata.xml b/games-puzzle/icebreaker/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/icebreaker/metadata.xml
+++ b/games-puzzle/icebreaker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/jag/metadata.xml b/games-puzzle/jag/metadata.xml
index 87786f1c40dd..540836432d46 100644
--- a/games-puzzle/jag/metadata.xml
+++ b/games-puzzle/jag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="editor">Install level editor</flag>
   </use>
diff --git a/games-puzzle/jools/metadata.xml b/games-puzzle/jools/metadata.xml
index 7b0afd175166..50a5e281f753 100644
--- a/games-puzzle/jools/metadata.xml
+++ b/games-puzzle/jools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Jools is a graphical puzzle game in the tradition of Tetris. It has begun as
 a clone of Bejeweled, which is currently available for Windows, Mac, and
diff --git a/games-puzzle/kiki/metadata.xml b/games-puzzle/kiki/metadata.xml
index fc9f396abb37..07fe1deb092a 100644
--- a/games-puzzle/kiki/metadata.xml
+++ b/games-puzzle/kiki/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kiki</remote-id>
 	</upstream>
diff --git a/games-puzzle/krystaldrop/metadata.xml b/games-puzzle/krystaldrop/metadata.xml
index 29a32c6a06d5..a5d662414d4f 100644
--- a/games-puzzle/krystaldrop/metadata.xml
+++ b/games-puzzle/krystaldrop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">krystaldrop</remote-id>
 	</upstream>
diff --git a/games-puzzle/larry/metadata.xml b/games-puzzle/larry/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-puzzle/larry/metadata.xml
+++ b/games-puzzle/larry/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/lightsoff/metadata.xml b/games-puzzle/lightsoff/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/lightsoff/metadata.xml
+++ b/games-puzzle/lightsoff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/lmarbles/metadata.xml b/games-puzzle/lmarbles/metadata.xml
index 0f9429dd0de0..f2eba1bcb2a3 100644
--- a/games-puzzle/lmarbles/metadata.xml
+++ b/games-puzzle/lmarbles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgames</remote-id>
 	</upstream>
diff --git a/games-puzzle/lpairs/metadata.xml b/games-puzzle/lpairs/metadata.xml
index 0f9429dd0de0..f2eba1bcb2a3 100644
--- a/games-puzzle/lpairs/metadata.xml
+++ b/games-puzzle/lpairs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgames</remote-id>
 	</upstream>
diff --git a/games-puzzle/ltris/metadata.xml b/games-puzzle/ltris/metadata.xml
index 0f9429dd0de0..f2eba1bcb2a3 100644
--- a/games-puzzle/ltris/metadata.xml
+++ b/games-puzzle/ltris/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgames</remote-id>
 	</upstream>
diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/magiccube4d/metadata.xml
+++ b/games-puzzle/magiccube4d/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/meandmyshadow/metadata.xml b/games-puzzle/meandmyshadow/metadata.xml
index 3238e8898df6..2ffd43d8ff18 100644
--- a/games-puzzle/meandmyshadow/metadata.xml
+++ b/games-puzzle/meandmyshadow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">meandmyshadow</remote-id>
 	</upstream>
diff --git a/games-puzzle/mindless/metadata.xml b/games-puzzle/mindless/metadata.xml
index d9b978565e96..2fdddf692932 100644
--- a/games-puzzle/mindless/metadata.xml
+++ b/games-puzzle/mindless/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mindless</remote-id>
 	</upstream>
diff --git a/games-puzzle/mirrormagic/metadata.xml b/games-puzzle/mirrormagic/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/mirrormagic/metadata.xml
+++ b/games-puzzle/mirrormagic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/monsterz/metadata.xml b/games-puzzle/monsterz/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/monsterz/metadata.xml
+++ b/games-puzzle/monsterz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/mures/metadata.xml b/games-puzzle/mures/metadata.xml
index 6b7ddc83ba9b..b8d6b5e58546 100644
--- a/games-puzzle/mures/metadata.xml
+++ b/games-puzzle/mures/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mures</remote-id>
 	</upstream>
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/neverball/metadata.xml
+++ b/games-puzzle/neverball/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/ngstar/metadata.xml b/games-puzzle/ngstar/metadata.xml
index 6dba63b5876e..8f0e5a1396ab 100644
--- a/games-puzzle/ngstar/metadata.xml
+++ b/games-puzzle/ngstar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 NGStar is a clone of a HP48 game called dstar.
 The goal is to catch all gifts in the level to get access to the next one.
diff --git a/games-puzzle/nightsky/metadata.xml b/games-puzzle/nightsky/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-puzzle/nightsky/metadata.xml
+++ b/games-puzzle/nightsky/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-puzzle/numptyphysics/metadata.xml b/games-puzzle/numptyphysics/metadata.xml
index f94d31263f6c..8ca7b6d2d94b 100644
--- a/games-puzzle/numptyphysics/metadata.xml
+++ b/games-puzzle/numptyphysics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="user-levels">Install some fun user-created levels</flag>
 	</use>
diff --git a/games-puzzle/pathological/metadata.xml b/games-puzzle/pathological/metadata.xml
index e5bd67a8578e..03cfdeb42189 100644
--- a/games-puzzle/pathological/metadata.xml
+++ b/games-puzzle/pathological/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pathological</remote-id>
 	</upstream>
diff --git a/games-puzzle/pauker/metadata.xml b/games-puzzle/pauker/metadata.xml
index 719168a735e3..0854b6def454 100644
--- a/games-puzzle/pauker/metadata.xml
+++ b/games-puzzle/pauker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pauker</remote-id>
 	</upstream>
diff --git a/games-puzzle/penguzzle/metadata.xml b/games-puzzle/penguzzle/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/penguzzle/metadata.xml
+++ b/games-puzzle/penguzzle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/picpuz/metadata.xml b/games-puzzle/picpuz/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/picpuz/metadata.xml
+++ b/games-puzzle/picpuz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/pingus/metadata.xml b/games-puzzle/pingus/metadata.xml
index e5220f2a49c6..67313758ad0e 100644
--- a/games-puzzle/pingus/metadata.xml
+++ b/games-puzzle/pingus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>Pingus is a free Lemmings clone for GNU/Linux and Windows covered under the GNU GPL. Pingus
 uses ClanLib and libxml and might also be usable on some other OSs like FreeBSD, but hasn't
 been tested there. Pingus is mainly developed under GNU/Linux, that's why the Windows port
diff --git a/games-puzzle/pipepanic/metadata.xml b/games-puzzle/pipepanic/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/pipepanic/metadata.xml
+++ b/games-puzzle/pipepanic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/pipewalker/metadata.xml b/games-puzzle/pipewalker/metadata.xml
index da28a3e934d2..2556812b0eba 100644
--- a/games-puzzle/pipewalker/metadata.xml
+++ b/games-puzzle/pipewalker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pipewalker</remote-id>
 	</upstream>
diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml
index 56028c94595f..7d6e44c68f71 100644
--- a/games-puzzle/quadra/metadata.xml
+++ b/games-puzzle/quadra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">quadra</remote-id>
 	</upstream>
diff --git a/games-puzzle/quadrapassel/metadata.xml b/games-puzzle/quadrapassel/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/quadrapassel/metadata.xml
+++ b/games-puzzle/quadrapassel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/rezerwar/metadata.xml b/games-puzzle/rezerwar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/rezerwar/metadata.xml
+++ b/games-puzzle/rezerwar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/scramble/metadata.xml
+++ b/games-puzzle/scramble/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/sdl-jewels/metadata.xml b/games-puzzle/sdl-jewels/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/sdl-jewels/metadata.xml
+++ b/games-puzzle/sdl-jewels/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/seatris/metadata.xml b/games-puzzle/seatris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/seatris/metadata.xml
+++ b/games-puzzle/seatris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/shaaft/metadata.xml b/games-puzzle/shaaft/metadata.xml
index 8b6d907abada..b6be645e0f24 100644
--- a/games-puzzle/shaaft/metadata.xml
+++ b/games-puzzle/shaaft/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">criticalmass</remote-id>
 	</upstream>
diff --git a/games-puzzle/skoosh/metadata.xml b/games-puzzle/skoosh/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/skoosh/metadata.xml
+++ b/games-puzzle/skoosh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-puzzle/splice/metadata.xml
+++ b/games-puzzle/splice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/swell-foop/metadata.xml b/games-puzzle/swell-foop/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/games-puzzle/swell-foop/metadata.xml
+++ b/games-puzzle/swell-foop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/tanglet/metadata.xml b/games-puzzle/tanglet/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/tanglet/metadata.xml
+++ b/games-puzzle/tanglet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/tetrinet/metadata.xml b/games-puzzle/tetrinet/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/tetrinet/metadata.xml
+++ b/games-puzzle/tetrinet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/textmaze/metadata.xml b/games-puzzle/textmaze/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/textmaze/metadata.xml
+++ b/games-puzzle/textmaze/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/tint/metadata.xml b/games-puzzle/tint/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/tint/metadata.xml
+++ b/games-puzzle/tint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/tiny-and-big/metadata.xml b/games-puzzle/tiny-and-big/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-puzzle/tiny-and-big/metadata.xml
+++ b/games-puzzle/tiny-and-big/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-puzzle/tod/metadata.xml b/games-puzzle/tod/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/tod/metadata.xml
+++ b/games-puzzle/tod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/tong/metadata.xml b/games-puzzle/tong/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/tong/metadata.xml
+++ b/games-puzzle/tong/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/toppler/metadata.xml b/games-puzzle/toppler/metadata.xml
index 05e7ffdcd070..1988b2737e81 100644
--- a/games-puzzle/toppler/metadata.xml
+++ b/games-puzzle/toppler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">toppler</remote-id>
 	</upstream>
diff --git a/games-puzzle/torrent/metadata.xml b/games-puzzle/torrent/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/torrent/metadata.xml
+++ b/games-puzzle/torrent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/triptych-demo/metadata.xml b/games-puzzle/triptych-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/triptych-demo/metadata.xml
+++ b/games-puzzle/triptych-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/twindistress/metadata.xml b/games-puzzle/twindistress/metadata.xml
index 18f5be0deaa6..020a65aee43f 100644
--- a/games-puzzle/twindistress/metadata.xml
+++ b/games-puzzle/twindistress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">twind</remote-id>
 	</upstream>
diff --git a/games-puzzle/wakkabox/metadata.xml b/games-puzzle/wakkabox/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/wakkabox/metadata.xml
+++ b/games-puzzle/wakkabox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/wizznic/metadata.xml b/games-puzzle/wizznic/metadata.xml
index de9fd8181495..a78eada1c701 100644
--- a/games-puzzle/wizznic/metadata.xml
+++ b/games-puzzle/wizznic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wizznic</remote-id>
 	</upstream>
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
index 6c354f7c20da..d0b0348abb3d 100644
--- a/games-puzzle/wmpuzzle/metadata.xml
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">wmpuzzle</remote-id>
 	</upstream>
diff --git a/games-puzzle/world-of-goo-demo/metadata.xml b/games-puzzle/world-of-goo-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/world-of-goo-demo/metadata.xml
+++ b/games-puzzle/world-of-goo-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/world-of-goo/metadata.xml b/games-puzzle/world-of-goo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/world-of-goo/metadata.xml
+++ b/games-puzzle/world-of-goo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xblockout/metadata.xml b/games-puzzle/xblockout/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/xblockout/metadata.xml
+++ b/games-puzzle/xblockout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xbomb/metadata.xml b/games-puzzle/xbomb/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/xbomb/metadata.xml
+++ b/games-puzzle/xbomb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
index 36ec4edcdc0d..d15c53b1cbab 100644
--- a/games-puzzle/xlogical/metadata.xml
+++ b/games-puzzle/xlogical/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 <longdescription lang="en">
 XLogical is a puzzle game based on the Logical! game that was originally
 released by Rainbow Arts on the Commodore Amiga computer.
diff --git a/games-puzzle/xpired/metadata.xml b/games-puzzle/xpired/metadata.xml
index 11c360ed350a..8f6f4ebd2ffa 100644
--- a/games-puzzle/xpired/metadata.xml
+++ b/games-puzzle/xpired/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xpired</remote-id>
 	</upstream>
diff --git a/games-puzzle/xtris/metadata.xml b/games-puzzle/xtris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/xtris/metadata.xml
+++ b/games-puzzle/xtris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xwelltris/metadata.xml b/games-puzzle/xwelltris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-puzzle/xwelltris/metadata.xml
+++ b/games-puzzle/xwelltris/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xye/metadata.xml b/games-puzzle/xye/metadata.xml
index 577d11240ad6..3e3ffe4d5e7c 100644
--- a/games-puzzle/xye/metadata.xml
+++ b/games-puzzle/xye/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xye</remote-id>
 	</upstream>
diff --git a/games-puzzle/zaz/metadata.xml b/games-puzzle/zaz/metadata.xml
index df24f65f7f3b..72390bc56c4d 100644
--- a/games-puzzle/zaz/metadata.xml
+++ b/games-puzzle/zaz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zaz</remote-id>
 	</upstream>
diff --git a/games-roguelike/FTL/metadata.xml b/games-roguelike/FTL/metadata.xml
index 2dca1f17c9be..d3dac0e4e47c 100644
--- a/games-roguelike/FTL/metadata.xml
+++ b/games-roguelike/FTL/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
 		<description>Proxied maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
diff --git a/games-roguelike/adom/metadata.xml b/games-roguelike/adom/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/adom/metadata.xml
+++ b/games-roguelike/adom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index aff940f0be4f..20d5bdb15528 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="sound">Enable and install sounds</flag>
 	</use>
diff --git a/games-roguelike/crossfire-client/metadata.xml b/games-roguelike/crossfire-client/metadata.xml
index 19f7d9af42ad..d1369608956b 100644
--- a/games-roguelike/crossfire-client/metadata.xml
+++ b/games-roguelike/crossfire-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">crossfire</remote-id>
 	</upstream>
diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml
index c9a8db431846..17e87cfa6121 100644
--- a/games-roguelike/dwarf-fortress/metadata.xml
+++ b/games-roguelike/dwarf-fortress/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>alex_y_xu@yahoo.ca</email>
 	<name>Alex Xu</name>
@@ -12,4 +11,8 @@
 	<name>Chris Reffett</name>
 	<description>maintainer, please CC on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/hengband/metadata.xml b/games-roguelike/hengband/metadata.xml
index 53afe19dbddc..ce01e2d60d5a 100644
--- a/games-roguelike/hengband/metadata.xml
+++ b/games-roguelike/hengband/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">hengband</remote-id>
 	</upstream>
diff --git a/games-roguelike/mazesofmonad/metadata.xml b/games-roguelike/mazesofmonad/metadata.xml
index 7ca9c091535d..3fe6fc73f4fb 100644
--- a/games-roguelike/mazesofmonad/metadata.xml
+++ b/games-roguelike/mazesofmonad/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		MazesOfMonad is a console-based Role Playing Game. You create
 		characters with their strong and weak points, and try to complete
diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/moria/metadata.xml
+++ b/games-roguelike/moria/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 5570ca33dc3e..bc1f6a1e476d 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>aranea@aixah.de</email>
     <name>Luis Ressel</name>
     <description>Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">nethack</remote-id>
   </upstream>
diff --git a/games-roguelike/powder/metadata.xml b/games-roguelike/powder/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/powder/metadata.xml
+++ b/games-roguelike/powder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/rogue/metadata.xml b/games-roguelike/rogue/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/rogue/metadata.xml
+++ b/games-roguelike/rogue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/scourge/metadata.xml b/games-roguelike/scourge/metadata.xml
index f243e01d74db..b647087f5878 100644
--- a/games-roguelike/scourge/metadata.xml
+++ b/games-roguelike/scourge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scourge</remote-id>
 	</upstream>
diff --git a/games-roguelike/slashem/metadata.xml b/games-roguelike/slashem/metadata.xml
index 17ecb6b48aa0..e6496d76eca8 100644
--- a/games-roguelike/slashem/metadata.xml
+++ b/games-roguelike/slashem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">slashem</remote-id>
 	</upstream>
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index f9cf8272b6f5..4d20bef84c98 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<doc lang="en">http://crawl.develz.org/wordpress/documentation</doc>
 		<bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
diff --git a/games-roguelike/tome/metadata.xml b/games-roguelike/tome/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/tome/metadata.xml
+++ b/games-roguelike/tome/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index 8fe1f5ee178e..ef84733c70dc 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="server">Compile server support</flag>
 	</use>
diff --git a/games-roguelike/wrogue/metadata.xml b/games-roguelike/wrogue/metadata.xml
index 196d419134e9..0de71ed3d396 100644
--- a/games-roguelike/wrogue/metadata.xml
+++ b/games-roguelike/wrogue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Warp Rogue is a gothic science fantasy roguelike game. It features RPG-like game
 mechanics, recruitable NPCs, and a consistent theme.
diff --git a/games-roguelike/zangband/metadata.xml b/games-roguelike/zangband/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/zangband/metadata.xml
+++ b/games-roguelike/zangband/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/a-bird-story/metadata.xml b/games-rpg/a-bird-story/metadata.xml
index 440634ca22d7..d224b3dba880 100644
--- a/games-rpg/a-bird-story/metadata.xml
+++ b/games-rpg/a-bird-story/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries</flag>
 	</use>
diff --git a/games-rpg/adonthell/metadata.xml b/games-rpg/adonthell/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/adonthell/metadata.xml
+++ b/games-rpg/adonthell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
index 4bc5f115d9c7..913a20fd8fc0 100644
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ b/games-rpg/arx-fatalis-data/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -13,6 +11,14 @@
 		<name>Daniel Scharrer</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="gog">Extract the data from the GOG.com installer.</flag>
 	</use>
diff --git a/games-rpg/arx-fatalis-demo/metadata.xml b/games-rpg/arx-fatalis-demo/metadata.xml
index 387968641909..89d5734f4c27 100644
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ b/games-rpg/arx-fatalis-demo/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -13,4 +11,12 @@
 		<name>Daniel Scharrer</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
index 3a5dd3e2cc53..a70a7323a285 100644
--- a/games-rpg/arx-libertatis/metadata.xml
+++ b/games-rpg/arx-libertatis/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="c++0x">Build ROOT using the C++11 standard.</flag>
 		<flag name="crash-reporter">Build a <pkg>dev-qt/qtgui</pkg>-based
diff --git a/games-rpg/avadon/metadata.xml b/games-rpg/avadon/metadata.xml
index ee67c3092f58..0ef28b12546e 100644
--- a/games-rpg/avadon/metadata.xml
+++ b/games-rpg/avadon/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/bass/metadata.xml b/games-rpg/bass/metadata.xml
index f325c8eea004..ece66e2dd396 100644
--- a/games-rpg/bass/metadata.xml
+++ b/games-rpg/bass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scummvm</remote-id>
 	</upstream>
diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/bastion/metadata.xml
+++ b/games-rpg/bastion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/coe2/metadata.xml b/games-rpg/coe2/metadata.xml
index 3592b6562bab..62797c979c69 100644
--- a/games-rpg/coe2/metadata.xml
+++ b/games-rpg/coe2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Originally released in 1997, Conquest of Elysium II is a turn-based fantasy
 strategy game, and the precursor to the wildly popular Dominions series. As one
diff --git a/games-rpg/daimonin-client/metadata.xml b/games-rpg/daimonin-client/metadata.xml
index 576ef5e3dea4..800a6783d4fd 100644
--- a/games-rpg/daimonin-client/metadata.xml
+++ b/games-rpg/daimonin-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="music">Install extra music</flag>
   </use>
diff --git a/games-rpg/dear-esther/metadata.xml b/games-rpg/dear-esther/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/dear-esther/metadata.xml
+++ b/games-rpg/dear-esther/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/draci-historie/metadata.xml b/games-rpg/draci-historie/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/draci-historie/metadata.xml
+++ b/games-rpg/draci-historie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/dragonhunt/metadata.xml b/games-rpg/dragonhunt/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/dragonhunt/metadata.xml
+++ b/games-rpg/dragonhunt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/drascula/metadata.xml b/games-rpg/drascula/metadata.xml
index ccee03feeca9..17854368443a 100644
--- a/games-rpg/drascula/metadata.xml
+++ b/games-rpg/drascula/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="sound">Install optional audio files</flag>
   </use>
diff --git a/games-rpg/dreamweb/metadata.xml b/games-rpg/dreamweb/metadata.xml
index fdb1b91cb616..ce0332a50608 100644
--- a/games-rpg/dreamweb/metadata.xml
+++ b/games-rpg/dreamweb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="doc">High-resolution scans of the written material in the original UK game box</flag>
   </use>
diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
index dbbe0d9a6a94..25b01fe5ea25 100644
--- a/games-rpg/dungeon-defenders/metadata.xml
+++ b/games-rpg/dungeon-defenders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
index 1b59e3704af2..f054b942d904 100644
--- a/games-rpg/egoboo/metadata.xml
+++ b/games-rpg/egoboo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">egoboo</remote-id>
 	</upstream>
diff --git a/games-rpg/eschalon-book-1-demo/metadata.xml b/games-rpg/eschalon-book-1-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/eschalon-book-1-demo/metadata.xml
+++ b/games-rpg/eschalon-book-1-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/eternal-lands-bloodsucker/metadata.xml b/games-rpg/eternal-lands-bloodsucker/metadata.xml
index 3c1375215bd6..ded1b664a8de 100644
--- a/games-rpg/eternal-lands-bloodsucker/metadata.xml
+++ b/games-rpg/eternal-lands-bloodsucker/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>rich0@gentoo.org</email>
   <name>Rich Freeman</name>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>The Bloodsucker Maps are an add-on for Eternal Lands and provide enhanced non-official maps for the game.</longdescription>
 </pkgmetadata>
diff --git a/games-rpg/eternal-lands-data/metadata.xml b/games-rpg/eternal-lands-data/metadata.xml
index 2e27ec5fbc64..99e50d252c97 100644
--- a/games-rpg/eternal-lands-data/metadata.xml
+++ b/games-rpg/eternal-lands-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>rich0@gentoo.org</email>
   <name>Rich Freeman</name>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>Eternal Lands is a FREE MMORPG (massively multiplayer online
 	role playing game)</longdescription>
 <use>
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
index 858d2d50857b..fb7dea9e5646 100644
--- a/games-rpg/eternal-lands/metadata.xml
+++ b/games-rpg/eternal-lands/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>rich0@gentoo.org</email>
   <name>Richard Freeman</name>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>Eternal Lands is a FREE MMORPG (massively multiplayer online
 	role playing game)</longdescription>
 </pkgmetadata>
diff --git a/games-rpg/freedink-data/metadata.xml b/games-rpg/freedink-data/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/freedink-data/metadata.xml
+++ b/games-rpg/freedink-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/freedink/metadata.xml b/games-rpg/freedink/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/freedink/metadata.xml
+++ b/games-rpg/freedink/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
index 147897093d17..8556007decbd 100644
--- a/games-rpg/freedroid/metadata.xml
+++ b/games-rpg/freedroid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedroid</remote-id>
 	</upstream>
diff --git a/games-rpg/freedroidrpg/metadata.xml b/games-rpg/freedroidrpg/metadata.xml
index 145798144713..9d57c2837434 100644
--- a/games-rpg/freedroidrpg/metadata.xml
+++ b/games-rpg/freedroidrpg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Hello, and welcome to the Freedroid page.
 
diff --git a/games-rpg/grimrock/metadata.xml b/games-rpg/grimrock/metadata.xml
index 2133b024aaef..4f2cd2a3bba5 100644
--- a/games-rpg/grimrock/metadata.xml
+++ b/games-rpg/grimrock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
diff --git a/games-rpg/gwiz/metadata.xml b/games-rpg/gwiz/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/gwiz/metadata.xml
+++ b/games-rpg/gwiz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/kqlives/metadata.xml b/games-rpg/kqlives/metadata.xml
index b512c0089710..bdc8f7a556f1 100644
--- a/games-rpg/kqlives/metadata.xml
+++ b/games-rpg/kqlives/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="cheats">Enable cheating mode</flag>
   </use>
diff --git a/games-rpg/lure/metadata.xml b/games-rpg/lure/metadata.xml
index f325c8eea004..ece66e2dd396 100644
--- a/games-rpg/lure/metadata.xml
+++ b/games-rpg/lure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scummvm</remote-id>
 	</upstream>
diff --git a/games-rpg/mana/metadata.xml b/games-rpg/mana/metadata.xml
index 2b9f5c34d620..1d127cbd6782 100644
--- a/games-rpg/mana/metadata.xml
+++ b/games-rpg/mana/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+        <email>games@gentoo.org</email>
+        <name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<changelog>http://bugs.manasource.org/changelog_page.php</changelog>
         <doc lang="en">http://doc.manasource.org/</doc>
diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/manaplus/metadata.xml
+++ b/games-rpg/manaplus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwmouse/metadata.xml b/games-rpg/nwmouse/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/nwmouse/metadata.xml
+++ b/games-rpg/nwmouse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwmovies/metadata.xml b/games-rpg/nwmovies/metadata.xml
index 0a7563a794f3..421adf808587 100644
--- a/games-rpg/nwmovies/metadata.xml
+++ b/games-rpg/nwmovies/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>calchan@gentoo.org</email>
   <name>Denis Dupeyron</name>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn-cep/metadata.xml b/games-rpg/nwn-cep/metadata.xml
index c01a252e1b30..9350f33b8b6b 100644
--- a/games-rpg/nwn-cep/metadata.xml
+++ b/games-rpg/nwn-cep/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
     <description>maintainer</description>
   </maintainer>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn-data/metadata.xml b/games-rpg/nwn-data/metadata.xml
index cd2ae65bb1ed..a65949f455e8 100644
--- a/games-rpg/nwn-data/metadata.xml
+++ b/games-rpg/nwn-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="hou">Install the Hordes of the Underdark expansion pack</flag>
     <flag name="nowin">For those people who cant grab the 1.2 gigs of data files from a windows partition</flag>
diff --git a/games-rpg/nwn-penultima/metadata.xml b/games-rpg/nwn-penultima/metadata.xml
index 95d7ea2ffa6e..e73296890f9c 100644
--- a/games-rpg/nwn-penultima/metadata.xml
+++ b/games-rpg/nwn-penultima/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn-penultimarerolled/metadata.xml b/games-rpg/nwn-penultimarerolled/metadata.xml
index 95d7ea2ffa6e..e73296890f9c 100644
--- a/games-rpg/nwn-penultimarerolled/metadata.xml
+++ b/games-rpg/nwn-penultimarerolled/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn-shadowlordsdreamcatcherdemon/metadata.xml b/games-rpg/nwn-shadowlordsdreamcatcherdemon/metadata.xml
index 95d7ea2ffa6e..e73296890f9c 100644
--- a/games-rpg/nwn-shadowlordsdreamcatcherdemon/metadata.xml
+++ b/games-rpg/nwn-shadowlordsdreamcatcherdemon/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn/metadata.xml b/games-rpg/nwn/metadata.xml
index b725b9d02028..7d7b1bc0b696 100644
--- a/games-rpg/nwn/metadata.xml
+++ b/games-rpg/nwn/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="hou">Install the Hordes of the Underdark expansion pack</flag>
     <flag name="sou">Installs the Shadows of Undrentide expension pack</flag>
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
index 5bd973f0ebc7..31ae6a938b6d 100644
--- a/games-rpg/openglad/metadata.xml
+++ b/games-rpg/openglad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">snowstorm</remote-id>
 	</upstream>
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
index 7d65cacbecfc..6ff34d46c387 100644
--- a/games-rpg/pcgen/metadata.xml
+++ b/games-rpg/pcgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pcgen</remote-id>
 	</upstream>
diff --git a/games-rpg/penumbra-collection/metadata.xml b/games-rpg/penumbra-collection/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-rpg/penumbra-collection/metadata.xml
+++ b/games-rpg/penumbra-collection/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/queen/metadata.xml b/games-rpg/queen/metadata.xml
index f325c8eea004..ece66e2dd396 100644
--- a/games-rpg/queen/metadata.xml
+++ b/games-rpg/queen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scummvm</remote-id>
 	</upstream>
diff --git a/games-rpg/sacred-gold/metadata.xml b/games-rpg/sacred-gold/metadata.xml
index 0a7563a794f3..421adf808587 100644
--- a/games-rpg/sacred-gold/metadata.xml
+++ b/games-rpg/sacred-gold/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>calchan@gentoo.org</email>
   <name>Denis Dupeyron</name>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/soltys/metadata.xml b/games-rpg/soltys/metadata.xml
index f325c8eea004..ece66e2dd396 100644
--- a/games-rpg/soltys/metadata.xml
+++ b/games-rpg/soltys/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scummvm</remote-id>
 	</upstream>
diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
index e35e8891bb2f..4bdabd305f66 100644
--- a/games-rpg/sumwars/metadata.xml
+++ b/games-rpg/sumwars/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>protogenes@web.de</email>
 		<name>Michael Kunz</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/games-rpg/tmw/metadata.xml b/games-rpg/tmw/metadata.xml
index 4304bc88a6fe..c0885539fa28 100644
--- a/games-rpg/tmw/metadata.xml
+++ b/games-rpg/tmw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">themanaworld</remote-id>
 	</upstream>
diff --git a/games-rpg/to-the-moon/metadata.xml b/games-rpg/to-the-moon/metadata.xml
index 86a9b5e95df4..bf1b4eac1259 100644
--- a/games-rpg/to-the-moon/metadata.xml
+++ b/games-rpg/to-the-moon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries</flag>
 	</use>
diff --git a/games-rpg/twclone/metadata.xml b/games-rpg/twclone/metadata.xml
index 27bc7ca62162..6fb12f2bf8c1 100644
--- a/games-rpg/twclone/metadata.xml
+++ b/games-rpg/twclone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 How many of you remeber the BBS days back in the late 80's and early 90's? 
 Back when you would call in play games and go on with your life? Well I'm 
diff --git a/games-rpg/valyriatear/metadata.xml b/games-rpg/valyriatear/metadata.xml
index b4838803d340..2a30c37e0ca9 100644
--- a/games-rpg/valyriatear/metadata.xml
+++ b/games-rpg/valyriatear/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="editor">Compile the Qt editor along with the game</flag>
 	</use>
diff --git a/games-rpg/vendetta-online-bin/metadata.xml b/games-rpg/vendetta-online-bin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/vendetta-online-bin/metadata.xml
+++ b/games-rpg/vendetta-online-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/wasteland2/metadata.xml b/games-rpg/wasteland2/metadata.xml
index ee67c3092f58..0ef28b12546e 100644
--- a/games-rpg/wasteland2/metadata.xml
+++ b/games-rpg/wasteland2/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/wastesedge/metadata.xml b/games-rpg/wastesedge/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-rpg/wastesedge/metadata.xml
+++ b/games-rpg/wastesedge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/xu4/metadata.xml b/games-rpg/xu4/metadata.xml
index 2d86c15ce51e..9775461eb7bc 100644
--- a/games-rpg/xu4/metadata.xml
+++ b/games-rpg/xu4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xu4</remote-id>
 	</upstream>
diff --git a/games-rpg/zsdx/metadata.xml b/games-rpg/zsdx/metadata.xml
index f83c03a3a9a0..d5461f66dffb 100644
--- a/games-rpg/zsdx/metadata.xml
+++ b/games-rpg/zsdx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">christopho/zsdx</remote-id>
 	</upstream>
diff --git a/games-rpg/zsxd/metadata.xml b/games-rpg/zsxd/metadata.xml
index cc70e21dfa40..bc7f6003ba95 100644
--- a/games-rpg/zsxd/metadata.xml
+++ b/games-rpg/zsxd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">christopho/zsxd</remote-id>
 	</upstream>
diff --git a/games-server/bf1942-lnxded/metadata.xml b/games-server/bf1942-lnxded/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-server/bf1942-lnxded/metadata.xml
+++ b/games-server/bf1942-lnxded/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-server/crossfire-server/metadata.xml b/games-server/crossfire-server/metadata.xml
index 19f7d9af42ad..d1369608956b 100644
--- a/games-server/crossfire-server/metadata.xml
+++ b/games-server/crossfire-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">crossfire</remote-id>
 	</upstream>
diff --git a/games-server/cyphesis/metadata.xml b/games-server/cyphesis/metadata.xml
index 5d147bfd158d..d9c5a2066836 100644
--- a/games-server/cyphesis/metadata.xml
+++ b/games-server/cyphesis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Cyphesis is an NPC engine using AI/A-Life techniques. It is the Artificial
 Intelligence and Artificial Life server used by STAGE and also is filling in as
diff --git a/games-server/etqw-ded/metadata.xml b/games-server/etqw-ded/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-server/etqw-ded/metadata.xml
+++ b/games-server/etqw-ded/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-server/monopd/metadata.xml b/games-server/monopd/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-server/monopd/metadata.xml
+++ b/games-server/monopd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-server/mtavc/metadata.xml b/games-server/mtavc/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-server/mtavc/metadata.xml
+++ b/games-server/mtavc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-server/nwn-ded/metadata.xml b/games-server/nwn-ded/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-server/nwn-ded/metadata.xml
+++ b/games-server/nwn-ded/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-server/pvpgn/metadata.xml b/games-server/pvpgn/metadata.xml
index 36d3c90c042a..e3f793db0233 100644
--- a/games-server/pvpgn/metadata.xml
+++ b/games-server/pvpgn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pvpgn.berlios</remote-id>
 	</upstream>
diff --git a/games-server/ut2003-ded/metadata.xml b/games-server/ut2003-ded/metadata.xml
index de0596352e80..43eb4b316e0f 100644
--- a/games-server/ut2003-ded/metadata.xml
+++ b/games-server/ut2003-ded/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This is the dedicated server portion of the game and does not require the retail discs to use.
 </longdescription>
diff --git a/games-server/ut2004-ded/metadata.xml b/games-server/ut2004-ded/metadata.xml
index 1d87c44571d9..8baebaab1827 100644
--- a/games-server/ut2004-ded/metadata.xml
+++ b/games-server/ut2004-ded/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Unreal Tounament 2004 is a first-person 3-D shooter and sequel to the 2003 Game of the Year, Unreal Tournament 2003.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This is the dedicated server portion of the game and does not require the retail discs to use.
 </longdescription>
diff --git a/games-simulation/bcs-demo/metadata.xml b/games-simulation/bcs-demo/metadata.xml
index fb28670977d9..6d2ab50cc801 100644
--- a/games-simulation/bcs-demo/metadata.xml
+++ b/games-simulation/bcs-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Building a bridge that doesn't break is what its all about, although watching 
 your bridge creation break and plunge a train into the watery depths below can be 
diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml
index bb95f92d8ecc..bda1c819ac2a 100644
--- a/games-simulation/cannonsmash/metadata.xml
+++ b/games-simulation/cannonsmash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cannonsmash</remote-id>
 	</upstream>
diff --git a/games-simulation/crashtest/metadata.xml b/games-simulation/crashtest/metadata.xml
index d06057ad270b..fc0a2fcaffae 100644
--- a/games-simulation/crashtest/metadata.xml
+++ b/games-simulation/crashtest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Crashtest simulates car crashes. This is an educational tool that can be used to
 acquire much insight into this complex process. The user can learn about the
diff --git a/games-simulation/crrcsim/metadata.xml b/games-simulation/crrcsim/metadata.xml
index dabacf6fdea0..16ac885fc995 100644
--- a/games-simulation/crrcsim/metadata.xml
+++ b/games-simulation/crrcsim/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">crrcsim</remote-id>
 	</upstream>
diff --git a/games-simulation/dangerdeep/metadata.xml b/games-simulation/dangerdeep/metadata.xml
index f6539c9a89b3..d2989303dd4d 100644
--- a/games-simulation/dangerdeep/metadata.xml
+++ b/games-simulation/dangerdeep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dangerdeep</remote-id>
 	</upstream>
diff --git a/games-simulation/fgrun/metadata.xml b/games-simulation/fgrun/metadata.xml
index 333dcbad7ff6..b7e2dc7cd1ee 100644
--- a/games-simulation/fgrun/metadata.xml
+++ b/games-simulation/fgrun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 A graphical frontend to run FlightGear Flight Simulator.
 	</longdescription>
diff --git a/games-simulation/flightgear-data/metadata.xml b/games-simulation/flightgear-data/metadata.xml
index bf9480ea717d..3fc0afe0c75c 100644
--- a/games-simulation/flightgear-data/metadata.xml
+++ b/games-simulation/flightgear-data/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index cdd7400022f7..fb839df3a139 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	<flag name="dbus">Enable screensaver DBus interaction</flag>
 	<flag name="jsbsim">Enables JSBSim Flight Dynamics Model (default)</flag>
diff --git a/games-simulation/gl117/metadata.xml b/games-simulation/gl117/metadata.xml
index dde59ceb2927..e69c8b7ff82b 100644
--- a/games-simulation/gl117/metadata.xml
+++ b/games-simulation/gl117/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gl-117</remote-id>
 	</upstream>
diff --git a/games-simulation/lincity-ng/metadata.xml b/games-simulation/lincity-ng/metadata.xml
index 2389db40c6bc..70182b340458 100644
--- a/games-simulation/lincity-ng/metadata.xml
+++ b/games-simulation/lincity-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lincity-ng.berlios</remote-id>
 	</upstream>
diff --git a/games-simulation/lincity/metadata.xml b/games-simulation/lincity/metadata.xml
index bb050ef9b982..d2fe85e34a56 100644
--- a/games-simulation/lincity/metadata.xml
+++ b/games-simulation/lincity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lincity</remote-id>
 	</upstream>
diff --git a/games-simulation/micropolis/metadata.xml b/games-simulation/micropolis/metadata.xml
index dbefa85e7356..ee4eedb6e1be 100644
--- a/games-simulation/micropolis/metadata.xml
+++ b/games-simulation/micropolis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer><email>hanno@gentoo.org</email></maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
index 8afe81fa705a..eed8e9f67aec 100644
--- a/games-simulation/openttd/metadata.xml
+++ b/games-simulation/openttd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="aplaymidi">Enables midi music in game, using aplaymidi as an external player</flag>
 
diff --git a/games-simulation/planets/metadata.xml b/games-simulation/planets/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-simulation/planets/metadata.xml
+++ b/games-simulation/planets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/pmars-sdl/metadata.xml b/games-simulation/pmars-sdl/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-simulation/pmars-sdl/metadata.xml
+++ b/games-simulation/pmars-sdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/qct/metadata.xml b/games-simulation/qct/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-simulation/qct/metadata.xml
+++ b/games-simulation/qct/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/searchandrescue/metadata.xml b/games-simulation/searchandrescue/metadata.xml
index 4454bd90a567..bfe47590ca3e 100644
--- a/games-simulation/searchandrescue/metadata.xml
+++ b/games-simulation/searchandrescue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">searchandrescue</remote-id>
 	</upstream>
diff --git a/games-simulation/senken/metadata.xml b/games-simulation/senken/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-simulation/senken/metadata.xml
+++ b/games-simulation/senken/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index 72ba0c97685e..38818c18f0b0 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simutrans</remote-id>
 	</upstream>
diff --git a/games-simulation/singularity/metadata.xml b/games-simulation/singularity/metadata.xml
index 32317f01b561..e3435272dafa 100644
--- a/games-simulation/singularity/metadata.xml
+++ b/games-simulation/singularity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="music">Install music files</flag>
 	</use>
diff --git a/games-sports/billardgl/metadata.xml b/games-sports/billardgl/metadata.xml
index 727be76d7a9b..286a81b46b08 100644
--- a/games-sports/billardgl/metadata.xml
+++ b/games-sports/billardgl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">billardgl</remote-id>
 	</upstream>
diff --git a/games-sports/bygfoot/metadata.xml b/games-sports/bygfoot/metadata.xml
index 193d489e2fc4..ac57436daf61 100644
--- a/games-sports/bygfoot/metadata.xml
+++ b/games-sports/bygfoot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bygfoot</remote-id>
 	</upstream>
diff --git a/games-sports/dustrac/metadata.xml b/games-sports/dustrac/metadata.xml
index c552dd293090..9e1dceccda8a 100644
--- a/games-sports/dustrac/metadata.xml
+++ b/games-sports/dustrac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Dust Racing (Dustrac) is a tile-based, cross-platform 2D racing
 		game written in Qt (C++) and OpenGL. Dust Racing comes with a
diff --git a/games-sports/foobillard/metadata.xml b/games-sports/foobillard/metadata.xml
index 70e507a337d6..9a4b6018cf2a 100644
--- a/games-sports/foobillard/metadata.xml
+++ b/games-sports/foobillard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">foobillard</remote-id>
 	</upstream>
diff --git a/games-sports/gracer/metadata.xml b/games-sports/gracer/metadata.xml
index dabcf648c232..e595802e64f1 100644
--- a/games-sports/gracer/metadata.xml
+++ b/games-sports/gracer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gracer</remote-id>
 	</upstream>
diff --git a/games-sports/miniracer/metadata.xml b/games-sports/miniracer/metadata.xml
index a7a28412717c..4f1edc20b37d 100644
--- a/games-sports/miniracer/metadata.xml
+++ b/games-sports/miniracer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">miniracer</remote-id>
 	</upstream>
diff --git a/games-sports/ski/metadata.xml b/games-sports/ski/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-sports/ski/metadata.xml
+++ b/games-sports/ski/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index 7f5789ee7fb3..c44f6a1c6b19 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="xrandr">Enable support for the X xrandr extension</flag>
   </use>
diff --git a/games-sports/stormbaancoureur/metadata.xml b/games-sports/stormbaancoureur/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-sports/stormbaancoureur/metadata.xml
+++ b/games-sports/stormbaancoureur/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-sports/torcs/metadata.xml b/games-sports/torcs/metadata.xml
index 383b10b59a65..2221630ea1c6 100644
--- a/games-sports/torcs/metadata.xml
+++ b/games-sports/torcs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">torcs</remote-id>
 	</upstream>
diff --git a/games-sports/toycars/metadata.xml b/games-sports/toycars/metadata.xml
index 88f07eae9c7b..177bbfc1dce8 100644
--- a/games-sports/toycars/metadata.xml
+++ b/games-sports/toycars/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Toy Cars is a physics based 2-D racer. In Timed Race mode the aim is to complete
 four laps in the best time you can. In Hot Potato mode the aim is to avoid
diff --git a/games-sports/trigger/metadata.xml b/games-sports/trigger/metadata.xml
index e8df7dee9458..db37432ee110 100644
--- a/games-sports/trigger/metadata.xml
+++ b/games-sports/trigger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">trigger-rally</remote-id>
 	</upstream>
diff --git a/games-sports/trophy/metadata.xml b/games-sports/trophy/metadata.xml
index d3373e892e54..2ad40f034572 100644
--- a/games-sports/trophy/metadata.xml
+++ b/games-sports/trophy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">trophy</remote-id>
 	</upstream>
diff --git a/games-sports/ultimatestunts/metadata.xml b/games-sports/ultimatestunts/metadata.xml
index 247ce7f667a8..5b1170028514 100644
--- a/games-sports/ultimatestunts/metadata.xml
+++ b/games-sports/ultimatestunts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ultimatestunts</remote-id>
 	</upstream>
diff --git a/games-sports/vdrift/metadata.xml b/games-sports/vdrift/metadata.xml
index 2df986e8a880..a1d4db3eaeb9 100644
--- a/games-sports/vdrift/metadata.xml
+++ b/games-sports/vdrift/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vdrift</remote-id>
 	</upstream>
diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml
index c502882366e5..9613f6452097 100644
--- a/games-sports/xmoto/metadata.xml
+++ b/games-sports/xmoto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="editor">Depend on inkscape, scripts to convert svg to level (svg2lvl)</flag>
   </use>
diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml
index c78b81370e75..598a0024236c 100644
--- a/games-strategy/0ad-data/metadata.xml
+++ b/games-strategy/0ad-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zero-ad</remote-id>
 	</upstream>
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
index b0120ff5c7d6..b4ff3c30c895 100644
--- a/games-strategy/0ad/metadata.xml
+++ b/games-strategy/0ad/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="editor">Include Atlas scenario editor projects</flag>
 		<flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg>
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
index 7e61522f75cb..a59ee1836790 100644
--- a/games-strategy/asc/metadata.xml
+++ b/games-strategy/asc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">asc-hq</remote-id>
 	</upstream>
diff --git a/games-strategy/attal/metadata.xml b/games-strategy/attal/metadata.xml
index cfb26d87feb2..2b62ef19eb51 100644
--- a/games-strategy/attal/metadata.xml
+++ b/games-strategy/attal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">attal</remote-id>
 	</upstream>
diff --git a/games-strategy/boswars/metadata.xml b/games-strategy/boswars/metadata.xml
index 84108ff3546c..4944d94fc5c6 100644
--- a/games-strategy/boswars/metadata.xml
+++ b/games-strategy/boswars/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 Bos Wars is a futuristic real-time strategy game. It is possible to play against
 human opponents over LAN, internet, or against the computer.
diff --git a/games-strategy/coldwar-demo/metadata.xml b/games-strategy/coldwar-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/coldwar-demo/metadata.xml
+++ b/games-strategy/coldwar-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/coldwar/metadata.xml b/games-strategy/coldwar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/coldwar/metadata.xml
+++ b/games-strategy/coldwar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/crimson/metadata.xml b/games-strategy/crimson/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/crimson/metadata.xml
+++ b/games-strategy/crimson/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/darwinia-demo/metadata.xml b/games-strategy/darwinia-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/darwinia-demo/metadata.xml
+++ b/games-strategy/darwinia-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/darwinia/metadata.xml b/games-strategy/darwinia/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/darwinia/metadata.xml
+++ b/games-strategy/darwinia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/defcon-demo/metadata.xml b/games-strategy/defcon-demo/metadata.xml
index 1de86a524780..1da6a6b58567 100644
--- a/games-strategy/defcon-demo/metadata.xml
+++ b/games-strategy/defcon-demo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution.</flag>
   </use>
diff --git a/games-strategy/dominions2/metadata.xml b/games-strategy/dominions2/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/dominions2/metadata.xml
+++ b/games-strategy/dominions2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
index 515905eb2873..a502fbe7e4f4 100644
--- a/games-strategy/dopewars/metadata.xml
+++ b/games-strategy/dopewars/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dopewars</remote-id>
 	</upstream>
diff --git a/games-strategy/dunelegacy/metadata.xml b/games-strategy/dunelegacy/metadata.xml
index 34c0e00fd987..19b477209392 100644
--- a/games-strategy/dunelegacy/metadata.xml
+++ b/games-strategy/dunelegacy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>http://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Development/Reporting_Bugs</bugs-to>
 		<remote-id type="sourceforge">dunelegacy</remote-id>
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 55b336947210..e1d53c4ce514 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="aimodules">Support for dynamically loadable AI
 			modules (server-side)</flag>
diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml
index cbcd007a87fe..1103e5ac4b45 100644
--- a/games-strategy/freecol/metadata.xml
+++ b/games-strategy/freecol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freecol</remote-id>
 	</upstream>
diff --git a/games-strategy/freesynd/metadata.xml b/games-strategy/freesynd/metadata.xml
index 349725bafdf0..38b703936a5f 100644
--- a/games-strategy/freesynd/metadata.xml
+++ b/games-strategy/freesynd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="devtools">Build development tools</flag>
 	</use>
diff --git a/games-strategy/galaxyhack/metadata.xml b/games-strategy/galaxyhack/metadata.xml
index 5ac28aa12349..55f9692c87ff 100644
--- a/games-strategy/galaxyhack/metadata.xml
+++ b/games-strategy/galaxyhack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 GalaxyHack allows you to design a fleet of spaceships which can then be tested
 in AI script based battles against fleets designed by other players. Though
diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml
index fc67f56d09d1..8084d13587fa 100644
--- a/games-strategy/glob2/metadata.xml
+++ b/games-strategy/glob2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 Globulation2 is an innovative high quality Real-Time Strategy [RTS], 
 which minimizes micro-management by automatically assigning tasks to 
diff --git a/games-strategy/gorky17-demo/metadata.xml b/games-strategy/gorky17-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/gorky17-demo/metadata.xml
+++ b/games-strategy/gorky17-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/gwp/metadata.xml b/games-strategy/gwp/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/gwp/metadata.xml
+++ b/games-strategy/gwp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/hedgewars/metadata.xml
+++ b/games-strategy/hedgewars/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/heroes3-demo/metadata.xml b/games-strategy/heroes3-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/heroes3-demo/metadata.xml
+++ b/games-strategy/heroes3-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/heroes3/metadata.xml b/games-strategy/heroes3/metadata.xml
index dcc07710ceae..0840bc5a84d3 100644
--- a/games-strategy/heroes3/metadata.xml
+++ b/games-strategy/heroes3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="maps">Installs optional map data</flag>
     <flag name="music">Installs optional music data</flag>
diff --git a/games-strategy/ja2-stracciatella-data/metadata.xml b/games-strategy/ja2-stracciatella-data/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-strategy/ja2-stracciatella-data/metadata.xml
+++ b/games-strategy/ja2-stracciatella-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
index ff6aeb5d2c82..da8cb2640825 100644
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="editor">Adds necessary file to run the editor</flag>
 		<flag name="linguas_ru_gold">Support for russian gold ja2 version</flag>
diff --git a/games-strategy/knights-demo/metadata.xml b/games-strategy/knights-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/knights-demo/metadata.xml
+++ b/games-strategy/knights-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/lgeneral/metadata.xml b/games-strategy/lgeneral/metadata.xml
index 41346d960516..b573b2411687 100644
--- a/games-strategy/lgeneral/metadata.xml
+++ b/games-strategy/lgeneral/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lgeneral</remote-id>
 	</upstream>
diff --git a/games-strategy/lightyears/metadata.xml b/games-strategy/lightyears/metadata.xml
index 72ac0f764196..e29f1d63d6de 100644
--- a/games-strategy/lightyears/metadata.xml
+++ b/games-strategy/lightyears/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 "20,000 Light Years Into Space" was written for Pyweek (March 2006) by Jack
 Whitham. It is a single-player real-time strategy game with a science-fiction
diff --git a/games-strategy/liquidwar/metadata.xml b/games-strategy/liquidwar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/liquidwar/metadata.xml
+++ b/games-strategy/liquidwar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
index 36321faf53ff..27208aae894c 100644
--- a/games-strategy/liquidwar6/metadata.xml
+++ b/games-strategy/liquidwar6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Convert the info pages to html</flag>
 		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
diff --git a/games-strategy/majesty-demo/metadata.xml b/games-strategy/majesty-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/majesty-demo/metadata.xml
+++ b/games-strategy/majesty-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/maxr/metadata.xml b/games-strategy/maxr/metadata.xml
index f72870c0c28d..e86d7ab2b7bf 100644
--- a/games-strategy/maxr/metadata.xml
+++ b/games-strategy/maxr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-strategy/megaglest-data/metadata.xml b/games-strategy/megaglest-data/metadata.xml
index b357af11da90..e9d18b0a1570 100644
--- a/games-strategy/megaglest-data/metadata.xml
+++ b/games-strategy/megaglest-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">MegaGlest/megaglest-data</remote-id>
 	</upstream>
diff --git a/games-strategy/megaglest/metadata.xml b/games-strategy/megaglest/metadata.xml
index ca0584f15be5..506ec531de4d 100644
--- a/games-strategy/megaglest/metadata.xml
+++ b/games-strategy/megaglest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<changelog>http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/docs/CHANGELOG.txt?revision=3397</changelog>
 		<doc lang="en">http://glest.wikia.com/wiki/MG</doc>
diff --git a/games-strategy/mindrover-demo/metadata.xml b/games-strategy/mindrover-demo/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/mindrover-demo/metadata.xml
+++ b/games-strategy/mindrover-demo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml
index da0a81aa42b8..3ffd13083c90 100644
--- a/games-strategy/naev/metadata.xml
+++ b/games-strategy/naev/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="mixer">
 		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend in addition to
diff --git a/games-strategy/netherearth/metadata.xml b/games-strategy/netherearth/metadata.xml
index 7c5a4830d79e..70ab77fa215e 100644
--- a/games-strategy/netherearth/metadata.xml
+++ b/games-strategy/netherearth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Nether Earth was the very first real time strategy game. It worked on a
 		SPECTRUM machine, and only needed 48KB of RAM to work!! It has all the
diff --git a/games-strategy/netpanzer/metadata.xml b/games-strategy/netpanzer/metadata.xml
index aea9e2c8753b..629ee864486a 100644
--- a/games-strategy/netpanzer/metadata.xml
+++ b/games-strategy/netpanzer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">netpanzer.berlios</remote-id>
 	</upstream>
diff --git a/games-strategy/openra/metadata.xml b/games-strategy/openra/metadata.xml
index 18bf86dc0dbd..896df88d6248 100644
--- a/games-strategy/openra/metadata.xml
+++ b/games-strategy/openra/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<changelog>http://openra.res0l.net/news/</changelog>
 		<doc lang="en">https://github.com/OpenRA/OpenRA/wiki</doc>
diff --git a/games-strategy/outerspace/metadata.xml b/games-strategy/outerspace/metadata.xml
index a7960bf9fec7..c23041eb6e1f 100644
--- a/games-strategy/outerspace/metadata.xml
+++ b/games-strategy/outerspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Outer Space is an on-line strategy game which takes place in the dangerous
 universe. You will become powerful commander of many stars, planets, and great
diff --git a/games-strategy/revenge-of-the-titans/metadata.xml b/games-strategy/revenge-of-the-titans/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/revenge-of-the-titans/metadata.xml
+++ b/games-strategy/revenge-of-the-titans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
index cd03b27c9618..13d5f1d99e1e 100644
--- a/games-strategy/s25rttr/metadata.xml
+++ b/games-strategy/s25rttr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+        <email>games@gentoo.org</email>
+        <name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
         <changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
         <bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml
index 339e10439c73..3281da6ee5fd 100644
--- a/games-strategy/scorched3d/metadata.xml
+++ b/games-strategy/scorched3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scorched3d</remote-id>
 	</upstream>
diff --git a/games-strategy/smac/metadata.xml b/games-strategy/smac/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/smac/metadata.xml
+++ b/games-strategy/smac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/tornado/metadata.xml b/games-strategy/tornado/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/tornado/metadata.xml
+++ b/games-strategy/tornado/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/triplea/metadata.xml b/games-strategy/triplea/metadata.xml
index 8b5efe7e31a9..35d609f308c7 100644
--- a/games-strategy/triplea/metadata.xml
+++ b/games-strategy/triplea/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">triplea</remote-id>
 	</upstream>
diff --git a/games-strategy/ufo-ai/metadata.xml b/games-strategy/ufo-ai/metadata.xml
index b7362ac28a4f..4b3fb320434d 100644
--- a/games-strategy/ufo-ai/metadata.xml
+++ b/games-strategy/ufo-ai/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="editor">Build map editor</flag>
   </use>
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
index df896deaf03b..aa3bf60a72bf 100644
--- a/games-strategy/uqm/metadata.xml
+++ b/games-strategy/uqm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="music">download and install music files (large)</flag>
     <flag name="remix">download and install music remix files (large)</flag>
diff --git a/games-strategy/wargus-data/metadata.xml b/games-strategy/wargus-data/metadata.xml
index 6ab50b787260..f5c6f784615f 100644
--- a/games-strategy/wargus-data/metadata.xml
+++ b/games-strategy/wargus-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wargus</remote-id>
 	</upstream>
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
index ef625880a2a8..b8f51e50cee0 100644
--- a/games-strategy/wargus/metadata.xml
+++ b/games-strategy/wargus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">wargus</remote-id>
 		<remote-id type="sourceforge">wargus</remote-id>
diff --git a/games-strategy/warmux/metadata.xml b/games-strategy/warmux/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-strategy/warmux/metadata.xml
+++ b/games-strategy/warmux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
index 3de7437cdf1e..0b7d89a8c3c4 100644
--- a/games-strategy/warzone2100/metadata.xml
+++ b/games-strategy/warzone2100/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="qt4">Use qt-gui/qt-opengl for backend rendering instead of sdl</flag>
 	</use>
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
index 02af598e0eae..1ed8e01be457 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="server">Enable compilation of server</flag>
     <flag name="fribidi">Support for right-to-left languages</flag>
diff --git a/games-strategy/widelands/metadata.xml b/games-strategy/widelands/metadata.xml
index 78bf2ca1e1e6..ba876b2a9ad5 100644
--- a/games-strategy/widelands/metadata.xml
+++ b/games-strategy/widelands/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">widelands</remote-id>
 	</upstream>
diff --git a/games-strategy/xbattle/metadata.xml b/games-strategy/xbattle/metadata.xml
index e46af3a374bc..cb65eba96178 100644
--- a/games-strategy/xbattle/metadata.xml
+++ b/games-strategy/xbattle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>mr_bones_@gentoo.org</email>
 <name>Michael Sterrett</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 From the HOMEPAGE:
 XBattle is a concurrent multi-player arcade/strategy game that captures
diff --git a/games-strategy/xbattleai/metadata.xml b/games-strategy/xbattleai/metadata.xml
index e46af3a374bc..cb65eba96178 100644
--- a/games-strategy/xbattleai/metadata.xml
+++ b/games-strategy/xbattleai/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>mr_bones_@gentoo.org</email>
 <name>Michael Sterrett</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 From the HOMEPAGE:
 XBattle is a concurrent multi-player arcade/strategy game that captures
diff --git a/games-util/antimicro/metadata.xml b/games-util/antimicro/metadata.xml
index 721b5e47b2f7..637a295dc0d7 100644
--- a/games-util/antimicro/metadata.xml
+++ b/games-util/antimicro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Ryochan7/antimicro</remote-id>
 	</upstream>
diff --git a/games-util/atlas/metadata.xml b/games-util/atlas/metadata.xml
index 5e106843db42..6f98d0371750 100644
--- a/games-util/atlas/metadata.xml
+++ b/games-util/atlas/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">atlas</remote-id>
 	</upstream>
diff --git a/games-util/biounzip/metadata.xml b/games-util/biounzip/metadata.xml
index 1da8c892301c..17a3fa3c2d07 100644
--- a/games-util/biounzip/metadata.xml
+++ b/games-util/biounzip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">biounzip</remote-id>
 	</upstream>
diff --git a/games-util/catcodec/metadata.xml b/games-util/catcodec/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/catcodec/metadata.xml
+++ b/games-util/catcodec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/datutil/metadata.xml b/games-util/datutil/metadata.xml
index 7a192d8ada41..0be4f8e1e06f 100644
--- a/games-util/datutil/metadata.xml
+++ b/games-util/datutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription lang="en">
 DatUtil was created to aid in the creation of dat files for Rom Managers such as
 ClrMamePro and RomCenter (Roman Scherzer / Eric Bole-Feysot). It can convert
diff --git a/games-util/deutex/metadata.xml b/games-util/deutex/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/deutex/metadata.xml
+++ b/games-util/deutex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/dfarc/metadata.xml b/games-util/dfarc/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-util/dfarc/metadata.xml
+++ b/games-util/dfarc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/dzip/metadata.xml b/games-util/dzip/metadata.xml
index e7005c1ae69b..1912477e4143 100644
--- a/games-util/dzip/metadata.xml
+++ b/games-util/dzip/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
   <email>hanno@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/etswitch/metadata.xml b/games-util/etswitch/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-util/etswitch/metadata.xml
+++ b/games-util/etswitch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/fteqcc/metadata.xml b/games-util/fteqcc/metadata.xml
index 89e90bd88787..416173f0762e 100644
--- a/games-util/fteqcc/metadata.xml
+++ b/games-util/fteqcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fteqw</remote-id>
 	</upstream>
diff --git a/games-util/gamepick/metadata.xml b/games-util/gamepick/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/gamepick/metadata.xml
+++ b/games-util/gamepick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/glbsp/metadata.xml b/games-util/glbsp/metadata.xml
index 7340483eadd9..9fc4ea488173 100644
--- a/games-util/glbsp/metadata.xml
+++ b/games-util/glbsp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">glbsp</remote-id>
 	</upstream>
diff --git a/games-util/grfcodec/metadata.xml b/games-util/grfcodec/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/grfcodec/metadata.xml
+++ b/games-util/grfcodec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/gslist/metadata.xml b/games-util/gslist/metadata.xml
index 32465f4350c4..349febc7debe 100644
--- a/games-util/gslist/metadata.xml
+++ b/games-util/gslist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="web">Enable the web interface</flag>
 	</use>
diff --git a/games-util/higan-purify/metadata.xml b/games-util/higan-purify/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-util/higan-purify/metadata.xml
+++ b/games-util/higan-purify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/joystick/metadata.xml b/games-util/joystick/metadata.xml
index ec0c3e67096f..629ed315c60b 100644
--- a/games-util/joystick/metadata.xml
+++ b/games-util/joystick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linuxconsole</remote-id>
 	</upstream>
diff --git a/games-util/linux-wbfs-manager/metadata.xml b/games-util/linux-wbfs-manager/metadata.xml
index 509881960887..03f0632ba8b4 100644
--- a/games-util/linux-wbfs-manager/metadata.xml
+++ b/games-util/linux-wbfs-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">linux-wbfs-manager</remote-id>
 	</upstream>
diff --git a/games-util/loki_patch/metadata.xml b/games-util/loki_patch/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/loki_patch/metadata.xml
+++ b/games-util/loki_patch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/lutris/metadata.xml b/games-util/lutris/metadata.xml
index 633db1adc52c..9503a0be5cc0 100644
--- a/games-util/lutris/metadata.xml
+++ b/games-util/lutris/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Lutris is a gaming platform for GNU/Linux. Its goal is to make
 		gaming on Linux as easy as possible by taking care of installing
diff --git a/games-util/nml/metadata.xml b/games-util/nml/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/nml/metadata.xml
+++ b/games-util/nml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/qjoypad/metadata.xml b/games-util/qjoypad/metadata.xml
index 324067672b76..9fa293797f07 100644
--- a/games-util/qjoypad/metadata.xml
+++ b/games-util/qjoypad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qjoypad</remote-id>
 	</upstream>
diff --git a/games-util/qstat/metadata.xml b/games-util/qstat/metadata.xml
index 11bdc55aa68f..44c7f0515a96 100644
--- a/games-util/qstat/metadata.xml
+++ b/games-util/qstat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qstat</remote-id>
 	</upstream>
diff --git a/games-util/ucon64/metadata.xml b/games-util/ucon64/metadata.xml
index c52bd2cff4e6..c88567081606 100644
--- a/games-util/ucon64/metadata.xml
+++ b/games-util/ucon64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ucon64</remote-id>
 	</upstream>
diff --git a/games-util/uglygs/metadata.xml b/games-util/uglygs/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/uglygs/metadata.xml
+++ b/games-util/uglygs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/umodpack/metadata.xml b/games-util/umodpack/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/umodpack/metadata.xml
+++ b/games-util/umodpack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/uz2unpack/metadata.xml b/games-util/uz2unpack/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/uz2unpack/metadata.xml
+++ b/games-util/uz2unpack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/vispatch/metadata.xml b/games-util/vispatch/metadata.xml
index 0bce39bc51e7..8a9817b636f6 100644
--- a/games-util/vispatch/metadata.xml
+++ b/games-util/vispatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vispatch</remote-id>
 	</upstream>
diff --git a/games-util/wiiload/metadata.xml b/games-util/wiiload/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/wiiload/metadata.xml
+++ b/games-util/wiiload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/wxchtdecoder/metadata.xml b/games-util/wxchtdecoder/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/wxchtdecoder/metadata.xml
+++ b/games-util/wxchtdecoder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/xboxdrv/metadata.xml b/games-util/xboxdrv/metadata.xml
index 668ca6c70661..bb9ce27abbfe 100644
--- a/games-util/xboxdrv/metadata.xml
+++ b/games-util/xboxdrv/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>tristan@gentoo.org</email>
 		<name>Tristan Heaven</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/xboxgw/metadata.xml b/games-util/xboxgw/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-util/xboxgw/metadata.xml
+++ b/games-util/xboxgw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-util/xgame-gtk2/metadata.xml b/games-util/xgame-gtk2/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-util/xgame-gtk2/metadata.xml
+++ b/games-util/xgame-gtk2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/xgame/metadata.xml b/games-util/xgame/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-util/xgame/metadata.xml
+++ b/games-util/xgame/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-util/xgamer/metadata.xml b/games-util/xgamer/metadata.xml
index 35bd0d7c0969..0e27025bef42 100644
--- a/games-util/xgamer/metadata.xml
+++ b/games-util/xgamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">xgamer</remote-id>
 	</upstream>
diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
index bc7e6dc37f4f..77074864ef6b 100644
--- a/games-util/xqf/metadata.xml
+++ b/games-util/xqf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xqf</remote-id>
 		<remote-id type="github">XQF/xqf</remote-id>
diff --git a/gnome-base/dconf-editor/metadata.xml b/gnome-base/dconf-editor/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/dconf-editor/metadata.xml
+++ b/gnome-base/dconf-editor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/dconf/metadata.xml
+++ b/gnome-base/dconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
index 40c5d90d727f..a365ed2cc100 100644
--- a/gnome-base/gconf/metadata.xml
+++ b/gnome-base/gconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="ldap">Build backend which enables default mail accounts,
 	addressbooks and calendars for Evolution to be configured using each
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index b7d56fb6fa85..1fe6b75bd7ec 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="fprint">Enables experimental fingerprint authentication using
 		<pkg>sys-auth/fprintd</pkg></flag>
diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml
index 4a4731d98a3f..739535c61648 100644
--- a/gnome-base/gnome-common/metadata.xml
+++ b/gnome-base/gnome-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="autoconf-archive">Pull in <pkg>sys-devel/autoconf-archive</pkg> for ax_*.m4 files
 		instead of installing them from the gnome-common tarball</flag>
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index 2865903805bb..a082213e15d7 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="colord">Support color management using
 			<pkg>x11-misc/colord</pkg></flag>
diff --git a/gnome-base/gnome-core-apps/metadata.xml b/gnome-base/gnome-core-apps/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gnome-core-apps/metadata.xml
+++ b/gnome-base/gnome-core-apps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gnome-core-libs/metadata.xml b/gnome-base/gnome-core-libs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gnome-core-libs/metadata.xml
+++ b/gnome-base/gnome-core-libs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index 683680a1275b..b5de2817d325 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="license-docs">Install help files documenting GNOME's
 			licenses</flag>
diff --git a/gnome-base/gnome-extra-apps/metadata.xml b/gnome-base/gnome-extra-apps/metadata.xml
index 502f705dcf13..68207e8d3824 100644
--- a/gnome-base/gnome-extra-apps/metadata.xml
+++ b/gnome-base/gnome-extra-apps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="games">Install Gnome Games</flag>
 	<flag name="share">Install the <pkg>gnome-extra/gnome-user-share</pkg> personal file sharing tool</flag>
diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
index 1ab418096095..f4865d2630aa 100644
--- a/gnome-base/gnome-keyring/metadata.xml
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		GNOME Keyring is a collection of components in GNOME that store
 		secrets, passwords, keys, certificates and make them available to
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
index bda1c5424569..21672c4d82b2 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
 		<pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag>
diff --git a/gnome-base/gnome-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gnome-mime-data/metadata.xml b/gnome-base/gnome-mime-data/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gnome-mime-data/metadata.xml
+++ b/gnome-base/gnome-mime-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 5aa7016e05a4..55eeb10f48ea 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg>
 		configuration storage system</flag>
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 4bfad2599972..799b9571d406 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="colord">Support color management using
 			<pkg>x11-misc/colord</pkg></flag>
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index 6a29f73453af..1a331efebde6 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="i18n">Enable support for enhanced input methods through
 		<pkg>app-i18n/ibus</pkg></flag>
diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gnome-vfs/metadata.xml
+++ b/gnome-base/gnome-vfs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gnome/metadata.xml b/gnome-base/gnome/metadata.xml
index 1a17b53ee48c..5fba4878962e 100644
--- a/gnome-base/gnome/metadata.xml
+++ b/gnome-base/gnome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
   <flag name="classic">Install <pkg>gnome-extra/gnome-shell-extensions</pkg>
     for the Gnome Shell Classic mode</flag>
diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ b/gnome-base/gsettings-desktop-schemas/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 42f4619851b9..9757683734e4 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 gvfs is a userspace virtual filesystem designed to work with the i/o
 abstractions of gio (a library availible in glib &gt;= 2.15.1). It
diff --git a/gnome-base/libbonobo/metadata.xml b/gnome-base/libbonobo/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libbonobo/metadata.xml
+++ b/gnome-base/libbonobo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libbonoboui/metadata.xml b/gnome-base/libbonoboui/metadata.xml
index 7be18f633777..dcc980cd4c15 100644
--- a/gnome-base/libbonoboui/metadata.xml
+++ b/gnome-base/libbonoboui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
 	computer. It will however make a snappier openoffice than the binary  version.
 	The Bonobo UI library provides a number of user interface controls using the 
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index 196142ca0ed4..ddad8f212796 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Install libglade-convert Python script.</flag>
 	</use>
diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml
index c83b6723d9e4..22cc1c59fbdc 100644
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ b/gnome-base/libgnome-keyring/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
diff --git a/gnome-base/libgnome/metadata.xml b/gnome-base/libgnome/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgnome/metadata.xml
+++ b/gnome-base/libgnome/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libgnomecanvas/metadata.xml b/gnome-base/libgnomecanvas/metadata.xml
index 8a90da2158b0..4f940c25ac2b 100644
--- a/gnome-base/libgnomecanvas/metadata.xml
+++ b/gnome-base/libgnomecanvas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="glade">Enable glade support</flag>
 </use>
diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgnomekbd/metadata.xml
+++ b/gnome-base/libgnomekbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libgnomeprint/metadata.xml b/gnome-base/libgnomeprint/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgnomeprint/metadata.xml
+++ b/gnome-base/libgnomeprint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgnomeprintui/metadata.xml
+++ b/gnome-base/libgnomeprintui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libgnomeui/metadata.xml b/gnome-base/libgnomeui/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgnomeui/metadata.xml
+++ b/gnome-base/libgnomeui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-base/libgtop/metadata.xml
+++ b/gnome-base/libgtop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 259490bff2a6..f91acdbfe2a1 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="tools">Build svg viewer tool</flag>
 </use>
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 2442ab3cd9a5..bb3d877f3652 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="packagekit">Use packagekit to search for programs to open
 		unknown file types</flag>
diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml
index 2965e3cff492..06045c8b246d 100644
--- a/gnome-base/orbit/metadata.xml
+++ b/gnome-base/orbit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="pic">Force libname-server-2 to be built as PIC; needed on
 		hardened systems</flag>
diff --git a/gnome-extra/activity-log-manager/metadata.xml b/gnome-extra/activity-log-manager/metadata.xml
index 0fd768b2976a..25d98a1bd590 100644
--- a/gnome-extra/activity-log-manager/metadata.xml
+++ b/gnome-extra/activity-log-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
 Gnome Activity Journal (GAJ for friends) is your portal to the world of 
 Zeitgeist. It's a user interface written in PyGTK ideated for easily 
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/assogiate/metadata.xml
+++ b/gnome-extra/assogiate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/at-spi/metadata.xml b/gnome-extra/at-spi/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/gnome-extra/at-spi/metadata.xml
+++ b/gnome-extra/at-spi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/avant-window-navigator-extras/metadata.xml b/gnome-extra/avant-window-navigator-extras/metadata.xml
index 407e733966a9..c86ec3aa6895 100644
--- a/gnome-extra/avant-window-navigator-extras/metadata.xml
+++ b/gnome-extra/avant-window-navigator-extras/metadata.xml
@@ -4,7 +4,10 @@
   <use>
     <flag name="gconf">Enable GConf as configuration backend</flag>
   </use>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">awn-extras</remote-id>
   </upstream>
diff --git a/gnome-extra/avant-window-navigator/metadata.xml b/gnome-extra/avant-window-navigator/metadata.xml
index eefc6380cd0e..1fb17af653f8 100644
--- a/gnome-extra/avant-window-navigator/metadata.xml
+++ b/gnome-extra/avant-window-navigator/metadata.xml
@@ -4,7 +4,10 @@
   <use>
     <flag name="gconf">Enable GConf as configuration backend</flag>
   </use>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
     Avant Window Navigator (Awn) is a dock-like bar which sits at the
     bottom of the screen. It has support for launchers, task lists, and
diff --git a/gnome-extra/cameramonitor/metadata.xml b/gnome-extra/cameramonitor/metadata.xml
index 90ea27a7ce60..aec676611285 100644
--- a/gnome-extra/cameramonitor/metadata.xml
+++ b/gnome-extra/cameramonitor/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>phobosk@fastmail.fm</email>
 		<name>PhobosK</name>
 		<description>Proxy maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Camera Monitor is a little system tray icon that monitors your Webcam activity.
 It is designed for the GNOME desktop, but should work as well on KDE and Xfce.
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 1d34d2fb151e..6170eb4b463c 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="colord">Support color management using
 			<pkg>x11-misc/colord</pkg></flag>
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
index 8cda79ca296c..b976f4307b45 100644
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index 47ca5400d8f8..03b0f0398467 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
index a5dc7d53ef2f..d4fe1f178d1b 100644
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 8cf621dfc269..ffd8a75a4adf 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index 427fb31d7e9b..3d20e2a7c07a 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 	</use>
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
index ab82430087fb..bdbaaf0afcb6 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 3d2ab0c98020..dc1d01965d07 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 72406f132664..bb6cee9bae71 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cjs</remote-id>
 	</upstream>
diff --git a/gnome-extra/docky/metadata.xml b/gnome-extra/docky/metadata.xml
index 6fe12e4ad789..627461443842 100644
--- a/gnome-extra/docky/metadata.xml
+++ b/gnome-extra/docky/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">docky</remote-id>
   </upstream>
diff --git a/gnome-extra/eiciel/metadata.xml b/gnome-extra/eiciel/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/eiciel/metadata.xml
+++ b/gnome-extra/eiciel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index 89e564fd9647..af9aa6e569e0 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="api-doc-extras">Build documentation for private APIs</flag>
 		<flag name="gnome-online-accounts">Enable using
diff --git a/gnome-extra/evolution-ews/metadata.xml b/gnome-extra/evolution-ews/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/evolution-ews/metadata.xml
+++ b/gnome-extra/evolution-ews/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gconf-editor/metadata.xml
+++ b/gnome-extra/gconf-editor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-activity-journal/metadata.xml b/gnome-extra/gnome-activity-journal/metadata.xml
index 52492b5050ae..8a3b285d2bc3 100644
--- a/gnome-extra/gnome-activity-journal/metadata.xml
+++ b/gnome-extra/gnome-activity-journal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">gnome-activity-journal</remote-id>
   </upstream>
diff --git a/gnome-extra/gnome-boxes/metadata.xml b/gnome-extra/gnome-boxes/metadata.xml
index fa5ebd0b3a27..b12ef04bc7fc 100644
--- a/gnome-extra/gnome-boxes/metadata.xml
+++ b/gnome-extra/gnome-boxes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
 			devices to another machine over TCP</flag>
diff --git a/gnome-extra/gnome-builder/metadata.xml b/gnome-extra/gnome-builder/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/gnome-builder/metadata.xml
+++ b/gnome-extra/gnome-builder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-calculator/metadata.xml b/gnome-extra/gnome-calculator/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-calculator/metadata.xml
+++ b/gnome-extra/gnome-calculator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-calendar/metadata.xml b/gnome-extra/gnome-calendar/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/gnome-calendar/metadata.xml
+++ b/gnome-extra/gnome-calendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-characters/metadata.xml b/gnome-extra/gnome-characters/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/gnome-characters/metadata.xml
+++ b/gnome-extra/gnome-characters/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-clocks/metadata.xml
+++ b/gnome-extra/gnome-clocks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
index 9ac3de3710d5..086e04c8fa75 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 53b83744b9fe..fd3580d95110 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>u.scholz83@gmx.de</email>
     <name>Uwe Scholz</name>
     <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 <upstream>
   <maintainer status="active">
     <email>u.scholz83@gmx.de</email>
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-directory-thumbnailer/metadata.xml b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/gnome-directory-thumbnailer/metadata.xml
+++ b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-do/metadata.xml b/gnome-extra/gnome-do/metadata.xml
index 49a068109484..0a17e958cb3a 100644
--- a/gnome-extra/gnome-do/metadata.xml
+++ b/gnome-extra/gnome-do/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>giuse88@gmail.com</email>
 		<name>Giuseppe Pes</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	GNOME Do allows you to quickly search for many items present in your GNOME
 	desktop environment (applications, Evolution contacts, Firefox bookmarks,
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-documents/metadata.xml
+++ b/gnome-extra/gnome-documents/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
index 9ef9a44a0eee..0d26093344e2 100644
--- a/gnome-extra/gnome-dvb-daemon/metadata.xml
+++ b/gnome-extra/gnome-dvb-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 	GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your 
 	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
diff --git a/gnome-extra/gnome-getting-started-docs/metadata.xml b/gnome-extra/gnome-getting-started-docs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-getting-started-docs/metadata.xml
+++ b/gnome-extra/gnome-getting-started-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-logs/metadata.xml b/gnome-extra/gnome-logs/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/gnome-logs/metadata.xml
+++ b/gnome-extra/gnome-logs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ b/gnome-extra/gnome-packagekit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
index 13f2b4adffba..fe6d462db2d7 100644
--- a/gnome-extra/gnome-power-manager/metadata.xml
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		Power Manager daemon for the GNOME desktop environment that makes it
 		easy to manage your laptop or desktop system.
diff --git a/gnome-extra/gnome-search-tool/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-search-tool/metadata.xml
+++ b/gnome-extra/gnome-search-tool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions-topicons/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-shell-extensions-topicons/metadata.xml
+++ b/gnome-extra/gnome-shell-extensions-topicons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/metadata.xml b/gnome-extra/gnome-shell-extensions/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-shell-extensions/metadata.xml
+++ b/gnome-extra/gnome-shell-extensions/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-frippery/metadata.xml b/gnome-extra/gnome-shell-frippery/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-shell-frippery/metadata.xml
+++ b/gnome-extra/gnome-shell-frippery/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/gnome-extra/gnome-software/metadata.xml
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
index 4ad8daa8fd7f..af8fa25ec7f5 100644
--- a/gnome-extra/gnome-system-monitor/metadata.xml
+++ b/gnome-extra/gnome-system-monitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
 		unit names, for running processes</flag>
diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-tweak-tool/metadata.xml
+++ b/gnome-extra/gnome-tweak-tool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-user-docs/metadata.xml
+++ b/gnome-extra/gnome-user-docs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-user-share/metadata.xml
+++ b/gnome-extra/gnome-user-share/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-utils/metadata.xml
+++ b/gnome-extra/gnome-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-weather/metadata.xml b/gnome-extra/gnome-weather/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gnome-weather/metadata.xml
+++ b/gnome-extra/gnome-weather/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-web-photo/metadata.xml b/gnome-extra/gnome-web-photo/metadata.xml
index 8804b36c8ab1..f75ec8fdf2d7 100644
--- a/gnome-extra/gnome-web-photo/metadata.xml
+++ b/gnome-extra/gnome-web-photo/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/gtkhtml/metadata.xml
+++ b/gnome-extra/gtkhtml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
index c83b6723d9e4..22cc1c59fbdc 100644
--- a/gnome-extra/gucharmap/metadata.xml
+++ b/gnome-extra/gucharmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 2467a1c19ebe..fcec510c939a 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
     <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
index 03ed476f3529..b0780763ca40 100644
--- a/gnome-extra/libgsf/metadata.xml
+++ b/gnome-extra/libgsf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gtk">Enable use of gdk in thumbnailer</flag>
 </use>
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
index ca8eef5fe3b9..f1253c292453 100644
--- a/gnome-extra/mousetweaks/metadata.xml
+++ b/gnome-extra/mousetweaks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 Mousetweaks is an Accessibility Software whose developement started as a GSoC
 2007 project under Ubuntu. It brings additional fonctionalities to the pointer
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/nautilus-actions/metadata.xml
+++ b/gnome-extra/nautilus-actions/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/nautilus-share/metadata.xml b/gnome-extra/nautilus-share/metadata.xml
index 5225cea25f55..b46a5986268b 100644
--- a/gnome-extra/nautilus-share/metadata.xml
+++ b/gnome-extra/nautilus-share/metadata.xml
@@ -5,5 +5,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/nautilus-tracker-tags/metadata.xml b/gnome-extra/nautilus-tracker-tags/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/nautilus-tracker-tags/metadata.xml
+++ b/gnome-extra/nautilus-tracker-tags/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index 721f1fd5cd9e..ed5c02441169 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="packagekit">Use packagekit to search for programs to open
 		unknown file types</flag>
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 847c5499d423..154de11454d1 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
index 4ed4360cbf79..ef5b393a8269 100644
--- a/gnome-extra/office-runner/metadata.xml
+++ b/gnome-extra/office-runner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">A tool in the form of a lighthearted game that
   temporarily inhibits GNOME's default suspend on lid close behavior,
   allowing the user to move his laptop with the lid closed without dropping
diff --git a/gnome-extra/polkit-gnome/metadata.xml b/gnome-extra/polkit-gnome/metadata.xml
index 941d094fcec5..7588e7760aed 100644
--- a/gnome-extra/polkit-gnome/metadata.xml
+++ b/gnome-extra/polkit-gnome/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
+<maintainer>
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/seahorse-nautilus/metadata.xml
+++ b/gnome-extra/seahorse-nautilus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
index 6923537f839f..755f8b9b1feb 100644
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="office">Support viewing file formats such as generated by
 			<pkg>app-office/libreoffice</pkg></flag>
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
index 5c1f3219ca46..688b9178e5a4 100644
--- a/gnome-extra/synapse/metadata.xml
+++ b/gnome-extra/synapse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="plugins">Build support for plugins using librest</flag>
     <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
diff --git a/gnome-extra/yelp-xsl/metadata.xml b/gnome-extra/yelp-xsl/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/yelp-xsl/metadata.xml
+++ b/gnome-extra/yelp-xsl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/yelp/metadata.xml
+++ b/gnome-extra/yelp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnome-extra/zeitgeist-explorer/metadata.xml b/gnome-extra/zeitgeist-explorer/metadata.xml
index 646f8f8e56b1..c69d17227b45 100644
--- a/gnome-extra/zeitgeist-explorer/metadata.xml
+++ b/gnome-extra/zeitgeist-explorer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
 Zeitgeist explorer is a tool which can be used to monitor and explore the 
 events logged by zeitgeist. In the monitor mode is can show the events logged
diff --git a/gnome-extra/zeitgeist-extensions/metadata.xml b/gnome-extra/zeitgeist-extensions/metadata.xml
index 0fbbfc0a44b1..a13620c4263c 100644
--- a/gnome-extra/zeitgeist-extensions/metadata.xml
+++ b/gnome-extra/zeitgeist-extensions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
 The Extensions allow manipulating events before/after insertion as well as 
 before fetching from the engine. They run in the Zeitgeist process. Default 
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
index 90a5fe978a38..ff217598d0a7 100644
--- a/gnome-extra/zeitgeist/metadata.xml
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
 The engine is the main module that accepts all incoming events and allows 
 applications to fetch as well as subscribe to be notified when events 
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/gnome-extra/zenity/metadata.xml
+++ b/gnome-extra/zenity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/gnustep-apps/aclock/metadata.xml b/gnustep-apps/aclock/metadata.xml
index 065f8a253dcd..0a4d733cec65 100644
--- a/gnustep-apps/aclock/metadata.xml
+++ b/gnustep-apps/aclock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 A clock!
 	
diff --git a/gnustep-apps/addresses/metadata.xml b/gnustep-apps/addresses/metadata.xml
index 6afea6705913..40fcc47d2976 100644
--- a/gnustep-apps/addresses/metadata.xml
+++ b/gnustep-apps/addresses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 This package constitutes a personal address manager for the GNUstep
 software system. It allows archiving complete personal contact
diff --git a/gnustep-apps/affiche/metadata.xml b/gnustep-apps/affiche/metadata.xml
index 6d8a7311ee20..08758bf4fe01 100644
--- a/gnustep-apps/affiche/metadata.xml
+++ b/gnustep-apps/affiche/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Affiche is a little application that allows people to "stick" little notes on their computer desktop. It works well under GNUstep and under Apple Mac OS X.
 
diff --git a/gnustep-apps/batmon/metadata.xml b/gnustep-apps/batmon/metadata.xml
index 86d5b1e7ca2f..415061978982 100644
--- a/gnustep-apps/batmon/metadata.xml
+++ b/gnustep-apps/batmon/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Battery monitor is a small utility that displays the status of your laptop battery (charge/discharge and status). I works best with linux 2.6 kernels and ACPI, but now has also support for 2.4 kernels and APM</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/camera/metadata.xml b/gnustep-apps/camera/metadata.xml
index 469b7b4cb5e3..35eb61a48ad0 100644
--- a/gnustep-apps/camera/metadata.xml
+++ b/gnustep-apps/camera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Camera is a simple application to download files from a digital
 camera. The files can be optionally deleted after download. During
diff --git a/gnustep-apps/cdplayer/metadata.xml b/gnustep-apps/cdplayer/metadata.xml
index 9517eb0b7dd2..c6a29b3e966d 100644
--- a/gnustep-apps/cdplayer/metadata.xml
+++ b/gnustep-apps/cdplayer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Small CD Audio Player for GNUstep</longdescription>
 	<upstream>
 		<remote-id type="github">schik/cdplayer</remote-id>
diff --git a/gnustep-apps/cenon/metadata.xml b/gnustep-apps/cenon/metadata.xml
index d09e0e070493..557bedda5be4 100644
--- a/gnustep-apps/cenon/metadata.xml
+++ b/gnustep-apps/cenon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>
 		Cenon is a graphical tool of a special kind. Build upon a
 		modular graphical core, Cenon offers a wide variety of
diff --git a/gnustep-apps/clipbook/metadata.xml b/gnustep-apps/clipbook/metadata.xml
index 34896a584cda..78a4624a8e44 100644
--- a/gnustep-apps/clipbook/metadata.xml
+++ b/gnustep-apps/clipbook/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 A clipboard for GNUstep that can hold things for later copy and paste.
 </longdescription>
diff --git a/gnustep-apps/cynthiune/metadata.xml b/gnustep-apps/cynthiune/metadata.xml
index 7c7458d44268..4833e33363cd 100644
--- a/gnustep-apps/cynthiune/metadata.xml
+++ b/gnustep-apps/cynthiune/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Cynthiune (january 2004)
 =========
diff --git a/gnustep-apps/displaycalibrator/metadata.xml b/gnustep-apps/displaycalibrator/metadata.xml
index e61b45bf9a8b..f97617ef7b2e 100644
--- a/gnustep-apps/displaycalibrator/metadata.xml
+++ b/gnustep-apps/displaycalibrator/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Display calibrator, frontend to xgamma</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/easydiff/metadata.xml b/gnustep-apps/easydiff/metadata.xml
index 0b3623527574..d0fe32d82bee 100644
--- a/gnustep-apps/easydiff/metadata.xml
+++ b/gnustep-apps/easydiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer> 
 <longdescription>
 EasyDiff lets you easily see the differences betweem two text files.
 </longdescription>
diff --git a/gnustep-apps/fisicalab/metadata.xml b/gnustep-apps/fisicalab/metadata.xml
index ad86afbc7a73..f6e59c2b4945 100644
--- a/gnustep-apps/fisicalab/metadata.xml
+++ b/gnustep-apps/fisicalab/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>FísicaLab is an educational application to solve physics problems. Is made with GNUstep and use the GSL libraries (GNU Scientific Library). The problems are setting adding elements from the palette to chalkboard, and writing the data of each element. The elements are objects as Blocks, Pulleys, Mobiles, Forces, ... . Use the SI and English systems, scientific notation and many conversion factors</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/gemas/metadata.xml b/gnustep-apps/gemas/metadata.xml
index 0ed19a6a03b6..d5a7251df46b 100644
--- a/gnustep-apps/gemas/metadata.xml
+++ b/gnustep-apps/gemas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Gemas is a simple code editor for GNUstep. It have autoindentation and highlight syntax for C, C++, Objective-C, Objective-C++, GSmarkup. And to edit Strings, Plist, GNUmakefile, ChangeLog files and plain text files (INSTALL, README, ...)</longdescription>
 	<use>
 		<flag name="projectcenter">Build and install plugin for <pkg>gnustep-apps/projectcenter</pkg></flag>
diff --git a/gnustep-apps/gmines/metadata.xml b/gnustep-apps/gmines/metadata.xml
index 65ec4b0c8c32..ff9d08e9510a 100644
--- a/gnustep-apps/gmines/metadata.xml
+++ b/gnustep-apps/gmines/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 The well-known minesweeper game.
 Left-click to uncover, right-click to mark.
diff --git a/gnustep-apps/gnumail/metadata.xml b/gnustep-apps/gnumail/metadata.xml
index d62831c43c7e..98deaabb7183 100644
--- a/gnustep-apps/gnumail/metadata.xml
+++ b/gnustep-apps/gnumail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 GNUMail.app is a fully featured mail application running on Linux (or FreeBSD, OpenBSD, etc) and Apple Mac OS X. It uses the GNUstep development framework or Apple Cocoa, which is based on the OpenStep specification provided by NeXT, Inc.. GNUMail.app is licensed under the GPL, and the full sources of the application are available.
 
diff --git a/gnustep-apps/gorm/metadata.xml b/gnustep-apps/gorm/metadata.xml
index a694d14f39e7..15a842a9edd2 100644
--- a/gnustep-apps/gorm/metadata.xml
+++ b/gnustep-apps/gorm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer> 
 <longdescription>
 Before NeXT Computer Inc. revolutionized software developement with its OpenStep API, a new way of designing graphical user interfaces was already introduced by NeXT at the beginning of the 90s. Its operating system NeXTstep featured Interface Builder, an application that for the first time allowed developers to quickly create nice user interfaces without having to code everything manually. Using drag and drop elements of windows such as buttons, sliders, textfields etc were created abd edited, then linked to functions and variables. Thus, Interface Builder helped developers to focus on the code for the actual functions without having to care about stuff not related to their project goal.
 
diff --git a/gnustep-apps/graphos/metadata.xml b/gnustep-apps/graphos/metadata.xml
index 27a8a851b0de..ad58d2e3e3e3 100644
--- a/gnustep-apps/graphos/metadata.xml
+++ b/gnustep-apps/graphos/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Graphos is a vector drawing application centered around bezier paths. Graphos roots are directly set in GDraw, written by Enrico Sersale and released in 2000.</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/gshisen/metadata.xml b/gnustep-apps/gshisen/metadata.xml
index abc5bcd5eb71..1ff9bbfe114e 100644
--- a/gnustep-apps/gshisen/metadata.xml
+++ b/gnustep-apps/gshisen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>GShisen is the first GNUstep game!
 The object of the game is to remove all tiles from the field. Only two matching tiles can be removed at a time. Two tiles can only be removed if they can be connected with at most three connected lines. Lines can be horizontal or vertical but not diagonal.
 Remember that lines may cross the empty border. If you are stuck, you can use the Hint feature to find two tiles which may be removed.</longdescription>
diff --git a/gnustep-apps/gspdf/metadata.xml b/gnustep-apps/gspdf/metadata.xml
index 162f2643c270..6232d6827f59 100644
--- a/gnustep-apps/gspdf/metadata.xml
+++ b/gnustep-apps/gspdf/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>GSPdf is a Pdf and PostScript file viewer. It is based on GhostScript which it calls at runtime to rasterize the pages.</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/gwnet/metadata.xml b/gnustep-apps/gwnet/metadata.xml
index 325a868e8c3d..b42e7dcc36e3 100644
--- a/gnustep-apps/gwnet/metadata.xml
+++ b/gnustep-apps/gwnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 GNUstep network filesystem file browser.
 
diff --git a/gnustep-apps/gworkspace/metadata.xml b/gnustep-apps/gworkspace/metadata.xml
index 099aece29dc4..39e64a5b18f2 100644
--- a/gnustep-apps/gworkspace/metadata.xml
+++ b/gnustep-apps/gworkspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 GWorkspace is the official GNUstep workspace manager. It is a clone of the NeXT workspace manager. GWorkspace is becoming more and more stable every day and it is already ready for daily usage.
 </longdescription>
diff --git a/gnustep-apps/lapispuzzle/metadata.xml b/gnustep-apps/lapispuzzle/metadata.xml
index 998612905f1a..121897b05362 100644
--- a/gnustep-apps/lapispuzzle/metadata.xml
+++ b/gnustep-apps/lapispuzzle/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>a tetris-like game which challenges the player by making the opposing team's victories count doubly against the player and vice versa</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/laternamagica/metadata.xml b/gnustep-apps/laternamagica/metadata.xml
index ad546ea76d3d..daef316c5e42 100644
--- a/gnustep-apps/laternamagica/metadata.xml
+++ b/gnustep-apps/laternamagica/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>LaternaMagica is a single-window image viewer application which is capable of switching to full-screen mode.
 LaternaMagica maintains its image list in a window and the user selects which image to display, making it easy to assemble a show from different source directories.
 LaternaMagica can recurse into directories when looking for images to add and construct the list.
diff --git a/gnustep-apps/mpdcon/metadata.xml b/gnustep-apps/mpdcon/metadata.xml
index 6eb9d62b2349..f53439377f33 100644
--- a/gnustep-apps/mpdcon/metadata.xml
+++ b/gnustep-apps/mpdcon/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>MPDCon is a client for the Music Player Daemon</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/pictureframe/metadata.xml b/gnustep-apps/pictureframe/metadata.xml
index 0bb3feab5ae9..364024690a07 100644
--- a/gnustep-apps/pictureframe/metadata.xml
+++ b/gnustep-apps/pictureframe/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>digital picture frame software</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/preferences/metadata.xml b/gnustep-apps/preferences/metadata.xml
index 388502d78636..8d5cf0c985f6 100644
--- a/gnustep-apps/preferences/metadata.xml
+++ b/gnustep-apps/preferences/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Preferences.app
 A modular GNUstep preferences editor
diff --git a/gnustep-apps/preview/metadata.xml b/gnustep-apps/preview/metadata.xml
index cdb845c739e2..d0368f049047 100644
--- a/gnustep-apps/preview/metadata.xml
+++ b/gnustep-apps/preview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 * Open GNUstep images file supported by GNUstep (usaly tiff/jpeg/gif/png)
 * Save as and Save To (tiff only)
diff --git a/gnustep-apps/price/metadata.xml b/gnustep-apps/price/metadata.xml
index 6b14c2957bdd..873d454d0d50 100644
--- a/gnustep-apps/price/metadata.xml
+++ b/gnustep-apps/price/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>
 PRICE, which stands for Precision Raster Image Convolution Engine, aims to be a high quality Image filtering, enhancing and manipulation program. It is written in Objective-C and AppKit, so being designed for Cocoa and GNUstep, it should be portable to OpenSTEP (I hope so, currently I don't have the computers to do the porting).
 </longdescription>
diff --git a/gnustep-apps/projectcenter/metadata.xml b/gnustep-apps/projectcenter/metadata.xml
index d0502643f038..ee46b68dbb41 100644
--- a/gnustep-apps/projectcenter/metadata.xml
+++ b/gnustep-apps/projectcenter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer> 
 <longdescription>
 ProjectCenter is GNUstep's integrated developement environment (IDE). It is based in part on NeXT's original Project Builder. It assists you in starting new projects and lets you manage your project files using a intuitive and well ordered graphical user interface.
 </longdescription>
diff --git a/gnustep-apps/remotedesk/metadata.xml b/gnustep-apps/remotedesk/metadata.xml
index 54db1ca2dbf5..67ff568c2354 100644
--- a/gnustep-apps/remotedesk/metadata.xml
+++ b/gnustep-apps/remotedesk/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>a graphical interface to rdesktop, it allows you to remotely access Windows computers</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/simpleagenda/metadata.xml b/gnustep-apps/simpleagenda/metadata.xml
index 35344c513c3f..1e735783a01d 100644
--- a/gnustep-apps/simpleagenda/metadata.xml
+++ b/gnustep-apps/simpleagenda/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>a simple calendar and agenda application</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index f26d868a3110..9e05c9c840a3 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">inverse-inc/sogo</remote-id>
 	</upstream>
diff --git a/gnustep-apps/stepulator/metadata.xml b/gnustep-apps/stepulator/metadata.xml
index f14a9f095ce8..c9c91eff9d65 100644
--- a/gnustep-apps/stepulator/metadata.xml
+++ b/gnustep-apps/stepulator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Stepulator
 A scientific RPN calculator for GNUstep
diff --git a/gnustep-apps/sudoku/metadata.xml b/gnustep-apps/sudoku/metadata.xml
index e7fb5d8e0bce..53cdf0f53030 100644
--- a/gnustep-apps/sudoku/metadata.xml
+++ b/gnustep-apps/sudoku/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Sudoku generator for GNUstep</longdescription>
 </pkgmetadata>
diff --git a/gnustep-apps/systempreferences/metadata.xml b/gnustep-apps/systempreferences/metadata.xml
index b4bbe16f246d..9824790db706 100644
--- a/gnustep-apps/systempreferences/metadata.xml
+++ b/gnustep-apps/systempreferences/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd> 
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer> 
 	<longdescription>
 		TODO
 	</longdescription>
diff --git a/gnustep-apps/terminal/metadata.xml b/gnustep-apps/terminal/metadata.xml
index dd55329e4556..4ceac32dca17 100644
--- a/gnustep-apps/terminal/metadata.xml
+++ b/gnustep-apps/terminal/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
-<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 Terminal.app - copyright (c) 2002 Alexander Malmberg alexander@malmberg.org
 
diff --git a/gnustep-apps/textedit/metadata.xml b/gnustep-apps/textedit/metadata.xml
index 875567b4baee..8abfa0f7309d 100644
--- a/gnustep-apps/textedit/metadata.xml
+++ b/gnustep-apps/textedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 TextEdit
 
diff --git a/gnustep-apps/zipper/metadata.xml b/gnustep-apps/zipper/metadata.xml
index 4759288a4c33..b9e9fba247aa 100644
--- a/gnustep-apps/zipper/metadata.xml
+++ b/gnustep-apps/zipper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Zipper is a tool for inspecting the contents of a compressed archive and for extracting.
 </longdescription>
diff --git a/gnustep-base/gnustep-back-art/metadata.xml b/gnustep-base/gnustep-back-art/metadata.xml
index 626b41b2fc21..303804746f3e 100644
--- a/gnustep-base/gnustep-back-art/metadata.xml
+++ b/gnustep-base/gnustep-back-art/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 It is a back-end component for the GNUstep GUI Library.  The
 implementation of the GNUstep GUI Library is designed in two parts.  The
diff --git a/gnustep-base/gnustep-back-cairo/metadata.xml b/gnustep-base/gnustep-back-cairo/metadata.xml
index 6920307820c3..a0cee31c6191 100644
--- a/gnustep-base/gnustep-back-cairo/metadata.xml
+++ b/gnustep-base/gnustep-back-cairo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 	Cairo back-end component for the GNUstep GUI Library.
 </longdescription>
diff --git a/gnustep-base/gnustep-back-xlib/metadata.xml b/gnustep-base/gnustep-back-xlib/metadata.xml
index b850ae4beecb..136b9c9078c4 100644
--- a/gnustep-base/gnustep-back-xlib/metadata.xml
+++ b/gnustep-base/gnustep-back-xlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 It is a back-end component for the GNUstep GUI Library.  The
 implementation of the GNUstep GUI Library is designed in two parts.  The
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
index 7c59c8111c68..670b239a8982 100644
--- a/gnustep-base/gnustep-base/metadata.xml
+++ b/gnustep-base/gnustep-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 The GNUstep Base Library is a library of general-purpose, non-graphical
 Objective C objects.  For example, it includes classes for strings,
diff --git a/gnustep-base/gnustep-gui/metadata.xml b/gnustep-base/gnustep-gui/metadata.xml
index 90eca9e75e77..2f1b2e1fb691 100644
--- a/gnustep-base/gnustep-gui/metadata.xml
+++ b/gnustep-base/gnustep-gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <use>
 	<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
 </use>
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
index 7ea24116581d..1ffc3fa6ba16 100644
--- a/gnustep-base/gnustep-make/metadata.xml
+++ b/gnustep-base/gnustep-make/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
diff --git a/gnustep-base/gnustep-updater/metadata.xml b/gnustep-base/gnustep-updater/metadata.xml
index 5dad78fef623..081da8066e8d 100644
--- a/gnustep-base/gnustep-updater/metadata.xml
+++ b/gnustep-base/gnustep-updater/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Helper tool to upgrade Gentoo GNUstep installations, after
 		the switch to FHS layout for example</longdescription>
 </pkgmetadata>
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
index d04df648ed16..3275bd738fb3 100644
--- a/gnustep-base/libobjc2/metadata.xml
+++ b/gnustep-base/libobjc2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 The GNUstep Objective-C runtime is designed as a drop-in replacement for the
 GCC runtime.  It supports both a legacy and a modern ABI, allowing code
diff --git a/gnustep-base/mknfonts/metadata.xml b/gnustep-base/mknfonts/metadata.xml
index 048bebbcbc72..5d4cdfce4c75 100644
--- a/gnustep-base/mknfonts/metadata.xml
+++ b/gnustep-base/mknfonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 mknfonts is a tool that offers ease of creating new font sets for the gnustep-back-art package.
 </longdescription>
diff --git a/gnustep-libs/camerakit/metadata.xml b/gnustep-libs/camerakit/metadata.xml
index 176741dff10d..4b02c7aa0d54 100644
--- a/gnustep-libs/camerakit/metadata.xml
+++ b/gnustep-libs/camerakit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 A simple ObjC wrapper around libgphoto2 for GNUstep.
 </longdescription> 
diff --git a/gnustep-libs/cenonlibrary/metadata.xml b/gnustep-libs/cenonlibrary/metadata.xml
index 73e8b8b06dff..cb70989e9a42 100644
--- a/gnustep-libs/cenonlibrary/metadata.xml
+++ b/gnustep-libs/cenonlibrary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>
 		Cenon is a graphical tool of a special kind. Build upon a
 		modular graphical core, Cenon offers a wide variety of
diff --git a/gnustep-libs/dbuskit/metadata.xml b/gnustep-libs/dbuskit/metadata.xml
index 4858c3463a27..a2ff05f55db8 100644
--- a/gnustep-libs/dbuskit/metadata.xml
+++ b/gnustep-libs/dbuskit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>The DBusKit framework offers tight integration of D-Bus services into Objective-C applications. It handles all low-level details of communication with D-Bus daemons and the services connected to them and exposes an interface similar to Distributed Objects to make it easy for Objective-C programmers to access D-Bus services.</longdescription>
 </pkgmetadata>
diff --git a/gnustep-libs/gsldap/metadata.xml b/gnustep-libs/gsldap/metadata.xml
index 1966891d2c5a..3bce3fe2ccfa 100644
--- a/gnustep-libs/gsldap/metadata.xml
+++ b/gnustep-libs/gsldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>
 		gsldap is a library which use open ldap (www.openldap.org) C
 		libraries to provide an  Objective-C interface to access LDAP
diff --git a/gnustep-libs/highlighterkit/metadata.xml b/gnustep-libs/highlighterkit/metadata.xml
index 9932f034706c..3929036aba5f 100644
--- a/gnustep-libs/highlighterkit/metadata.xml
+++ b/gnustep-libs/highlighterkit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>HighlighterKit is a framework to allow easy incorporation of syntax highlighting features into your application.</longdescription>
 </pkgmetadata>
diff --git a/gnustep-libs/iconkit/metadata.xml b/gnustep-libs/iconkit/metadata.xml
index a06c9f6fded6..bce9aa87fcda 100644
--- a/gnustep-libs/iconkit/metadata.xml
+++ b/gnustep-libs/iconkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 A framework used to create icons using different elements
 </longdescription>
diff --git a/gnustep-libs/netclasses/metadata.xml b/gnustep-libs/netclasses/metadata.xml
index 05362e16a194..1a39b2da73f9 100644
--- a/gnustep-libs/netclasses/metadata.xml
+++ b/gnustep-libs/netclasses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>
 		netclasses is an asynchronous networking library that works on
 		OS X natively, and any of the multitude of platforms supported
diff --git a/gnustep-libs/pantomime/metadata.xml b/gnustep-libs/pantomime/metadata.xml
index 188fd7b76cba..68057edafd5b 100644
--- a/gnustep-libs/pantomime/metadata.xml
+++ b/gnustep-libs/pantomime/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
-<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 A set of Objective-C classes that model a mail system.
 Author Ludovic Marcotte ludovic@Sophos.ca
diff --git a/gnustep-libs/performance/metadata.xml b/gnustep-libs/performance/metadata.xml
index f35a090c8e6c..35f1e5c91deb 100644
--- a/gnustep-libs/performance/metadata.xml
+++ b/gnustep-libs/performance/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>A collection of classes to help improve/tune performance of your software </longdescription>
 </pkgmetadata>
diff --git a/gnustep-libs/prefsmodule/metadata.xml b/gnustep-libs/prefsmodule/metadata.xml
index 7aa6d7b5fa81..3797c91c5b97 100644
--- a/gnustep-libs/prefsmodule/metadata.xml
+++ b/gnustep-libs/prefsmodule/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Module framework for Preferences.app
 A modular GNUstep preferences editor
diff --git a/gnustep-libs/renaissance/metadata.xml b/gnustep-libs/renaissance/metadata.xml
index ff7f03c8ed9a..72313d6a20b0 100644
--- a/gnustep-libs/renaissance/metadata.xml
+++ b/gnustep-libs/renaissance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 Welcome to GNUstep Renaissance!
  
diff --git a/gnustep-libs/smbkit/metadata.xml b/gnustep-libs/smbkit/metadata.xml
index bec3d05b3b70..1bb53256e56f 100644
--- a/gnustep-libs/smbkit/metadata.xml
+++ b/gnustep-libs/smbkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 SMBKit offers a samba library and headers for GNUstep.
 </longdescription>
diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
index 67c64170deb5..accb8a54dd7b 100644
--- a/gnustep-libs/sope/metadata.xml
+++ b/gnustep-libs/sope/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">inverse-inc/sope</remote-id>
 	</upstream>
diff --git a/gnustep-libs/sqlclient/metadata.xml b/gnustep-libs/sqlclient/metadata.xml
index 530936af7529..0074d06324d7 100644
--- a/gnustep-libs/sqlclient/metadata.xml
+++ b/gnustep-libs/sqlclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>The SQLClient library is designed to provide a simple interface to SQL databases for GNUstep applications. It does not attempt the sort of abstraction provided by the much more sophisticated GDL2 library but rather allows applications to directly execute SQL queries and statements.
 
 SQLClient provides for the Objective-C programmer much the same thing that JDBC provides for the Java programmer (though SQLClient is a bit faster, easier to use, and easier to add new database backends for than JDBC).</longdescription>
diff --git a/java-virtuals/ejb-api/metadata.xml b/java-virtuals/ejb-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/ejb-api/metadata.xml
+++ b/java-virtuals/ejb-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/interceptor-api/metadata.xml b/java-virtuals/interceptor-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/interceptor-api/metadata.xml
+++ b/java-virtuals/interceptor-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jaf/metadata.xml b/java-virtuals/jaf/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jaf/metadata.xml
+++ b/java-virtuals/jaf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/javamail/metadata.xml b/java-virtuals/javamail/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/javamail/metadata.xml
+++ b/java-virtuals/javamail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jaxp-virtual/metadata.xml b/java-virtuals/jaxp-virtual/metadata.xml
index 484092bc5681..d662d3c902af 100644
--- a/java-virtuals/jaxp-virtual/metadata.xml
+++ b/java-virtuals/jaxp-virtual/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
     Virtual for Java API for XML Processing (JAXP)
   </longdescription>
diff --git a/java-virtuals/jdk-with-com-sun/metadata.xml b/java-virtuals/jdk-with-com-sun/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jdk-with-com-sun/metadata.xml
+++ b/java-virtuals/jdk-with-com-sun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jms/metadata.xml b/java-virtuals/jms/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jms/metadata.xml
+++ b/java-virtuals/jms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jmx/metadata.xml b/java-virtuals/jmx/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jmx/metadata.xml
+++ b/java-virtuals/jmx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/saaj-api/metadata.xml b/java-virtuals/saaj-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/saaj-api/metadata.xml
+++ b/java-virtuals/saaj-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/script-api/metadata.xml b/java-virtuals/script-api/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/java-virtuals/script-api/metadata.xml
+++ b/java-virtuals/script-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/java-virtuals/servlet-api/metadata.xml b/java-virtuals/servlet-api/metadata.xml
index 4989a7a7a7eb..6ecbdb18241a 100644
--- a/java-virtuals/servlet-api/metadata.xml
+++ b/java-virtuals/servlet-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 	Virtual of Servlet API to allow for user selectable implementation of 
 	the Servlet API specification.
diff --git a/java-virtuals/stax-api/metadata.xml b/java-virtuals/stax-api/metadata.xml
index 6c80d418686d..a865d18d6a7b 100644
--- a/java-virtuals/stax-api/metadata.xml
+++ b/java-virtuals/stax-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription lang="en">
     Virtual for Streaming API for XML (StAX)
   </longdescription>
diff --git a/java-virtuals/transaction-api/metadata.xml b/java-virtuals/transaction-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/transaction-api/metadata.xml
+++ b/java-virtuals/transaction-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/xmlrpc-api/metadata.xml b/java-virtuals/xmlrpc-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/xmlrpc-api/metadata.xml
+++ b/java-virtuals/xmlrpc-api/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/akonadiconsole/metadata.xml b/kde-apps/akonadiconsole/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/akonadiconsole/metadata.xml
+++ b/kde-apps/akonadiconsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/akregator/metadata.xml b/kde-apps/akregator/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/akregator/metadata.xml
+++ b/kde-apps/akregator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/amor/metadata.xml b/kde-apps/amor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/amor/metadata.xml
+++ b/kde-apps/amor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/analitza/metadata.xml b/kde-apps/analitza/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/analitza/metadata.xml
+++ b/kde-apps/analitza/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ark/metadata.xml b/kde-apps/ark/metadata.xml
index 96d483186ee9..50c6090fa517 100644
--- a/kde-apps/ark/metadata.xml
+++ b/kde-apps/ark/metadata.xml
@@ -4,5 +4,8 @@
 	<use>
 		<flag name="archive">Enable support for a variety of archive formats through libarchive</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/artikulate/metadata.xml b/kde-apps/artikulate/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/artikulate/metadata.xml
+++ b/kde-apps/artikulate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/attica/metadata.xml b/kde-apps/attica/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/attica/metadata.xml
+++ b/kde-apps/attica/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/audiocd-kio/metadata.xml b/kde-apps/audiocd-kio/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/audiocd-kio/metadata.xml
+++ b/kde-apps/audiocd-kio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/baloo-widgets/metadata.xml b/kde-apps/baloo-widgets/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/baloo-widgets/metadata.xml
+++ b/kde-apps/baloo-widgets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/blinken/metadata.xml b/kde-apps/blinken/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/blinken/metadata.xml
+++ b/kde-apps/blinken/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/blogilo/metadata.xml b/kde-apps/blogilo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/blogilo/metadata.xml
+++ b/kde-apps/blogilo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/bomber/metadata.xml b/kde-apps/bomber/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/bomber/metadata.xml
+++ b/kde-apps/bomber/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/bovo/metadata.xml b/kde-apps/bovo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/bovo/metadata.xml
+++ b/kde-apps/bovo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/calendarjanitor/metadata.xml b/kde-apps/calendarjanitor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/calendarjanitor/metadata.xml
+++ b/kde-apps/calendarjanitor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 0bed71d37906..78245faf2cbc 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="analitza">Enable <pkg>kde-base/analitza</pkg> backend support</flag>
 		<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
diff --git a/kde-apps/cervisia/metadata.xml b/kde-apps/cervisia/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/cervisia/metadata.xml
+++ b/kde-apps/cervisia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/dolphin-plugins/metadata.xml b/kde-apps/dolphin-plugins/metadata.xml
index 23570d6ba99c..6e45e788f304 100644
--- a/kde-apps/dolphin-plugins/metadata.xml
+++ b/kde-apps/dolphin-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Enable support for the bazaar VCS</flag>
 		<flag name="dropbox">Enable support for the dropbox fileviewer plugin</flag>
diff --git a/kde-apps/dolphin/metadata.xml b/kde-apps/dolphin/metadata.xml
index 7cf8c72a3fb5..d86d9858b456 100644
--- a/kde-apps/dolphin/metadata.xml
+++ b/kde-apps/dolphin/metadata.xml
@@ -4,5 +4,8 @@
 	<use>
 		<flag name="thumbnail">Enables video thumbnail generation</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/dragon/metadata.xml b/kde-apps/dragon/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/dragon/metadata.xml
+++ b/kde-apps/dragon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/drkonqi/metadata.xml b/kde-apps/drkonqi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/drkonqi/metadata.xml
+++ b/kde-apps/drkonqi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ffmpegthumbs/metadata.xml b/kde-apps/ffmpegthumbs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ffmpegthumbs/metadata.xml
+++ b/kde-apps/ffmpegthumbs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/filelight/metadata.xml b/kde-apps/filelight/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/filelight/metadata.xml
+++ b/kde-apps/filelight/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/gpgmepp/metadata.xml b/kde-apps/gpgmepp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/gpgmepp/metadata.xml
+++ b/kde-apps/gpgmepp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/granatier/metadata.xml b/kde-apps/granatier/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/granatier/metadata.xml
+++ b/kde-apps/granatier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index e8b182771cdc..f3f25b6b045e 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
 	</use>
diff --git a/kde-apps/jovie/metadata.xml b/kde-apps/jovie/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/jovie/metadata.xml
+++ b/kde-apps/jovie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/juk/metadata.xml b/kde-apps/juk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/juk/metadata.xml
+++ b/kde-apps/juk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kabcclient/metadata.xml b/kde-apps/kabcclient/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kabcclient/metadata.xml
+++ b/kde-apps/kabcclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kaccessible/metadata.xml b/kde-apps/kaccessible/metadata.xml
index 9f69ece2b3b0..18deea58054e 100644
--- a/kde-apps/kaccessible/metadata.xml
+++ b/kde-apps/kaccessible/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="speechd">Enable support for the speech-dispatcher speech synthesizer</flag>
 	</use>
diff --git a/kde-apps/kaccounts-integration/metadata.xml b/kde-apps/kaccounts-integration/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kaccounts-integration/metadata.xml
+++ b/kde-apps/kaccounts-integration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kaddressbook/metadata.xml b/kde-apps/kaddressbook/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kaddressbook/metadata.xml
+++ b/kde-apps/kaddressbook/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kajongg/metadata.xml b/kde-apps/kajongg/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kajongg/metadata.xml
+++ b/kde-apps/kajongg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kalarm/metadata.xml b/kde-apps/kalarm/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kalarm/metadata.xml
+++ b/kde-apps/kalarm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kalgebra/metadata.xml b/kde-apps/kalgebra/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kalgebra/metadata.xml
+++ b/kde-apps/kalgebra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kalzium/metadata.xml b/kde-apps/kalzium/metadata.xml
index 0400e2eb5dfa..950ad0e94fed 100644
--- a/kde-apps/kalzium/metadata.xml
+++ b/kde-apps/kalzium/metadata.xml
@@ -5,5 +5,8 @@
 		<flag name="editor">Enable the embedded molecule editor/viewer</flag>
 		<flag name="solver">Enable the equation solver</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kamera/metadata.xml b/kde-apps/kamera/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kamera/metadata.xml
+++ b/kde-apps/kamera/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kanagram/metadata.xml b/kde-apps/kanagram/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kanagram/metadata.xml
+++ b/kde-apps/kanagram/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kapman/metadata.xml b/kde-apps/kapman/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kapman/metadata.xml
+++ b/kde-apps/kapman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kapptemplate/metadata.xml b/kde-apps/kapptemplate/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kapptemplate/metadata.xml
+++ b/kde-apps/kapptemplate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 27cb2c24d283..43f40c95d763 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="addons">Build and install additional plugins</flag>
 	</use>
diff --git a/kde-apps/katomic/metadata.xml b/kde-apps/katomic/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/katomic/metadata.xml
+++ b/kde-apps/katomic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kblackbox/metadata.xml b/kde-apps/kblackbox/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kblackbox/metadata.xml
+++ b/kde-apps/kblackbox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kblocks/metadata.xml b/kde-apps/kblocks/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kblocks/metadata.xml
+++ b/kde-apps/kblocks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kbounce/metadata.xml b/kde-apps/kbounce/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kbounce/metadata.xml
+++ b/kde-apps/kbounce/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kbreakout/metadata.xml b/kde-apps/kbreakout/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kbreakout/metadata.xml
+++ b/kde-apps/kbreakout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kbruch/metadata.xml b/kde-apps/kbruch/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kbruch/metadata.xml
+++ b/kde-apps/kbruch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcachegrind/metadata.xml b/kde-apps/kcachegrind/metadata.xml
index 771718e76822..bef0425abb4e 100644
--- a/kde-apps/kcachegrind/metadata.xml
+++ b/kde-apps/kcachegrind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kcachegrind</remote-id>
 	</upstream>
diff --git a/kde-apps/kcalc/metadata.xml b/kde-apps/kcalc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcalc/metadata.xml
+++ b/kde-apps/kcalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcharselect/metadata.xml b/kde-apps/kcharselect/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcharselect/metadata.xml
+++ b/kde-apps/kcharselect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcmshell/metadata.xml b/kde-apps/kcmshell/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcmshell/metadata.xml
+++ b/kde-apps/kcmshell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcolorchooser/metadata.xml b/kde-apps/kcolorchooser/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcolorchooser/metadata.xml
+++ b/kde-apps/kcolorchooser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcontrol/metadata.xml b/kde-apps/kcontrol/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcontrol/metadata.xml
+++ b/kde-apps/kcontrol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kcron/metadata.xml b/kde-apps/kcron/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kcron/metadata.xml
+++ b/kde-apps/kcron/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde-apps-meta/metadata.xml b/kde-apps/kde-apps-meta/metadata.xml
index e40177eace7a..1a81e006bb73 100644
--- a/kde-apps/kde-apps-meta/metadata.xml
+++ b/kde-apps/kde-apps-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="pim">Pull in KDE PIM suite</flag>
 		<flag name="sdk">Pull in developer-specific meta-packages</flag>
diff --git a/kde-apps/kde-base-artwork/metadata.xml b/kde-apps/kde-base-artwork/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde-base-artwork/metadata.xml
+++ b/kde-apps/kde-base-artwork/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde-dev-scripts/metadata.xml b/kde-apps/kde-dev-scripts/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde-dev-scripts/metadata.xml
+++ b/kde-apps/kde-dev-scripts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde-dev-utils/metadata.xml b/kde-apps/kde-dev-utils/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde-dev-utils/metadata.xml
+++ b/kde-apps/kde-dev-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde-l10n/metadata.xml b/kde-apps/kde-l10n/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde-l10n/metadata.xml
+++ b/kde-apps/kde-l10n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde-meta/metadata.xml b/kde-apps/kde-meta/metadata.xml
index 1c740394ada0..b7e897dc540c 100644
--- a/kde-apps/kde-meta/metadata.xml
+++ b/kde-apps/kde-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kdepim">Pull in KDE PIM</flag>
 		<flag name="sdk">Pull in developer-specific meta-packages</flag>
diff --git a/kde-apps/kde-wallpapers/metadata.xml b/kde-apps/kde-wallpapers/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde-wallpapers/metadata.xml
+++ b/kde-apps/kde-wallpapers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kde4-l10n/metadata.xml b/kde-apps/kde4-l10n/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kde4-l10n/metadata.xml
+++ b/kde-apps/kde4-l10n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeaccessibility-meta/metadata.xml b/kde-apps/kdeaccessibility-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeaccessibility-meta/metadata.xml
+++ b/kde-apps/kdeaccessibility-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeadmin-meta/metadata.xml b/kde-apps/kdeadmin-meta/metadata.xml
index ed4c25f9894c..6dae51057bb0 100644
--- a/kde-apps/kdeadmin-meta/metadata.xml
+++ b/kde-apps/kdeadmin-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="cron">Installs KDE application for <pkg>virtual/cron</pkg> configuration</flag>
 	</use>
diff --git a/kde-apps/kdeartwork-colorschemes/metadata.xml b/kde-apps/kdeartwork-colorschemes/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-colorschemes/metadata.xml
+++ b/kde-apps/kdeartwork-colorschemes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-desktopthemes/metadata.xml b/kde-apps/kdeartwork-desktopthemes/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-desktopthemes/metadata.xml
+++ b/kde-apps/kdeartwork-desktopthemes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-emoticons/metadata.xml b/kde-apps/kdeartwork-emoticons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-emoticons/metadata.xml
+++ b/kde-apps/kdeartwork-emoticons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-iconthemes/metadata.xml b/kde-apps/kdeartwork-iconthemes/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-iconthemes/metadata.xml
+++ b/kde-apps/kdeartwork-iconthemes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-kscreensaver/metadata.xml b/kde-apps/kdeartwork-kscreensaver/metadata.xml
index 5d3b07973255..d9cdaacc06f3 100644
--- a/kde-apps/kdeartwork-kscreensaver/metadata.xml
+++ b/kde-apps/kdeartwork-kscreensaver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="eigen">Enable various arithmetic screensavers which use Eigen2 for computations.</flag>
 		<flag name="kexiv2">Enable image rotation based on exif tags with libkexiv2.</flag>
diff --git a/kde-apps/kdeartwork-meta/metadata.xml b/kde-apps/kdeartwork-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-meta/metadata.xml
+++ b/kde-apps/kdeartwork-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-styles/metadata.xml b/kde-apps/kdeartwork-styles/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-styles/metadata.xml
+++ b/kde-apps/kdeartwork-styles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-wallpapers/metadata.xml b/kde-apps/kdeartwork-wallpapers/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-wallpapers/metadata.xml
+++ b/kde-apps/kdeartwork-wallpapers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeartwork-weatherwallpapers/metadata.xml b/kde-apps/kdeartwork-weatherwallpapers/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeartwork-weatherwallpapers/metadata.xml
+++ b/kde-apps/kdeartwork-weatherwallpapers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdebase-data/metadata.xml b/kde-apps/kdebase-data/metadata.xml
index 783e379c92b8..d9d555ea3489 100644
--- a/kde-apps/kdebase-data/metadata.xml
+++ b/kde-apps/kdebase-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
diff --git a/kde-apps/kdebase-desktoptheme/metadata.xml b/kde-apps/kdebase-desktoptheme/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdebase-desktoptheme/metadata.xml
+++ b/kde-apps/kdebase-desktoptheme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdebase-kioslaves/metadata.xml b/kde-apps/kdebase-kioslaves/metadata.xml
index a3be7e3f2b0c..7d7bc1673a06 100644
--- a/kde-apps/kdebase-kioslaves/metadata.xml
+++ b/kde-apps/kdebase-kioslaves/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
 	</use>
diff --git a/kde-apps/kdebase-menu-icons/metadata.xml b/kde-apps/kdebase-menu-icons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdebase-menu-icons/metadata.xml
+++ b/kde-apps/kdebase-menu-icons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdebase-menu/metadata.xml b/kde-apps/kdebase-menu/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdebase-menu/metadata.xml
+++ b/kde-apps/kdebase-menu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 0f092fdcc60b..1e44ec06ebb7 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="display-manager">Pull in a graphical display manager</flag>
 		<flag name="minimal">Disable install of various KDE SC 4 based packages</flag>
diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml b/kde-apps/kdebase-runtime-meta/metadata.xml
index 39dab8ef6c34..36d992216ff2 100644
--- a/kde-apps/kdebase-runtime-meta/metadata.xml
+++ b/kde-apps/kdebase-runtime-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="crash-reporter">Builds a gui tool to submit crash information to the upstream backtracker</flag>
 		<flag name="minimal">Install a Plasma 5 compatible subset of the package</flag>
diff --git a/kde-apps/kdebugdialog/metadata.xml b/kde-apps/kdebugdialog/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdebugdialog/metadata.xml
+++ b/kde-apps/kdebugdialog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index f5720929abd4..e7009bfeb721 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="minimal">Disable install of various KDE SC 4 based packages</flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
diff --git a/kde-apps/kdeedu-meta/metadata.xml b/kde-apps/kdeedu-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdeedu-meta/metadata.xml
+++ b/kde-apps/kdeedu-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdegames-meta/metadata.xml b/kde-apps/kdegames-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdegames-meta/metadata.xml
+++ b/kde-apps/kdegames-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdegraphics-meta/metadata.xml b/kde-apps/kdegraphics-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdegraphics-meta/metadata.xml
+++ b/kde-apps/kdegraphics-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdegraphics-mobipocket/metadata.xml b/kde-apps/kdegraphics-mobipocket/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdegraphics-mobipocket/metadata.xml
+++ b/kde-apps/kdegraphics-mobipocket/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdemultimedia-meta/metadata.xml b/kde-apps/kdemultimedia-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdemultimedia-meta/metadata.xml
+++ b/kde-apps/kdemultimedia-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdenetwork-filesharing/metadata.xml b/kde-apps/kdenetwork-filesharing/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdenetwork-filesharing/metadata.xml
+++ b/kde-apps/kdenetwork-filesharing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index 5fd30139fa90..90a71a6a1656 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="ppp">Enable support for <pkg>net-dialup/ppp</pkg>.</flag>
 	</use>
diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml
index 2019a2e7fd1a..6e96c84480d8 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 	</use>
diff --git a/kde-apps/kdepasswd/metadata.xml b/kde-apps/kdepasswd/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepasswd/metadata.xml
+++ b/kde-apps/kdepasswd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-common-libs/metadata.xml b/kde-apps/kdepim-common-libs/metadata.xml
index 5d980cdd6db6..e623539de2b8 100644
--- a/kde-apps/kdepim-common-libs/metadata.xml
+++ b/kde-apps/kdepim-common-libs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag>
 	</use>
diff --git a/kde-apps/kdepim-icons/metadata.xml b/kde-apps/kdepim-icons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepim-icons/metadata.xml
+++ b/kde-apps/kdepim-icons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-kresources/metadata.xml b/kde-apps/kdepim-kresources/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepim-kresources/metadata.xml
+++ b/kde-apps/kdepim-kresources/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-l10n/metadata.xml b/kde-apps/kdepim-l10n/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepim-l10n/metadata.xml
+++ b/kde-apps/kdepim-l10n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 90dda7f2246f..5f8f36215be2 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="facebook">Facebook service integration via <pkg>net-libs/libkfbapi</pkg></flag>
 	<flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag>
diff --git a/kde-apps/kdepim-wizards/metadata.xml b/kde-apps/kdepim-wizards/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdepim-wizards/metadata.xml
+++ b/kde-apps/kdepim-wizards/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
index d19719a52cea..1d9707efafa8 100644
--- a/kde-apps/kdepimlibs/metadata.xml
+++ b/kde-apps/kdepimlibs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="prison">Enable support for QRcodes in contacts</flag>
 	</use>
diff --git a/kde-apps/kdesdk-kioslaves/metadata.xml b/kde-apps/kdesdk-kioslaves/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdesdk-kioslaves/metadata.xml
+++ b/kde-apps/kdesdk-kioslaves/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-strigi-analyzer/metadata.xml b/kde-apps/kdesdk-strigi-analyzer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdesdk-strigi-analyzer/metadata.xml
+++ b/kde-apps/kdesdk-strigi-analyzer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdesu/metadata.xml b/kde-apps/kdesu/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdesu/metadata.xml
+++ b/kde-apps/kdesu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdetoys-meta/metadata.xml b/kde-apps/kdetoys-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdetoys-meta/metadata.xml
+++ b/kde-apps/kdetoys-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 295a2dec5514..6397c42daa36 100644
--- a/kde-apps/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="floppy">Install <pkg>kde-base/kfloppy</pkg> to format and create DOS or ext2fs filesystems in a floppy.</flag>
 	</use>
diff --git a/kde-apps/kdewebdev-meta/metadata.xml b/kde-apps/kdewebdev-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdewebdev-meta/metadata.xml
+++ b/kde-apps/kdewebdev-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdf/metadata.xml b/kde-apps/kdf/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdf/metadata.xml
+++ b/kde-apps/kdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdialog/metadata.xml b/kde-apps/kdialog/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdialog/metadata.xml
+++ b/kde-apps/kdialog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdiamond/metadata.xml b/kde-apps/kdiamond/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdiamond/metadata.xml
+++ b/kde-apps/kdiamond/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kdontchangethehostname/metadata.xml b/kde-apps/kdontchangethehostname/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kdontchangethehostname/metadata.xml
+++ b/kde-apps/kdontchangethehostname/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/keditbookmarks/metadata.xml b/kde-apps/keditbookmarks/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/keditbookmarks/metadata.xml
+++ b/kde-apps/keditbookmarks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/keditfiletype/metadata.xml b/kde-apps/keditfiletype/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/keditfiletype/metadata.xml
+++ b/kde-apps/keditfiletype/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfile/metadata.xml b/kde-apps/kfile/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfile/metadata.xml
+++ b/kde-apps/kfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfilereplace/metadata.xml b/kde-apps/kfilereplace/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfilereplace/metadata.xml
+++ b/kde-apps/kfilereplace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfind/metadata.xml b/kde-apps/kfind/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfind/metadata.xml
+++ b/kde-apps/kfind/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfloppy/metadata.xml b/kde-apps/kfloppy/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfloppy/metadata.xml
+++ b/kde-apps/kfloppy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfmclient/metadata.xml b/kde-apps/kfmclient/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfmclient/metadata.xml
+++ b/kde-apps/kfmclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kfourinline/metadata.xml b/kde-apps/kfourinline/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kfourinline/metadata.xml
+++ b/kde-apps/kfourinline/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kgamma/metadata.xml b/kde-apps/kgamma/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kgamma/metadata.xml
+++ b/kde-apps/kgamma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kgeography/metadata.xml b/kde-apps/kgeography/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kgeography/metadata.xml
+++ b/kde-apps/kgeography/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kget/metadata.xml b/kde-apps/kget/metadata.xml
index f7368ec755ce..7aa761fab69f 100644
--- a/kde-apps/kget/metadata.xml
+++ b/kde-apps/kget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable bittorrent transfer plugin through <pkg>net-libs/libktorrent</pkg></flag>
 		<flag name="gpg">Enable signature verification by QGpgME via <pkg>kde-apps/kdepimlibs</pkg></flag>
diff --git a/kde-apps/kglobalaccel/metadata.xml b/kde-apps/kglobalaccel/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kglobalaccel/metadata.xml
+++ b/kde-apps/kglobalaccel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kgoldrunner/metadata.xml b/kde-apps/kgoldrunner/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kgoldrunner/metadata.xml
+++ b/kde-apps/kgoldrunner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kgpg/metadata.xml b/kde-apps/kgpg/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kgpg/metadata.xml
+++ b/kde-apps/kgpg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/khangman/metadata.xml b/kde-apps/khangman/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/khangman/metadata.xml
+++ b/kde-apps/khangman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kiconfinder/metadata.xml b/kde-apps/kiconfinder/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kiconfinder/metadata.xml
+++ b/kde-apps/kiconfinder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml
index 76914c709991..d58bec83af98 100644
--- a/kde-apps/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
@@ -4,5 +4,8 @@
 	<use>
 		<flag name="scripting">Support Python scripting</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kigo/metadata.xml b/kde-apps/kigo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kigo/metadata.xml
+++ b/kde-apps/kigo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/killbots/metadata.xml b/kde-apps/killbots/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/killbots/metadata.xml
+++ b/kde-apps/killbots/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kimagemapeditor/metadata.xml b/kde-apps/kimagemapeditor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kimagemapeditor/metadata.xml
+++ b/kde-apps/kimagemapeditor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kimgio/metadata.xml b/kde-apps/kimgio/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kimgio/metadata.xml
+++ b/kde-apps/kimgio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index f7d7c71bd55d..8b3a0f26f0db 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
diff --git a/kde-apps/kioclient/metadata.xml b/kde-apps/kioclient/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kioclient/metadata.xml
+++ b/kde-apps/kioclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kiriki/metadata.xml b/kde-apps/kiriki/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kiriki/metadata.xml
+++ b/kde-apps/kiriki/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kiten/metadata.xml b/kde-apps/kiten/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kiten/metadata.xml
+++ b/kde-apps/kiten/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kjots/metadata.xml b/kde-apps/kjots/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-apps/kjots/metadata.xml
+++ b/kde-apps/kjots/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kjumpingcube/metadata.xml b/kde-apps/kjumpingcube/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kjumpingcube/metadata.xml
+++ b/kde-apps/kjumpingcube/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kleopatra/metadata.xml b/kde-apps/kleopatra/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-apps/kleopatra/metadata.xml
+++ b/kde-apps/kleopatra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/klettres/metadata.xml b/kde-apps/klettres/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/klettres/metadata.xml
+++ b/kde-apps/klettres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/klickety/metadata.xml b/kde-apps/klickety/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/klickety/metadata.xml
+++ b/kde-apps/klickety/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/klines/metadata.xml b/kde-apps/klines/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/klines/metadata.xml
+++ b/kde-apps/klines/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/klinkstatus/metadata.xml b/kde-apps/klinkstatus/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/klinkstatus/metadata.xml
+++ b/kde-apps/klinkstatus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmag/metadata.xml b/kde-apps/kmag/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmag/metadata.xml
+++ b/kde-apps/kmag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmahjongg/metadata.xml b/kde-apps/kmahjongg/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmahjongg/metadata.xml
+++ b/kde-apps/kmahjongg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmail/metadata.xml b/kde-apps/kmail/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-apps/kmail/metadata.xml
+++ b/kde-apps/kmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmimetypefinder/metadata.xml b/kde-apps/kmimetypefinder/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmimetypefinder/metadata.xml
+++ b/kde-apps/kmimetypefinder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmines/metadata.xml b/kde-apps/kmines/metadata.xml
index f14d167972a3..2bf43c8621f2 100644
--- a/kde-apps/kmines/metadata.xml
+++ b/kde-apps/kmines/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg></flag>
 	</use>
diff --git a/kde-apps/kmix/metadata.xml b/kde-apps/kmix/metadata.xml
index 8afb87d73fc9..77229d4cd156 100644
--- a/kde-apps/kmix/metadata.xml
+++ b/kde-apps/kmix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="canberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
 	</use>
diff --git a/kde-apps/kmousetool/metadata.xml b/kde-apps/kmousetool/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmousetool/metadata.xml
+++ b/kde-apps/kmousetool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmouth/metadata.xml b/kde-apps/kmouth/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmouth/metadata.xml
+++ b/kde-apps/kmouth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kmplot/metadata.xml b/kde-apps/kmplot/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kmplot/metadata.xml
+++ b/kde-apps/kmplot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knavalbattle/metadata.xml b/kde-apps/knavalbattle/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knavalbattle/metadata.xml
+++ b/kde-apps/knavalbattle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knetattach/metadata.xml b/kde-apps/knetattach/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knetattach/metadata.xml
+++ b/kde-apps/knetattach/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knetwalk/metadata.xml b/kde-apps/knetwalk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knetwalk/metadata.xml
+++ b/kde-apps/knetwalk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knewstuff/metadata.xml b/kde-apps/knewstuff/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knewstuff/metadata.xml
+++ b/kde-apps/knewstuff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knode/metadata.xml b/kde-apps/knode/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-apps/knode/metadata.xml
+++ b/kde-apps/knode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knotes/metadata.xml b/kde-apps/knotes/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knotes/metadata.xml
+++ b/kde-apps/knotes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/knotify/metadata.xml b/kde-apps/knotify/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/knotify/metadata.xml
+++ b/kde-apps/knotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kolf/metadata.xml b/kde-apps/kolf/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kolf/metadata.xml
+++ b/kde-apps/kolf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kollision/metadata.xml b/kde-apps/kollision/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kollision/metadata.xml
+++ b/kde-apps/kollision/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kolourpaint/metadata.xml b/kde-apps/kolourpaint/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kolourpaint/metadata.xml
+++ b/kde-apps/kolourpaint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kommander/metadata.xml b/kde-apps/kommander/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kommander/metadata.xml
+++ b/kde-apps/kommander/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kompare/metadata.xml b/kde-apps/kompare/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kompare/metadata.xml
+++ b/kde-apps/kompare/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/konq-plugins/metadata.xml b/kde-apps/konq-plugins/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/konq-plugins/metadata.xml
+++ b/kde-apps/konq-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 247e042c9a3b..6178ec1cea1c 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="bookmarks">Add dependency on bookmark package.</flag>
 	</use>
diff --git a/kde-apps/konquest/metadata.xml b/kde-apps/konquest/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/konquest/metadata.xml
+++ b/kde-apps/konquest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/konsole/metadata.xml b/kde-apps/konsole/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/konsole/metadata.xml
+++ b/kde-apps/konsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/konsolekalendar/metadata.xml b/kde-apps/konsolekalendar/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/konsolekalendar/metadata.xml
+++ b/kde-apps/konsolekalendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/konsolepart/metadata.xml b/kde-apps/konsolepart/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/konsolepart/metadata.xml
+++ b/kde-apps/konsolepart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kontact/metadata.xml b/kde-apps/kontact/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kontact/metadata.xml
+++ b/kde-apps/kontact/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index abb7150f7b85..169221cd3457 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -35,5 +35,8 @@
 		<flag name="yahoo">Enable yahoo protocol support.</flag>
 		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/korganizer/metadata.xml b/kde-apps/korganizer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/korganizer/metadata.xml
+++ b/kde-apps/korganizer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kpasswdserver/metadata.xml b/kde-apps/kpasswdserver/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kpasswdserver/metadata.xml
+++ b/kde-apps/kpasswdserver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kpat/metadata.xml b/kde-apps/kpat/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kpat/metadata.xml
+++ b/kde-apps/kpat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kppp/metadata.xml b/kde-apps/kppp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kppp/metadata.xml
+++ b/kde-apps/kppp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kqtquickcharts/metadata.xml b/kde-apps/kqtquickcharts/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kqtquickcharts/metadata.xml
+++ b/kde-apps/kqtquickcharts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kquitapp/metadata.xml b/kde-apps/kquitapp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kquitapp/metadata.xml
+++ b/kde-apps/kquitapp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/krdc/metadata.xml b/kde-apps/krdc/metadata.xml
index c9e0a2be10d9..54cc70a242e5 100644
--- a/kde-apps/krdc/metadata.xml
+++ b/kde-apps/krdc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="rdesktop">Enable runtime dependency for <pkg>net-misc/rdesktop</pkg></flag>
 		<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
diff --git a/kde-apps/kreadconfig/metadata.xml b/kde-apps/kreadconfig/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kreadconfig/metadata.xml
+++ b/kde-apps/kreadconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kremotecontrol/metadata.xml b/kde-apps/kremotecontrol/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kremotecontrol/metadata.xml
+++ b/kde-apps/kremotecontrol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kreversi/metadata.xml b/kde-apps/kreversi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kreversi/metadata.xml
+++ b/kde-apps/kreversi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/krfb/metadata.xml b/kde-apps/krfb/metadata.xml
index 5da474c874c3..bd4298653aec 100644
--- a/kde-apps/krfb/metadata.xml
+++ b/kde-apps/krfb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
 		<flag name="ktp">Enable displaying of KDE Telepathy contacts</flag>
diff --git a/kde-apps/kruler/metadata.xml b/kde-apps/kruler/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kruler/metadata.xml
+++ b/kde-apps/kruler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksaneplugin/metadata.xml b/kde-apps/ksaneplugin/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksaneplugin/metadata.xml
+++ b/kde-apps/ksaneplugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kscd/metadata.xml b/kde-apps/kscd/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kscd/metadata.xml
+++ b/kde-apps/kscd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kshisen/metadata.xml b/kde-apps/kshisen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kshisen/metadata.xml
+++ b/kde-apps/kshisen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksirk/metadata.xml b/kde-apps/ksirk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksirk/metadata.xml
+++ b/kde-apps/ksirk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksnakeduel/metadata.xml b/kde-apps/ksnakeduel/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksnakeduel/metadata.xml
+++ b/kde-apps/ksnakeduel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksnapshot/metadata.xml b/kde-apps/ksnapshot/metadata.xml
index 4881f137940c..e8e1be1b0daf 100644
--- a/kde-apps/ksnapshot/metadata.xml
+++ b/kde-apps/ksnapshot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kipi">Support for the KDE Image Plugin Interface.</flag>
 	</use>
diff --git a/kde-apps/kspaceduel/metadata.xml b/kde-apps/kspaceduel/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kspaceduel/metadata.xml
+++ b/kde-apps/kspaceduel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksquares/metadata.xml b/kde-apps/ksquares/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksquares/metadata.xml
+++ b/kde-apps/ksquares/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index 79595fbd91d8..fa3d65fa4350 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -5,5 +5,8 @@
 		<flag name="fits">Enable support for the FITS image format through cfitsio</flag>
 		<flag name="indi">Enable support for Astronomical control library using libindi</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kstart/metadata.xml b/kde-apps/kstart/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kstart/metadata.xml
+++ b/kde-apps/kstart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksudoku/metadata.xml b/kde-apps/ksudoku/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksudoku/metadata.xml
+++ b/kde-apps/ksudoku/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ksystemlog/metadata.xml b/kde-apps/ksystemlog/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ksystemlog/metadata.xml
+++ b/kde-apps/ksystemlog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kteatime/metadata.xml b/kde-apps/kteatime/metadata.xml
index 5a2ca10bda4b..a2391f96debb 100644
--- a/kde-apps/kteatime/metadata.xml
+++ b/kde-apps/kteatime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription>Kteatime alerts when the given time is over.
 	Different times for black tea, green tea, pizza and more.</longdescription>
 </pkgmetadata>
diff --git a/kde-apps/ktimer/metadata.xml b/kde-apps/ktimer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktimer/metadata.xml
+++ b/kde-apps/ktimer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktimetracker/metadata.xml b/kde-apps/ktimetracker/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktimetracker/metadata.xml
+++ b/kde-apps/ktimetracker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktimezoned/metadata.xml b/kde-apps/ktimezoned/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktimezoned/metadata.xml
+++ b/kde-apps/ktimezoned/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktnef/metadata.xml b/kde-apps/ktnef/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktnef/metadata.xml
+++ b/kde-apps/ktnef/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktouch/metadata.xml
+++ b/kde-apps/ktouch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktp-l10n/metadata.xml b/kde-apps/ktp-l10n/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktp-l10n/metadata.xml
+++ b/kde-apps/ktp-l10n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktraderclient/metadata.xml b/kde-apps/ktraderclient/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktraderclient/metadata.xml
+++ b/kde-apps/ktraderclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktuberling/metadata.xml b/kde-apps/ktuberling/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktuberling/metadata.xml
+++ b/kde-apps/ktuberling/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kturtle/metadata.xml b/kde-apps/kturtle/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kturtle/metadata.xml
+++ b/kde-apps/kturtle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/ktux/metadata.xml b/kde-apps/ktux/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/ktux/metadata.xml
+++ b/kde-apps/ktux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kubrick/metadata.xml b/kde-apps/kubrick/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kubrick/metadata.xml
+++ b/kde-apps/kubrick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kuiserver/metadata.xml b/kde-apps/kuiserver/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kuiserver/metadata.xml
+++ b/kde-apps/kuiserver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kurifilter-plugins/metadata.xml b/kde-apps/kurifilter-plugins/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kurifilter-plugins/metadata.xml
+++ b/kde-apps/kurifilter-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kuser/metadata.xml b/kde-apps/kuser/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kuser/metadata.xml
+++ b/kde-apps/kuser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kwalletd/metadata.xml b/kde-apps/kwalletd/metadata.xml
index ed9327ee435a..5503f02c2be9 100644
--- a/kde-apps/kwalletd/metadata.xml
+++ b/kde-apps/kwalletd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gpg">Support wallets with GnuPG encryption additionally to default blowfish-encrypted file</flag>
 	</use>
diff --git a/kde-apps/kwalletmanager/metadata.xml b/kde-apps/kwalletmanager/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kwalletmanager/metadata.xml
+++ b/kde-apps/kwalletmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kwordquiz/metadata.xml b/kde-apps/kwordquiz/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kwordquiz/metadata.xml
+++ b/kde-apps/kwordquiz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/kwrite/metadata.xml
+++ b/kde-apps/kwrite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ b/kde-apps/libkcompactdisc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkdcraw/metadata.xml b/kde-apps/libkdcraw/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkdcraw/metadata.xml
+++ b/kde-apps/libkdcraw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkdeedu/metadata.xml b/kde-apps/libkdeedu/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkdeedu/metadata.xml
+++ b/kde-apps/libkdeedu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkdegames/metadata.xml b/kde-apps/libkdegames/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkdegames/metadata.xml
+++ b/kde-apps/libkdegames/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkdepim/metadata.xml b/kde-apps/libkdepim/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkdepim/metadata.xml
+++ b/kde-apps/libkdepim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkexiv2/metadata.xml b/kde-apps/libkexiv2/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkexiv2/metadata.xml
+++ b/kde-apps/libkexiv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkface/metadata.xml b/kde-apps/libkface/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkface/metadata.xml
+++ b/kde-apps/libkface/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkgeomap/metadata.xml b/kde-apps/libkgeomap/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkgeomap/metadata.xml
+++ b/kde-apps/libkgeomap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkipi/metadata.xml b/kde-apps/libkipi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkipi/metadata.xml
+++ b/kde-apps/libkipi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkleo/metadata.xml b/kde-apps/libkleo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkleo/metadata.xml
+++ b/kde-apps/libkleo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkmahjongg/metadata.xml b/kde-apps/libkmahjongg/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkmahjongg/metadata.xml
+++ b/kde-apps/libkmahjongg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkomparediff2/metadata.xml b/kde-apps/libkomparediff2/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkomparediff2/metadata.xml
+++ b/kde-apps/libkomparediff2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkonq/metadata.xml b/kde-apps/libkonq/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkonq/metadata.xml
+++ b/kde-apps/libkonq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkpgp/metadata.xml b/kde-apps/libkpgp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libkpgp/metadata.xml
+++ b/kde-apps/libkpgp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libksane/metadata.xml b/kde-apps/libksane/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/lokalize/metadata.xml b/kde-apps/lokalize/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/lokalize/metadata.xml
+++ b/kde-apps/lokalize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/lskat/metadata.xml b/kde-apps/lskat/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/lskat/metadata.xml
+++ b/kde-apps/lskat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 3431dc867b5a..c4fe6ff16e16 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -7,5 +7,8 @@
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 		<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/mplayerthumbs/metadata.xml b/kde-apps/mplayerthumbs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/mplayerthumbs/metadata.xml
+++ b/kde-apps/mplayerthumbs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/nsplugins/metadata.xml b/kde-apps/nsplugins/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/nsplugins/metadata.xml
+++ b/kde-apps/nsplugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/okteta/metadata.xml b/kde-apps/okteta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/okteta/metadata.xml
+++ b/kde-apps/okteta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 11fa99eb2b0d..dbc36d156ce7 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -8,5 +8,8 @@
 		<flag name="kde">Enable kactivities support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/pairs/metadata.xml b/kde-apps/pairs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/pairs/metadata.xml
+++ b/kde-apps/pairs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/palapeli/metadata.xml b/kde-apps/palapeli/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/palapeli/metadata.xml
+++ b/kde-apps/palapeli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/parley/metadata.xml b/kde-apps/parley/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/parley/metadata.xml
+++ b/kde-apps/parley/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/phonon-kde/metadata.xml b/kde-apps/phonon-kde/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/phonon-kde/metadata.xml
+++ b/kde-apps/phonon-kde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/picmi/metadata.xml b/kde-apps/picmi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/picmi/metadata.xml
+++ b/kde-apps/picmi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/plasma-apps/metadata.xml b/kde-apps/plasma-apps/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/plasma-apps/metadata.xml
+++ b/kde-apps/plasma-apps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/plasma-runtime/metadata.xml b/kde-apps/plasma-runtime/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/plasma-runtime/metadata.xml
+++ b/kde-apps/plasma-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/poxml/metadata.xml b/kde-apps/poxml/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/poxml/metadata.xml
+++ b/kde-apps/poxml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/print-manager/metadata.xml b/kde-apps/print-manager/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/print-manager/metadata.xml
+++ b/kde-apps/print-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/renamedlg-plugins/metadata.xml b/kde-apps/renamedlg-plugins/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/renamedlg-plugins/metadata.xml
+++ b/kde-apps/renamedlg-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/rocs/metadata.xml b/kde-apps/rocs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/rocs/metadata.xml
+++ b/kde-apps/rocs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/solid-runtime/metadata.xml b/kde-apps/solid-runtime/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/solid-runtime/metadata.xml
+++ b/kde-apps/solid-runtime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml
index 01852c09eae1..c4087db4e3a6 100644
--- a/kde-apps/spectacle/metadata.xml
+++ b/kde-apps/spectacle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
 	</use>
diff --git a/kde-apps/step/metadata.xml b/kde-apps/step/metadata.xml
index 4996511bab73..507889096006 100644
--- a/kde-apps/step/metadata.xml
+++ b/kde-apps/step/metadata.xml
@@ -4,5 +4,8 @@
 	<use>
 		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
 	</use>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/superkaramba/metadata.xml b/kde-apps/superkaramba/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/superkaramba/metadata.xml
+++ b/kde-apps/superkaramba/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/svgpart/metadata.xml b/kde-apps/svgpart/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/svgpart/metadata.xml
+++ b/kde-apps/svgpart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/sweeper/metadata.xml b/kde-apps/sweeper/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/sweeper/metadata.xml
+++ b/kde-apps/sweeper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/thumbnailers/metadata.xml b/kde-apps/thumbnailers/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/thumbnailers/metadata.xml
+++ b/kde-apps/thumbnailers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/umbrello/metadata.xml
+++ b/kde-apps/umbrello/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/zeroconf-ioslave/metadata.xml b/kde-apps/zeroconf-ioslave/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-apps/zeroconf-ioslave/metadata.xml
+++ b/kde-apps/zeroconf-ioslave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-base/baloo/metadata.xml
+++ b/kde-base/baloo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/contactthemeeditor/metadata.xml b/kde-base/contactthemeeditor/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/contactthemeeditor/metadata.xml
+++ b/kde-base/contactthemeeditor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/freespacenotifier/metadata.xml b/kde-base/freespacenotifier/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/freespacenotifier/metadata.xml
+++ b/kde-base/freespacenotifier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kactivities/metadata.xml b/kde-base/kactivities/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-base/kactivities/metadata.xml
+++ b/kde-base/kactivities/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kactivitymanagerd/metadata.xml b/kde-base/kactivitymanagerd/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-base/kactivitymanagerd/metadata.xml
+++ b/kde-base/kactivitymanagerd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/katepart/metadata.xml b/kde-base/katepart/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/katepart/metadata.xml
+++ b/kde-base/katepart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kcheckpass/metadata.xml b/kde-base/kcheckpass/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kcheckpass/metadata.xml
+++ b/kde-base/kcheckpass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kcminit/metadata.xml b/kde-base/kcminit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kcminit/metadata.xml
+++ b/kde-base/kcminit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kde-env/metadata.xml b/kde-base/kde-env/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kde-env/metadata.xml
+++ b/kde-base/kde-env/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kdebase-cursors/metadata.xml b/kde-base/kdebase-cursors/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kdebase-cursors/metadata.xml
+++ b/kde-base/kdebase-cursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kdebase-pam/metadata.xml b/kde-base/kdebase-pam/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kdebase-pam/metadata.xml
+++ b/kde-base/kdebase-pam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kdebase-startkde/metadata.xml b/kde-base/kdebase-startkde/metadata.xml
index 8028a443f9c9..302ca553777a 100644
--- a/kde-base/kdebase-startkde/metadata.xml
+++ b/kde-base/kdebase-startkde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <use>
     <flag name="wallpapers">Install the KDE wallpapers</flag>
   </use>
diff --git a/kde-base/kdebindings-meta/metadata.xml b/kde-base/kdebindings-meta/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-base/kdebindings-meta/metadata.xml
+++ b/kde-base/kdebindings-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 0ab3601f545b..5c106544ca76 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
 	</use>
diff --git a/kde-base/kdeplasma-addons/metadata.xml b/kde-base/kdeplasma-addons/metadata.xml
index 65c95bdb1690..f7000bdc5487 100644
--- a/kde-base/kdeplasma-addons/metadata.xml
+++ b/kde-base/kdeplasma-addons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
diff --git a/kde-base/kdm/metadata.xml b/kde-base/kdm/metadata.xml
index 78a013ca03f0..6f3be855ac59 100644
--- a/kde-base/kdm/metadata.xml
+++ b/kde-base/kdm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+</maintainer>
 <use>
   <flag name="consolekit">Enables support for authorization using consolekit</flag>
 </use>
diff --git a/kde-base/kephal/metadata.xml b/kde-base/kephal/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kephal/metadata.xml
+++ b/kde-base/kephal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kfilemetadata/metadata.xml b/kde-base/kfilemetadata/metadata.xml
index ce8e2b9e73a5..5a6fa4919334 100644
--- a/kde-base/kfilemetadata/metadata.xml
+++ b/kde-base/kfilemetadata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="epub">Adds support for reading EPUB ebook metadata</flag>
 		<flag name="mobi">Adds support for reading MOBI ebook metadata</flag>
diff --git a/kde-base/khelpcenter/metadata.xml b/kde-base/khelpcenter/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/khelpcenter/metadata.xml
+++ b/kde-base/khelpcenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/khotkeys/metadata.xml b/kde-base/khotkeys/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/khotkeys/metadata.xml
+++ b/kde-base/khotkeys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kimono/metadata.xml b/kde-base/kimono/metadata.xml
index fdcd83134081..c0106fe62cd7 100644
--- a/kde-base/kimono/metadata.xml
+++ b/kde-base/kimono/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 		<flag name="plasma">Compile bindings for KDE's Plasma</flag>
diff --git a/kde-base/kinfocenter/metadata.xml b/kde-base/kinfocenter/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kinfocenter/metadata.xml
+++ b/kde-base/kinfocenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/klipper/metadata.xml b/kde-base/klipper/metadata.xml
index 7231c188b9c4..e4764df4dd6f 100644
--- a/kde-base/klipper/metadata.xml
+++ b/kde-base/klipper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 	</use>
diff --git a/kde-base/kmenuedit/metadata.xml b/kde-base/kmenuedit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kmenuedit/metadata.xml
+++ b/kde-base/kmenuedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/korundum/metadata.xml b/kde-base/korundum/metadata.xml
index 6de6cd747161..98e9414e6456 100644
--- a/kde-base/korundum/metadata.xml
+++ b/kde-base/korundum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 		<flag name="kate">Compile bindings for KDE Advanced Text Editor</flag>
diff --git a/kde-base/krossjava/metadata.xml b/kde-base/krossjava/metadata.xml
index ab434ce546ca..635faa4d501b 100644
--- a/kde-base/krossjava/metadata.xml
+++ b/kde-base/krossjava/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/krosspython/metadata.xml b/kde-base/krosspython/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/krosspython/metadata.xml
+++ b/kde-base/krosspython/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/krossruby/metadata.xml b/kde-base/krossruby/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/krossruby/metadata.xml
+++ b/kde-base/krossruby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/krunner/metadata.xml b/kde-base/krunner/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/krunner/metadata.xml
+++ b/kde-base/krunner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kscreensaver/metadata.xml b/kde-base/kscreensaver/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kscreensaver/metadata.xml
+++ b/kde-base/kscreensaver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/ksmserver/metadata.xml b/kde-base/ksmserver/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/ksmserver/metadata.xml
+++ b/kde-base/ksmserver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/ksplash/metadata.xml b/kde-base/ksplash/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/ksplash/metadata.xml
+++ b/kde-base/ksplash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kstartupconfig/metadata.xml b/kde-base/kstartupconfig/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kstartupconfig/metadata.xml
+++ b/kde-base/kstartupconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kstyles/metadata.xml b/kde-base/kstyles/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kstyles/metadata.xml
+++ b/kde-base/kstyles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/ksysguard/metadata.xml b/kde-base/ksysguard/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/ksysguard/metadata.xml
+++ b/kde-base/ksysguard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/ksystraycmd/metadata.xml b/kde-base/ksystraycmd/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/ksystraycmd/metadata.xml
+++ b/kde-base/ksystraycmd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/kwin/metadata.xml b/kde-base/kwin/metadata.xml
index 8b8d86d7bf6d..ef78469e5cbc 100644
--- a/kde-base/kwin/metadata.xml
+++ b/kde-base/kwin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <use>
     <flag name="gles">Enable support for GLES.</flag>
   </use>
diff --git a/kde-base/kwrited/metadata.xml b/kde-base/kwrited/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/kwrited/metadata.xml
+++ b/kde-base/kwrited/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/libkgreeter/metadata.xml b/kde-base/libkgreeter/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-base/libkgreeter/metadata.xml
+++ b/kde-base/libkgreeter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-base/libkworkspace/metadata.xml b/kde-base/libkworkspace/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/libkworkspace/metadata.xml
+++ b/kde-base/libkworkspace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/liboxygenstyle/metadata.xml b/kde-base/liboxygenstyle/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/liboxygenstyle/metadata.xml
+++ b/kde-base/liboxygenstyle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/libplasmaclock/metadata.xml b/kde-base/libplasmaclock/metadata.xml
index 716581345182..4ea37f9cc915 100644
--- a/kde-base/libplasmaclock/metadata.xml
+++ b/kde-base/libplasmaclock/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
 	</use>
diff --git a/kde-base/libplasmagenericshell/metadata.xml b/kde-base/libplasmagenericshell/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/libplasmagenericshell/metadata.xml
+++ b/kde-base/libplasmagenericshell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/libtaskmanager/metadata.xml b/kde-base/libtaskmanager/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/libtaskmanager/metadata.xml
+++ b/kde-base/libtaskmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/perlkde/metadata.xml b/kde-base/perlkde/metadata.xml
index 793ccf0eb448..d40948d6a74d 100644
--- a/kde-base/perlkde/metadata.xml
+++ b/kde-base/perlkde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 		<flag name="attica">Compile bindings for <pkg>dev-libs/libattica</pkg></flag>
diff --git a/kde-base/perlqt/metadata.xml b/kde-base/perlqt/metadata.xml
index 5f0bf26d5551..038aa9376859 100644
--- a/kde-base/perlqt/metadata.xml
+++ b/kde-base/perlqt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="declarative">Compile bindings for <pkg>dev-qt/qtdeclarative</pkg>.</flag>
 	<flag name="multimedia">Compile bindings for <pkg>dev-qt/qtmultimedia</pkg>.</flag>
diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml
index cfe81df34110..016ac2629a1a 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
index 94ce7b0aa169..6e39f2c8beef 100644
--- a/kde-base/powerdevil/metadata.xml
+++ b/kde-base/powerdevil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+</maintainer>
 <use>
   <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
 </use>
diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index b4e222ad6dd5..86b8b9e90365 100644
--- a/kde-base/pykde4/metadata.xml
+++ b/kde-base/pykde4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 	</use>
diff --git a/kde-base/qguiplatformplugin_kde/metadata.xml b/kde-base/qguiplatformplugin_kde/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/qguiplatformplugin_kde/metadata.xml
+++ b/kde-base/qguiplatformplugin_kde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/qtruby/metadata.xml b/kde-base/qtruby/metadata.xml
index 4cadec21f08a..4949b04fa4dc 100644
--- a/kde-base/qtruby/metadata.xml
+++ b/kde-base/qtruby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="declarative">Compile bindings for <pkg>dev-qt/qtdeclarative</pkg>.</flag>
 	<flag name="phonon">Compile bindings for Phonon.</flag>
diff --git a/kde-base/qyoto/metadata.xml b/kde-base/qyoto/metadata.xml
index b069b55c8cb2..aeaab80662a0 100644
--- a/kde-base/qyoto/metadata.xml
+++ b/kde-base/qyoto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="phonon">Compile bindings for Phonon.</flag>
 	<flag name="qscintilla">Compile bindings for <pkg>x11-libs/qscintilla</pkg>.</flag>
diff --git a/kde-base/smokegen/metadata.xml b/kde-base/smokegen/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/smokegen/metadata.xml
+++ b/kde-base/smokegen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/smokekde/metadata.xml b/kde-base/smokekde/metadata.xml
index 793ccf0eb448..d40948d6a74d 100644
--- a/kde-base/smokekde/metadata.xml
+++ b/kde-base/smokekde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 		<flag name="attica">Compile bindings for <pkg>dev-libs/libattica</pkg></flag>
diff --git a/kde-base/smokeqt/metadata.xml b/kde-base/smokeqt/metadata.xml
index baa5ca8f8308..00794b6f5a7c 100644
--- a/kde-base/smokeqt/metadata.xml
+++ b/kde-base/smokeqt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="declarative">Compile bindings for <pkg>dev-qt/qtdeclarative</pkg>.</flag>
 	<flag name="multimedia">Compile bindings for <pkg>dev-qt/qtmultimedia</pkg>.</flag>
diff --git a/kde-base/solid-actions-kcm/metadata.xml b/kde-base/solid-actions-kcm/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-base/solid-actions-kcm/metadata.xml
+++ b/kde-base/solid-actions-kcm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml
index 8858d22f8891..795987a4d48b 100644
--- a/kde-base/systemsettings/metadata.xml
+++ b/kde-base/systemsettings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kscreen">Use <pkg>kde-misc/kscreen</pkg> for screen management</flag>
 	</use>
diff --git a/kde-frameworks/attica/metadata.xml b/kde-frameworks/attica/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/attica/metadata.xml
+++ b/kde-frameworks/attica/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/baloo/metadata.xml b/kde-frameworks/baloo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/baloo/metadata.xml
+++ b/kde-frameworks/baloo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/bluez-qt/metadata.xml b/kde-frameworks/bluez-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/bluez-qt/metadata.xml
+++ b/kde-frameworks/bluez-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/breeze-icons/metadata.xml b/kde-frameworks/breeze-icons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/breeze-icons/metadata.xml
+++ b/kde-frameworks/breeze-icons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/frameworkintegration/metadata.xml b/kde-frameworks/frameworkintegration/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/frameworkintegration/metadata.xml
+++ b/kde-frameworks/frameworkintegration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kactivities/metadata.xml b/kde-frameworks/kactivities/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kactivities/metadata.xml
+++ b/kde-frameworks/kactivities/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kapidox/metadata.xml b/kde-frameworks/kapidox/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kapidox/metadata.xml
+++ b/kde-frameworks/kapidox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/karchive/metadata.xml b/kde-frameworks/karchive/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/karchive/metadata.xml
+++ b/kde-frameworks/karchive/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kauth/metadata.xml b/kde-frameworks/kauth/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kauth/metadata.xml
+++ b/kde-frameworks/kauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kbookmarks/metadata.xml b/kde-frameworks/kbookmarks/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kbookmarks/metadata.xml
+++ b/kde-frameworks/kbookmarks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kcmutils/metadata.xml b/kde-frameworks/kcmutils/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kcmutils/metadata.xml
+++ b/kde-frameworks/kcmutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kcodecs/metadata.xml b/kde-frameworks/kcodecs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kcodecs/metadata.xml
+++ b/kde-frameworks/kcodecs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kcompletion/metadata.xml b/kde-frameworks/kcompletion/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kcompletion/metadata.xml
+++ b/kde-frameworks/kcompletion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kconfig/metadata.xml b/kde-frameworks/kconfig/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kconfig/metadata.xml
+++ b/kde-frameworks/kconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kconfigwidgets/metadata.xml b/kde-frameworks/kconfigwidgets/metadata.xml
index 1f2159277e3c..d7c0ae21bc38 100644
--- a/kde-frameworks/kconfigwidgets/metadata.xml
+++ b/kde-frameworks/kconfigwidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="man">Build and install man pages</flag>
 	</use>
diff --git a/kde-frameworks/kcoreaddons/metadata.xml b/kde-frameworks/kcoreaddons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kcoreaddons/metadata.xml
+++ b/kde-frameworks/kcoreaddons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kcrash/metadata.xml b/kde-frameworks/kcrash/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kcrash/metadata.xml
+++ b/kde-frameworks/kcrash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdbusaddons/metadata.xml b/kde-frameworks/kdbusaddons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdbusaddons/metadata.xml
+++ b/kde-frameworks/kdbusaddons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdeclarative/metadata.xml b/kde-frameworks/kdeclarative/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdeclarative/metadata.xml
+++ b/kde-frameworks/kdeclarative/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kded/metadata.xml b/kde-frameworks/kded/metadata.xml
index 1f2159277e3c..d7c0ae21bc38 100644
--- a/kde-frameworks/kded/metadata.xml
+++ b/kde-frameworks/kded/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="man">Build and install man pages</flag>
 	</use>
diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdelibs4support/metadata.xml
+++ b/kde-frameworks/kdelibs4support/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdesignerplugin/metadata.xml b/kde-frameworks/kdesignerplugin/metadata.xml
index 0ca133efed73..465695f6162c 100644
--- a/kde-frameworks/kdesignerplugin/metadata.xml
+++ b/kde-frameworks/kdesignerplugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="designer">Build KF5 widgets plugin for QtDesigner</flag>
 		<flag name="webkit">Build kdewebkit plugin for QtDesigner</flag>
diff --git a/kde-frameworks/kdesu/metadata.xml b/kde-frameworks/kdesu/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdesu/metadata.xml
+++ b/kde-frameworks/kdesu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdewebkit/metadata.xml b/kde-frameworks/kdewebkit/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdewebkit/metadata.xml
+++ b/kde-frameworks/kdewebkit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdnssd/metadata.xml b/kde-frameworks/kdnssd/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdnssd/metadata.xml
+++ b/kde-frameworks/kdnssd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kdoctools/metadata.xml b/kde-frameworks/kdoctools/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kdoctools/metadata.xml
+++ b/kde-frameworks/kdoctools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kemoticons/metadata.xml b/kde-frameworks/kemoticons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kemoticons/metadata.xml
+++ b/kde-frameworks/kemoticons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kf-env/metadata.xml
+++ b/kde-frameworks/kf-env/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml
index cecf265f9f2b..e3ef83dadcb6 100644
--- a/kde-frameworks/kfilemetadata/metadata.xml
+++ b/kde-frameworks/kfilemetadata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="epub">Adds support for reading EPUB ebook metadata</flag>
 	</use>
diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kglobalaccel/metadata.xml
+++ b/kde-frameworks/kglobalaccel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kguiaddons/metadata.xml b/kde-frameworks/kguiaddons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kguiaddons/metadata.xml
+++ b/kde-frameworks/kguiaddons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/khtml/metadata.xml b/kde-frameworks/khtml/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/khtml/metadata.xml
+++ b/kde-frameworks/khtml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/ki18n/metadata.xml b/kde-frameworks/ki18n/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/ki18n/metadata.xml
+++ b/kde-frameworks/ki18n/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kiconthemes/metadata.xml b/kde-frameworks/kiconthemes/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kiconthemes/metadata.xml
+++ b/kde-frameworks/kiconthemes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kidletime/metadata.xml b/kde-frameworks/kidletime/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kidletime/metadata.xml
+++ b/kde-frameworks/kidletime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml
index 17fbdad41e81..05fa850fa775 100644
--- a/kde-frameworks/kimageformats/metadata.xml
+++ b/kde-frameworks/kimageformats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="eps">Support the EPS graphics file format</flag>
 	</use>
diff --git a/kde-frameworks/kinit/metadata.xml b/kde-frameworks/kinit/metadata.xml
index 0443c2819025..ac2c8a63f294 100644
--- a/kde-frameworks/kinit/metadata.xml
+++ b/kde-frameworks/kinit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="caps">Capabilities support for improved security and better OOM handling</flag>
 		<flag name="man">Build and install man pages</flag>
diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml
index 570e533a0005..5907c83648c6 100644
--- a/kde-frameworks/kio/metadata.xml
+++ b/kde-frameworks/kio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag>
 	</use>
diff --git a/kde-frameworks/kitemmodels/metadata.xml b/kde-frameworks/kitemmodels/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kitemmodels/metadata.xml
+++ b/kde-frameworks/kitemmodels/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kitemviews/metadata.xml b/kde-frameworks/kitemviews/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kitemviews/metadata.xml
+++ b/kde-frameworks/kitemviews/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kjobwidgets/metadata.xml b/kde-frameworks/kjobwidgets/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kjobwidgets/metadata.xml
+++ b/kde-frameworks/kjobwidgets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kjs/metadata.xml b/kde-frameworks/kjs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kjs/metadata.xml
+++ b/kde-frameworks/kjs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kjsembed/metadata.xml b/kde-frameworks/kjsembed/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kjsembed/metadata.xml
+++ b/kde-frameworks/kjsembed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kmediaplayer/metadata.xml b/kde-frameworks/kmediaplayer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kmediaplayer/metadata.xml
+++ b/kde-frameworks/kmediaplayer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/knewstuff/metadata.xml b/kde-frameworks/knewstuff/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/knewstuff/metadata.xml
+++ b/kde-frameworks/knewstuff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/knotifications/metadata.xml b/kde-frameworks/knotifications/metadata.xml
index b4731e0d589d..732e17a08a51 100644
--- a/kde-frameworks/knotifications/metadata.xml
+++ b/kde-frameworks/knotifications/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="speech">Enable text-to-speech notification support</flag>
 	</use>
diff --git a/kde-frameworks/knotifyconfig/metadata.xml b/kde-frameworks/knotifyconfig/metadata.xml
index f14d167972a3..2bf43c8621f2 100644
--- a/kde-frameworks/knotifyconfig/metadata.xml
+++ b/kde-frameworks/knotifyconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg></flag>
 	</use>
diff --git a/kde-frameworks/kpackage/metadata.xml b/kde-frameworks/kpackage/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kpackage/metadata.xml
+++ b/kde-frameworks/kpackage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kparts/metadata.xml b/kde-frameworks/kparts/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kparts/metadata.xml
+++ b/kde-frameworks/kparts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kpeople/metadata.xml b/kde-frameworks/kpeople/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kpeople/metadata.xml
+++ b/kde-frameworks/kpeople/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kplotting/metadata.xml b/kde-frameworks/kplotting/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kplotting/metadata.xml
+++ b/kde-frameworks/kplotting/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kpty/metadata.xml b/kde-frameworks/kpty/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kpty/metadata.xml
+++ b/kde-frameworks/kpty/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kross/metadata.xml b/kde-frameworks/kross/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kross/metadata.xml
+++ b/kde-frameworks/kross/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/krunner/metadata.xml b/kde-frameworks/krunner/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/krunner/metadata.xml
+++ b/kde-frameworks/krunner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kservice/metadata.xml b/kde-frameworks/kservice/metadata.xml
index 1f2159277e3c..d7c0ae21bc38 100644
--- a/kde-frameworks/kservice/metadata.xml
+++ b/kde-frameworks/kservice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="man">Build and install man pages</flag>
 	</use>
diff --git a/kde-frameworks/ktexteditor/metadata.xml b/kde-frameworks/ktexteditor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/ktexteditor/metadata.xml
+++ b/kde-frameworks/ktexteditor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/ktextwidgets/metadata.xml b/kde-frameworks/ktextwidgets/metadata.xml
index 014480abbaf5..acf612ceba2a 100644
--- a/kde-frameworks/ktextwidgets/metadata.xml
+++ b/kde-frameworks/ktextwidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
diff --git a/kde-frameworks/kunitconversion/metadata.xml b/kde-frameworks/kunitconversion/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kunitconversion/metadata.xml
+++ b/kde-frameworks/kunitconversion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kwallet/metadata.xml b/kde-frameworks/kwallet/metadata.xml
index fb195a9252ce..aba4eb1e6ad6 100644
--- a/kde-frameworks/kwallet/metadata.xml
+++ b/kde-frameworks/kwallet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gpg">Support wallets with GnuPG encryption in addition to the default blowfish-encrypted file</flag>
 	</use>
diff --git a/kde-frameworks/kwidgetsaddons/metadata.xml b/kde-frameworks/kwidgetsaddons/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kwidgetsaddons/metadata.xml
+++ b/kde-frameworks/kwidgetsaddons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kwindowsystem/metadata.xml b/kde-frameworks/kwindowsystem/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kwindowsystem/metadata.xml
+++ b/kde-frameworks/kwindowsystem/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/kxmlgui/metadata.xml b/kde-frameworks/kxmlgui/metadata.xml
index ae24b6749777..67022e50be75 100644
--- a/kde-frameworks/kxmlgui/metadata.xml
+++ b/kde-frameworks/kxmlgui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="attica">Enable support for <pkg>kde-frameworks/attica</pkg></flag>
 	</use>
diff --git a/kde-frameworks/kxmlrpcclient/metadata.xml b/kde-frameworks/kxmlrpcclient/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/kxmlrpcclient/metadata.xml
+++ b/kde-frameworks/kxmlrpcclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/modemmanager-qt/metadata.xml b/kde-frameworks/modemmanager-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/modemmanager-qt/metadata.xml
+++ b/kde-frameworks/modemmanager-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/networkmanager-qt/metadata.xml b/kde-frameworks/networkmanager-qt/metadata.xml
index 7aa99ba6cd6e..9f924047d4c1 100644
--- a/kde-frameworks/networkmanager-qt/metadata.xml
+++ b/kde-frameworks/networkmanager-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="teamd">Enable Teamd control support</flag>
 	</use>
diff --git a/kde-frameworks/oxygen-icons/metadata.xml b/kde-frameworks/oxygen-icons/metadata.xml
index e1c2ea15d6b2..e756a0d9c66f 100644
--- a/kde-frameworks/oxygen-icons/metadata.xml
+++ b/kde-frameworks/oxygen-icons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="sources">Additionally install the svg sources of the bitmap icons (needed for redistribution)</flag>
 	</use>
diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml
index 4c736d55c39e..a624f1942209 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
diff --git a/kde-frameworks/solid/metadata.xml b/kde-frameworks/solid/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/solid/metadata.xml
+++ b/kde-frameworks/solid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-frameworks/sonnet/metadata.xml b/kde-frameworks/sonnet/metadata.xml
index e95d265d90ac..ddfe1711a6a3 100644
--- a/kde-frameworks/sonnet/metadata.xml
+++ b/kde-frameworks/sonnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="aspell">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
diff --git a/kde-frameworks/threadweaver/metadata.xml b/kde-frameworks/threadweaver/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-frameworks/threadweaver/metadata.xml
+++ b/kde-frameworks/threadweaver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/about-distro/metadata.xml b/kde-misc/about-distro/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/about-distro/metadata.xml
+++ b/kde-misc/about-distro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/adjustableclock/metadata.xml b/kde-misc/adjustableclock/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/adjustableclock/metadata.xml
+++ b/kde-misc/adjustableclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/akonadi-facebook/metadata.xml b/kde-misc/akonadi-facebook/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/akonadi-facebook/metadata.xml
+++ b/kde-misc/akonadi-facebook/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/akonadi-git-resource/metadata.xml b/kde-misc/akonadi-git-resource/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/akonadi-git-resource/metadata.xml
+++ b/kde-misc/akonadi-git-resource/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/baloo-kcmadv/metadata.xml b/kde-misc/baloo-kcmadv/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/baloo-kcmadv/metadata.xml
+++ b/kde-misc/baloo-kcmadv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/basket/metadata.xml
+++ b/kde-misc/basket/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/bkodama/metadata.xml b/kde-misc/bkodama/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/bkodama/metadata.xml
+++ b/kde-misc/bkodama/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/chromi/metadata.xml b/kde-misc/chromi/metadata.xml
index ac2f0fc7038a..a7cb83f67cbd 100644
--- a/kde-misc/chromi/metadata.xml
+++ b/kde-misc/chromi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jinliu/kwin-deco-chromi</remote-id>
 	</upstream>
diff --git a/kde-misc/colibri/metadata.xml b/kde-misc/colibri/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/colibri/metadata.xml
+++ b/kde-misc/colibri/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/colord-kde/metadata.xml b/kde-misc/colord-kde/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/colord-kde/metadata.xml
+++ b/kde-misc/colord-kde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/commandwatch/metadata.xml b/kde-misc/commandwatch/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/commandwatch/metadata.xml
+++ b/kde-misc/commandwatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/cpuload/metadata.xml b/kde-misc/cpuload/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/cpuload/metadata.xml
+++ b/kde-misc/cpuload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/customizable-weather/metadata.xml b/kde-misc/customizable-weather/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/customizable-weather/metadata.xml
+++ b/kde-misc/customizable-weather/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/drop2ftp/metadata.xml b/kde-misc/drop2ftp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/drop2ftp/metadata.xml
+++ b/kde-misc/drop2ftp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/emerging-plasmoid/metadata.xml b/kde-misc/emerging-plasmoid/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/emerging-plasmoid/metadata.xml
+++ b/kde-misc/emerging-plasmoid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/eventlist/metadata.xml b/kde-misc/eventlist/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/eventlist/metadata.xml
+++ b/kde-misc/eventlist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/eyesaver/metadata.xml b/kde-misc/eyesaver/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/eyesaver/metadata.xml
+++ b/kde-misc/eyesaver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/fancytasks/metadata.xml b/kde-misc/fancytasks/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/fancytasks/metadata.xml
+++ b/kde-misc/fancytasks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/fsrunner/metadata.xml b/kde-misc/fsrunner/metadata.xml
index 56a0134808c8..eda25632acc7 100644
--- a/kde-misc/fsrunner/metadata.xml
+++ b/kde-misc/fsrunner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">fsrunner</remote-id>
 		<bugs-to>https://code.google.com/p/fsrunner/issues</bugs-to>
diff --git a/kde-misc/geekclock/metadata.xml b/kde-misc/geekclock/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/geekclock/metadata.xml
+++ b/kde-misc/geekclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/gx-mail-notify/metadata.xml b/kde-misc/gx-mail-notify/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/gx-mail-notify/metadata.xml
+++ b/kde-misc/gx-mail-notify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/hdaps_monitor/metadata.xml b/kde-misc/hdaps_monitor/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/hdaps_monitor/metadata.xml
+++ b/kde-misc/hdaps_monitor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/homerun/metadata.xml b/kde-misc/homerun/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/homerun/metadata.xml
+++ b/kde-misc/homerun/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kanyremote/metadata.xml b/kde-misc/kanyremote/metadata.xml
index 82648daa075b..518cc15f9774 100644
--- a/kde-misc/kanyremote/metadata.xml
+++ b/kde-misc/kanyremote/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">anyremote</remote-id>
 	</upstream>
diff --git a/kde-misc/katelatexplugin/metadata.xml b/kde-misc/katelatexplugin/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/katelatexplugin/metadata.xml
+++ b/kde-misc/katelatexplugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kbiff/metadata.xml b/kde-misc/kbiff/metadata.xml
index b87909ae23df..781ca3ef5eb4 100644
--- a/kde-misc/kbiff/metadata.xml
+++ b/kde-misc/kbiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">kbiff</remote-id>
   </upstream>
diff --git a/kde-misc/kbstateapplet/metadata.xml b/kde-misc/kbstateapplet/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kbstateapplet/metadata.xml
+++ b/kde-misc/kbstateapplet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kcaldav/metadata.xml b/kde-misc/kcaldav/metadata.xml
index 98ce4411b6a1..b371801124f8 100644
--- a/kde-misc/kcaldav/metadata.xml
+++ b/kde-misc/kcaldav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">kcaldav</remote-id>
 	</upstream>
diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml
index ce992e4c1c9e..44a86b8fd65e 100644
--- a/kde-misc/kcm-grub2/metadata.xml
+++ b/kde-misc/kcm-grub2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>thev00d00@gentoo.org</email>
 		<name>Ian Whyman</name>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="imagemagick">Create splash images compatible with GRUB2</flag>
 		<flag name="hwinfo">Used to work out supported framebuffer resolutions</flag>
diff --git a/kde-misc/kcm-touchpad/metadata.xml b/kde-misc/kcm-touchpad/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kcm-touchpad/metadata.xml
+++ b/kde-misc/kcm-touchpad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kcm-ufw/metadata.xml b/kde-misc/kcm-ufw/metadata.xml
index 87c94322d47d..fe5c3e1b8a6f 100644
--- a/kde-misc/kcm-ufw/metadata.xml
+++ b/kde-misc/kcm-ufw/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>thev00d00@gentoo.org</email>
 		<name>Ian Whyman</name>
 	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kcollectd/metadata.xml b/kde-misc/kcollectd/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kcollectd/metadata.xml
+++ b/kde-misc/kcollectd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kcometen4/metadata.xml b/kde-misc/kcometen4/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kcometen4/metadata.xml
+++ b/kde-misc/kcometen4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kde-gtk-config/metadata.xml b/kde-misc/kde-gtk-config/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kde-gtk-config/metadata.xml
+++ b/kde-misc/kde-gtk-config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kdeconnect/metadata.xml
+++ b/kde-misc/kdeconnect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kdesudo/metadata.xml b/kde-misc/kdesudo/metadata.xml
index 4212dbe7f9de..2c944aea9cde 100644
--- a/kde-misc/kdesudo/metadata.xml
+++ b/kde-misc/kdesudo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">kdesudo</remote-id>
 	</upstream>
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index c107fb34862c..c5cfadf184f0 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kdiff3</remote-id>
 	</upstream>
diff --git a/kde-misc/kdirstat/metadata.xml b/kde-misc/kdirstat/metadata.xml
index f9265fe6d7bf..bd8109dd8016 100644
--- a/kde-misc/kdirstat/metadata.xml
+++ b/kde-misc/kdirstat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">jeromerobert/k4dirstat</remote-id>
 	</upstream>
diff --git a/kde-misc/kdmthemegenerator/metadata.xml b/kde-misc/kdmthemegenerator/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kdmthemegenerator/metadata.xml
+++ b/kde-misc/kdmthemegenerator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kepas/metadata.xml b/kde-misc/kepas/metadata.xml
index 9f2a305b81da..b56561ddab3c 100644
--- a/kde-misc/kepas/metadata.xml
+++ b/kde-misc/kepas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="oscar">Enables ICQ (AIM) support.</flag>
 	</use>
diff --git a/kde-misc/kfilebox/metadata.xml b/kde-misc/kfilebox/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kfilebox/metadata.xml
+++ b/kde-misc/kfilebox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kgrubeditor/metadata.xml b/kde-misc/kgrubeditor/metadata.xml
index 5b9ae4ecdbb6..4a6f1b04f60d 100644
--- a/kde-misc/kgrubeditor/metadata.xml
+++ b/kde-misc/kgrubeditor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/kde-misc/kgtk/metadata.xml b/kde-misc/kgtk/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/kde-misc/kgtk/metadata.xml
+++ b/kde-misc/kgtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kim4/metadata.xml b/kde-misc/kim4/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kim4/metadata.xml
+++ b/kde-misc/kim4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kimtoy/metadata.xml b/kde-misc/kimtoy/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kimtoy/metadata.xml
+++ b/kde-misc/kimtoy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kio-ftps/metadata.xml b/kde-misc/kio-ftps/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kio-ftps/metadata.xml
+++ b/kde-misc/kio-ftps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kio-locate/metadata.xml b/kde-misc/kio-locate/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kio-locate/metadata.xml
+++ b/kde-misc/kio-locate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kio-mtp/metadata.xml b/kde-misc/kio-mtp/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kio-mtp/metadata.xml
+++ b/kde-misc/kio-mtp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kio-slp/metadata.xml b/kde-misc/kio-slp/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kio-slp/metadata.xml
+++ b/kde-misc/kio-slp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kio_gopher/metadata.xml b/kde-misc/kio_gopher/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kio_gopher/metadata.xml
+++ b/kde-misc/kio_gopher/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kolor-manager/metadata.xml b/kde-misc/kolor-manager/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kolor-manager/metadata.xml
+++ b/kde-misc/kolor-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/konstruktor/metadata.xml b/kde-misc/konstruktor/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/konstruktor/metadata.xml
+++ b/kde-misc/konstruktor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kookie/metadata.xml b/kde-misc/kookie/metadata.xml
index 54ff45f655d8..700125df8654 100644
--- a/kde-misc/kookie/metadata.xml
+++ b/kde-misc/kookie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kookie</remote-id>
 	</upstream>
diff --git a/kde-misc/kopete-antispam/metadata.xml b/kde-misc/kopete-antispam/metadata.xml
index 7d49ccfdab87..887f8d7ccf2f 100644
--- a/kde-misc/kopete-antispam/metadata.xml
+++ b/kde-misc/kopete-antispam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kopeteantispam</remote-id>
 	</upstream>
diff --git a/kde-misc/kopete-thinklight/metadata.xml b/kde-misc/kopete-thinklight/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kopete-thinklight/metadata.xml
+++ b/kde-misc/kopete-thinklight/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kosd/metadata.xml b/kde-misc/kosd/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kosd/metadata.xml
+++ b/kde-misc/kosd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kover/metadata.xml b/kde-misc/kover/metadata.xml
index 433ba54c3b41..e7d91b60316a 100644
--- a/kde-misc/kover/metadata.xml
+++ b/kde-misc/kover/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
 <maintainer>
 <email>creffett@gentoo.org</email>
 <name>Chris Reffett</name>
 </maintainer>
+<maintainer>
+<email>kde@gentoo.org</email>
+<name>Gentoo KDE Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/kde-misc/kprayertime/metadata.xml b/kde-misc/kprayertime/metadata.xml
index ab33a90f4495..729ad5f0f73e 100644
--- a/kde-misc/kprayertime/metadata.xml
+++ b/kde-misc/kprayertime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kprayertime</remote-id>
 	</upstream>
diff --git a/kde-misc/kraidmonitor/metadata.xml b/kde-misc/kraidmonitor/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kraidmonitor/metadata.xml
+++ b/kde-misc/kraidmonitor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/krcstat/metadata.xml b/kde-misc/krcstat/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/krcstat/metadata.xml
+++ b/kde-misc/krcstat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/krecipes/metadata.xml b/kde-misc/krecipes/metadata.xml
index e62e47f9cf90..8b23cefa2f72 100644
--- a/kde-misc/krecipes/metadata.xml
+++ b/kde-misc/krecipes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">krecipes</remote-id>
 	</upstream>
diff --git a/kde-misc/krename/metadata.xml b/kde-misc/krename/metadata.xml
index 2110fbb8f129..c234b7459200 100644
--- a/kde-misc/krename/metadata.xml
+++ b/kde-misc/krename/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">krename</remote-id>
 	</upstream>
diff --git a/kde-misc/krunner-googletranslate/metadata.xml b/kde-misc/krunner-googletranslate/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/krunner-googletranslate/metadata.xml
+++ b/kde-misc/krunner-googletranslate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/krunner-kopete-contacts/metadata.xml b/kde-misc/krunner-kopete-contacts/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/krunner-kopete-contacts/metadata.xml
+++ b/kde-misc/krunner-kopete-contacts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index 7aa832adb065..57c534ef621a 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="bookmarks">Add dependency on bookmark package.</flag>
 	</use>
diff --git a/kde-misc/kscreen/metadata.xml b/kde-misc/kscreen/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kscreen/metadata.xml
+++ b/kde-misc/kscreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kshutdown/metadata.xml b/kde-misc/kshutdown/metadata.xml
index 697701d70f68..c4eedb194e30 100644
--- a/kde-misc/kshutdown/metadata.xml
+++ b/kde-misc/kshutdown/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kshutdown</remote-id>
 	</upstream>
diff --git a/kde-misc/ksplasher/metadata.xml b/kde-misc/ksplasher/metadata.xml
index 5302f24179c3..5bffbfe2debf 100644
--- a/kde-misc/ksplasher/metadata.xml
+++ b/kde-misc/ksplasher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ksplasher</remote-id>
 	</upstream>
diff --git a/kde-misc/kte-collaborative/metadata.xml b/kde-misc/kte-collaborative/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kte-collaborative/metadata.xml
+++ b/kde-misc/kte-collaborative/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/ktrafficanalyzer/metadata.xml b/kde-misc/ktrafficanalyzer/metadata.xml
index 47016b43b627..535f8f2634bf 100644
--- a/kde-misc/ktrafficanalyzer/metadata.xml
+++ b/kde-misc/ktrafficanalyzer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ktrafficanalyze</remote-id>
 	</upstream>
diff --git a/kde-misc/kvkbd/metadata.xml b/kde-misc/kvkbd/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/kvkbd/metadata.xml
+++ b/kde-misc/kvkbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/kwebkitpart/metadata.xml b/kde-misc/kwebkitpart/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/kwebkitpart/metadata.xml
+++ b/kde-misc/kwebkitpart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/milou/metadata.xml b/kde-misc/milou/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/milou/metadata.xml
+++ b/kde-misc/milou/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/miniplayer/metadata.xml b/kde-misc/miniplayer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/miniplayer/metadata.xml
+++ b/kde-misc/miniplayer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/networkmanagement/metadata.xml b/kde-misc/networkmanagement/metadata.xml
index c10c9320b889..76bba1c110ce 100644
--- a/kde-misc/networkmanagement/metadata.xml
+++ b/kde-misc/networkmanagement/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
 </use>
diff --git a/kde-misc/nightmode/metadata.xml b/kde-misc/nightmode/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/nightmode/metadata.xml
+++ b/kde-misc/nightmode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/nvdevmon/metadata.xml b/kde-misc/nvdevmon/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/nvdevmon/metadata.xml
+++ b/kde-misc/nvdevmon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/openofficeorg-thumbnail/metadata.xml b/kde-misc/openofficeorg-thumbnail/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/openofficeorg-thumbnail/metadata.xml
+++ b/kde-misc/openofficeorg-thumbnail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-applet-daisy/metadata.xml b/kde-misc/plasma-applet-daisy/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/plasma-applet-daisy/metadata.xml
+++ b/kde-misc/plasma-applet-daisy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-emergelog/metadata.xml b/kde-misc/plasma-emergelog/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasma-emergelog/metadata.xml
+++ b/kde-misc/plasma-emergelog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-lionmail/metadata.xml b/kde-misc/plasma-lionmail/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/plasma-lionmail/metadata.xml
+++ b/kde-misc/plasma-lionmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-mpd-nowplaying/metadata.xml b/kde-misc/plasma-mpd-nowplaying/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasma-mpd-nowplaying/metadata.xml
+++ b/kde-misc/plasma-mpd-nowplaying/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-network-status/metadata.xml b/kde-misc/plasma-network-status/metadata.xml
index 12e82554b062..54f9644db0b2 100644
--- a/kde-misc/plasma-network-status/metadata.xml
+++ b/kde-misc/plasma-network-status/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pa-net-stat</remote-id>
 	</upstream>
diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml
index 6b5b847f2869..43c74405b528 100644
--- a/kde-misc/plasma-nm/metadata.xml
+++ b/kde-misc/plasma-nm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
diff --git a/kde-misc/plasma-photooftheday/metadata.xml b/kde-misc/plasma-photooftheday/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasma-photooftheday/metadata.xml
+++ b/kde-misc/plasma-photooftheday/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasma-widget-menubar/metadata.xml b/kde-misc/plasma-widget-menubar/metadata.xml
index 265fc5dd8cfe..0e19e93e852a 100644
--- a/kde-misc/plasma-widget-menubar/metadata.xml
+++ b/kde-misc/plasma-widget-menubar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">plasma-widget-menubar</remote-id>
 	</upstream>
diff --git a/kde-misc/plasma-widget-message-indicator/metadata.xml b/kde-misc/plasma-widget-message-indicator/metadata.xml
index bdc6a3ada244..74a52c7e0e7b 100644
--- a/kde-misc/plasma-widget-message-indicator/metadata.xml
+++ b/kde-misc/plasma-widget-message-indicator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">plasma-widget-message-indicator</remote-id>
 	</upstream>
diff --git a/kde-misc/plasma-wifi/metadata.xml b/kde-misc/plasma-wifi/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasma-wifi/metadata.xml
+++ b/kde-misc/plasma-wifi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasmatvgr/metadata.xml b/kde-misc/plasmatvgr/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasmatvgr/metadata.xml
+++ b/kde-misc/plasmatvgr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/plasmoid-workflow/metadata.xml b/kde-misc/plasmoid-workflow/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/plasmoid-workflow/metadata.xml
+++ b/kde-misc/plasmoid-workflow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/pyrad/metadata.xml b/kde-misc/pyrad/metadata.xml
index ca462769a28d..f9720ce0346e 100644
--- a/kde-misc/pyrad/metadata.xml
+++ b/kde-misc/pyrad/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arne_bab@web.de</email>
 		<name>Arne Babenhauserheide</name>
 	</maintainer>
-	<herd>kde</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyRadKDE</remote-id>
 		<remote-id type="bitbucket">ArneBab/pyrad</remote-id>
diff --git a/kde-misc/quadkonsole/metadata.xml b/kde-misc/quadkonsole/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/quadkonsole/metadata.xml
+++ b/kde-misc/quadkonsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/quickaccess/metadata.xml b/kde-misc/quickaccess/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/quickaccess/metadata.xml
+++ b/kde-misc/quickaccess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/redshift-plasmoid/metadata.xml b/kde-misc/redshift-plasmoid/metadata.xml
index e0b12d053b5c..e800b74d1583 100644
--- a/kde-misc/redshift-plasmoid/metadata.xml
+++ b/kde-misc/redshift-plasmoid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">simgunz/redshift-plasmoid</remote-id>
 	</upstream>
diff --git a/kde-misc/rsibreak/metadata.xml b/kde-misc/rsibreak/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/rsibreak/metadata.xml
+++ b/kde-misc/rsibreak/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/semantik/metadata.xml b/kde-misc/semantik/metadata.xml
index 846e4f053a29..c8fc105a11c4 100644
--- a/kde-misc/semantik/metadata.xml
+++ b/kde-misc/semantik/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">semantik</remote-id>
 	</upstream>
diff --git a/kde-misc/serverstatuswidget/metadata.xml b/kde-misc/serverstatuswidget/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/kde-misc/serverstatuswidget/metadata.xml
+++ b/kde-misc/serverstatuswidget/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/kde-misc/skanlite/metadata.xml b/kde-misc/skanlite/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/skanlite/metadata.xml
+++ b/kde-misc/skanlite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/smooth-tasks/metadata.xml b/kde-misc/smooth-tasks/metadata.xml
index f2ec79e9c9a0..b4f5d727caa3 100644
--- a/kde-misc/smooth-tasks/metadata.xml
+++ b/kde-misc/smooth-tasks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">flupp/smooth-tasks-fork</remote-id>
 	</upstream>
diff --git a/kde-misc/stdin-plasmoid/metadata.xml b/kde-misc/stdin-plasmoid/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/stdin-plasmoid/metadata.xml
+++ b/kde-misc/stdin-plasmoid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/steamcompanion/metadata.xml b/kde-misc/steamcompanion/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/steamcompanion/metadata.xml
+++ b/kde-misc/steamcompanion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/stock-quote/metadata.xml b/kde-misc/stock-quote/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/stock-quote/metadata.xml
+++ b/kde-misc/stock-quote/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/synaptiks/metadata.xml b/kde-misc/synaptiks/metadata.xml
index 8a9a4c524671..7c720af3deb0 100644
--- a/kde-misc/synaptiks/metadata.xml
+++ b/kde-misc/synaptiks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">synaptiks</remote-id>
 	</upstream>
diff --git a/kde-misc/systemd-kcm/metadata.xml b/kde-misc/systemd-kcm/metadata.xml
index e1c5ce14a10f..715e661acd1d 100644
--- a/kde-misc/systemd-kcm/metadata.xml
+++ b/kde-misc/systemd-kcm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 KDE control module for systemd. Provides a graphical frontend for the systemd daemon, which allows to view and control systemd units, as well as modifying configuration files. Integrates in the KDE System Settings dialogue.
 	</longdescription>
diff --git a/kde-misc/takeoff/metadata.xml b/kde-misc/takeoff/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/kde-misc/takeoff/metadata.xml
+++ b/kde-misc/takeoff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/kde-misc/tellico/metadata.xml b/kde-misc/tellico/metadata.xml
index e7a59e769b63..6b6d63d051df 100644
--- a/kde-misc/tellico/metadata.xml
+++ b/kde-misc/tellico/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Tellico is a KDE application for organizing your collections. It provides
 		default templates for books, bibliographies, videos, music, video games, coins,
diff --git a/kde-misc/wacomtablet/metadata.xml b/kde-misc/wacomtablet/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/wacomtablet/metadata.xml
+++ b/kde-misc/wacomtablet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/wicd-client-kde/metadata.xml b/kde-misc/wicd-client-kde/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/kde-misc/wicd-client-kde/metadata.xml
+++ b/kde-misc/wicd-client-kde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/yakuake/metadata.xml b/kde-misc/yakuake/metadata.xml
index 5fec123565c2..db8ff73170eb 100644
--- a/kde-misc/yakuake/metadata.xml
+++ b/kde-misc/yakuake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <longdescription>
     YaKuake is Yet Another Kuake KDE terminal emulator. It drops down no a
 	configurable key press (defaults to F12) with a konsole window, supports
diff --git a/kde-misc/yawp/metadata.xml b/kde-misc/yawp/metadata.xml
index 86089b1888c7..676981fb7e8d 100644
--- a/kde-misc/yawp/metadata.xml
+++ b/kde-misc/yawp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yawp</remote-id>
 	</upstream>
diff --git a/kde-misc/zanshin/metadata.xml b/kde-misc/zanshin/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-misc/zanshin/metadata.xml
+++ b/kde-misc/zanshin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/bluedevil/metadata.xml b/kde-plasma/bluedevil/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/bluedevil/metadata.xml
+++ b/kde-plasma/bluedevil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/breeze-gtk/metadata.xml b/kde-plasma/breeze-gtk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/breeze-gtk/metadata.xml
+++ b/kde-plasma/breeze-gtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/breeze/metadata.xml
+++ b/kde-plasma/breeze/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kde-cli-tools/metadata.xml b/kde-plasma/kde-cli-tools/metadata.xml
index b1b2963289f9..a923fcf2a45b 100644
--- a/kde-plasma/kde-cli-tools/metadata.xml
+++ b/kde-plasma/kde-cli-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag>
 	</use>
diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml
index b277fb640b42..7ef86bc6df0c 100644
--- a/kde-plasma/kde-gtk-config/metadata.xml
+++ b/kde-plasma/kde-gtk-config/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gtk3">Add support for gtk+3-based applications.</flag>
 	</use>
diff --git a/kde-plasma/kdecoration/metadata.xml b/kde-plasma/kdecoration/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kdecoration/metadata.xml
+++ b/kde-plasma/kdecoration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index d5355951ca1c..880cf456e55b 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
diff --git a/kde-plasma/kgamma/metadata.xml b/kde-plasma/kgamma/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kgamma/metadata.xml
+++ b/kde-plasma/kgamma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/khelpcenter/metadata.xml b/kde-plasma/khelpcenter/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/khelpcenter/metadata.xml
+++ b/kde-plasma/khelpcenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/khotkeys/metadata.xml b/kde-plasma/khotkeys/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/khotkeys/metadata.xml
+++ b/kde-plasma/khotkeys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml
index 99dbac6bf0d7..b3887a0b7a3c 100644
--- a/kde-plasma/kinfocenter/metadata.xml
+++ b/kde-plasma/kinfocenter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Retrieve information about OpenGL via EGL</flag>
 		<flag name="gles">Show OpenGL ES information in kinfocenter</flag>
diff --git a/kde-plasma/kmenuedit/metadata.xml b/kde-plasma/kmenuedit/metadata.xml
index b5928c371d7a..f2b00470b226 100644
--- a/kde-plasma/kmenuedit/metadata.xml
+++ b/kde-plasma/kmenuedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="hotkeys">Enable support for hotkey editing</flag>
 	</use>
diff --git a/kde-plasma/kscreen/metadata.xml b/kde-plasma/kscreen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kscreen/metadata.xml
+++ b/kde-plasma/kscreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 22390bfb18d6..aebbe3d37225 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/ksshaskpass/metadata.xml b/kde-plasma/ksshaskpass/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/ksshaskpass/metadata.xml
+++ b/kde-plasma/ksshaskpass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kwallet-pam/metadata.xml
+++ b/kde-plasma/kwallet-pam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kwayland-integration/metadata.xml b/kde-plasma/kwayland-integration/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kwayland-integration/metadata.xml
+++ b/kde-plasma/kwayland-integration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kwayland/metadata.xml b/kde-plasma/kwayland/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kwayland/metadata.xml
+++ b/kde-plasma/kwayland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 843ec221aa5f..417e3cfd7b28 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
 		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
diff --git a/kde-plasma/kwrited/metadata.xml b/kde-plasma/kwrited/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/kwrited/metadata.xml
+++ b/kde-plasma/kwrited/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/libkscreen/metadata.xml b/kde-plasma/libkscreen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/libkscreen/metadata.xml
+++ b/kde-plasma/libkscreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 076395a49371..03c68351235f 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="processui">Enables the Interface to view process libs.</flag>
 		<flag name="detailedmemory">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
diff --git a/kde-plasma/milou/metadata.xml b/kde-plasma/milou/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/milou/metadata.xml
+++ b/kde-plasma/milou/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/oxygen-fonts/metadata.xml b/kde-plasma/oxygen-fonts/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/oxygen-fonts/metadata.xml
+++ b/kde-plasma/oxygen-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/oxygen/metadata.xml b/kde-plasma/oxygen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/oxygen/metadata.xml
+++ b/kde-plasma/oxygen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index fc5d9f185a52..ed84b4acdb73 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="evdev">Enable configuration module for desktop input devices.</flag>
 		<flag name="gtk2">Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.</flag>
diff --git a/kde-plasma/plasma-mediacenter/metadata.xml b/kde-plasma/plasma-mediacenter/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/plasma-mediacenter/metadata.xml
+++ b/kde-plasma/plasma-mediacenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index ae0907f3a8de..eefd9c70d55c 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="display-manager">Pull in a graphical display manager</flag>
 		<flag name="mediacenter">Pull in <pkg>kde-plasma/plasma-mediacenter</pkg></flag>
diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml
index 5229b13d5ca0..c20072acc1bb 100644
--- a/kde-plasma/plasma-nm/metadata.xml
+++ b/kde-plasma/plasma-nm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
diff --git a/kde-plasma/plasma-pa/metadata.xml b/kde-plasma/plasma-pa/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/plasma-pa/metadata.xml
+++ b/kde-plasma/plasma-pa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-sdk/metadata.xml b/kde-plasma/plasma-sdk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/plasma-sdk/metadata.xml
+++ b/kde-plasma/plasma-sdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace-wallpapers/metadata.xml b/kde-plasma/plasma-workspace-wallpapers/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/plasma-workspace-wallpapers/metadata.xml
+++ b/kde-plasma/plasma-workspace-wallpapers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index f81610b0968b..3a8ca66a0b6e 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="drkonqi">Enables DrKonqi, the KDE crash handler</flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
diff --git a/kde-plasma/polkit-kde-agent/metadata.xml b/kde-plasma/polkit-kde-agent/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/polkit-kde-agent/metadata.xml
+++ b/kde-plasma/polkit-kde-agent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/sddm-kcm/metadata.xml b/kde-plasma/sddm-kcm/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/sddm-kcm/metadata.xml
+++ b/kde-plasma/sddm-kcm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml
index 5aac27d8fc42..4023f80c7d16 100644
--- a/kde-plasma/systemsettings/metadata.xml
+++ b/kde-plasma/systemsettings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="classic">Enable classic mode plugin, requires <pkg>kde-frameworks/khtml</pkg></flag>
 	</use>
diff --git a/kde-plasma/user-manager/metadata.xml b/kde-plasma/user-manager/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/kde-plasma/user-manager/metadata.xml
+++ b/kde-plasma/user-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxde-base/lxappearance-obconf/metadata.xml b/lxde-base/lxappearance-obconf/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxappearance-obconf/metadata.xml
+++ b/lxde-base/lxappearance-obconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxappearance/metadata.xml b/lxde-base/lxappearance/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxappearance/metadata.xml
+++ b/lxde-base/lxappearance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxde-common/metadata.xml b/lxde-base/lxde-common/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxde-common/metadata.xml
+++ b/lxde-base/lxde-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxde-icon-theme/metadata.xml b/lxde-base/lxde-icon-theme/metadata.xml
index 4c465c546c7f..82f2153ab064 100644
--- a/lxde-base/lxde-icon-theme/metadata.xml
+++ b/lxde-base/lxde-icon-theme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lxde</herd>
+	<maintainer>
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
 	</upstream>
diff --git a/lxde-base/lxde-meta/metadata.xml b/lxde-base/lxde-meta/metadata.xml
index 34a29015776f..57d9d4fb7b29 100644
--- a/lxde-base/lxde-meta/metadata.xml
+++ b/lxde-base/lxde-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
index 76c9155f289f..c80a8f739d39 100644
--- a/lxde-base/lxdm/metadata.xml
+++ b/lxde-base/lxdm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lxde</herd>
+	<maintainer>
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="consolekit">Enables support for authorization using consolekit</flag>
 		<flag name="gtk3">Use GTK+3 instead of 2</flag>
diff --git a/lxde-base/lxinput/metadata.xml b/lxde-base/lxinput/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxinput/metadata.xml
+++ b/lxde-base/lxinput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxlauncher/metadata.xml b/lxde-base/lxlauncher/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxlauncher/metadata.xml
+++ b/lxde-base/lxlauncher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxmenu-data/metadata.xml b/lxde-base/lxmenu-data/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxmenu-data/metadata.xml
+++ b/lxde-base/lxmenu-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxpanel/metadata.xml b/lxde-base/lxpanel/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxpanel/metadata.xml
+++ b/lxde-base/lxpanel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxpolkit/metadata.xml b/lxde-base/lxpolkit/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxpolkit/metadata.xml
+++ b/lxde-base/lxpolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxrandr/metadata.xml b/lxde-base/lxrandr/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxrandr/metadata.xml
+++ b/lxde-base/lxrandr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxsession-edit/metadata.xml b/lxde-base/lxsession-edit/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxsession-edit/metadata.xml
+++ b/lxde-base/lxsession-edit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxsession/metadata.xml
+++ b/lxde-base/lxsession/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxshortcut/metadata.xml b/lxde-base/lxshortcut/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxshortcut/metadata.xml
+++ b/lxde-base/lxshortcut/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxtask/metadata.xml b/lxde-base/lxtask/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxtask/metadata.xml
+++ b/lxde-base/lxtask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/lxterminal/metadata.xml b/lxde-base/lxterminal/metadata.xml
index 831327e101a9..3ecff7ed0e38 100644
--- a/lxde-base/lxterminal/metadata.xml
+++ b/lxde-base/lxterminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxde-base/menu-cache/metadata.xml b/lxde-base/menu-cache/metadata.xml
index bac59be2e08a..e971a56188d4 100644
--- a/lxde-base/menu-cache/metadata.xml
+++ b/lxde-base/menu-cache/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
-  <herd>lxqt</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
   </upstream>
diff --git a/lxqt-base/liblxqt-mount/metadata.xml b/lxqt-base/liblxqt-mount/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/liblxqt-mount/metadata.xml
+++ b/lxqt-base/liblxqt-mount/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/liblxqt/metadata.xml
+++ b/lxqt-base/liblxqt/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/libsysstat/metadata.xml b/lxqt-base/libsysstat/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/libsysstat/metadata.xml
+++ b/lxqt-base/libsysstat/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-about/metadata.xml b/lxqt-base/lxqt-about/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-about/metadata.xml
+++ b/lxqt-base/lxqt-about/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-admin/metadata.xml b/lxqt-base/lxqt-admin/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-admin/metadata.xml
+++ b/lxqt-base/lxqt-admin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-common/metadata.xml b/lxqt-base/lxqt-common/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-common/metadata.xml
+++ b/lxqt-base/lxqt-common/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-config-randr/metadata.xml b/lxqt-base/lxqt-config-randr/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-config-randr/metadata.xml
+++ b/lxqt-base/lxqt-config-randr/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-config/metadata.xml
+++ b/lxqt-base/lxqt-config/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml b/lxqt-base/lxqt-globalkeys/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-globalkeys/metadata.xml
+++ b/lxqt-base/lxqt-globalkeys/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 14f3ec8d6960..63f1671920ea 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <use>
     <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag>
     <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag>
diff --git a/lxqt-base/lxqt-notificationd/metadata.xml b/lxqt-base/lxqt-notificationd/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-notificationd/metadata.xml
+++ b/lxqt-base/lxqt-notificationd/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-openssh-askpass/metadata.xml
+++ b/lxqt-base/lxqt-openssh-askpass/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
index 0b16db70280f..e73adbf0b416 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <use>
     <flag name="clock">Build clock plugin</flag>
     <flag name="colorpicker">Build colorpicker plugin</flag>
diff --git a/lxqt-base/lxqt-policykit/metadata.xml b/lxqt-base/lxqt-policykit/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-policykit/metadata.xml
+++ b/lxqt-base/lxqt-policykit/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml b/lxqt-base/lxqt-powermanagement/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-powermanagement/metadata.xml
+++ b/lxqt-base/lxqt-powermanagement/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml b/lxqt-base/lxqt-qtplugin/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-qtplugin/metadata.xml
+++ b/lxqt-base/lxqt-qtplugin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-runner/metadata.xml b/lxqt-base/lxqt-runner/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-runner/metadata.xml
+++ b/lxqt-base/lxqt-runner/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-session/metadata.xml b/lxqt-base/lxqt-session/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/lxqt-base/lxqt-session/metadata.xml
+++ b/lxqt-base/lxqt-session/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-sudo/metadata.xml b/lxqt-base/lxqt-sudo/metadata.xml
index f988383841e1..afdc64c47517 100644
--- a/lxqt-base/lxqt-sudo/metadata.xml
+++ b/lxqt-base/lxqt-sudo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 554dd62b44eb..0d93de4485da 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="chappa">enhance alpine by applying Eduardo Chappa's
 			patches</flag>
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 8406e551eb55..07639f88151d 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="crypt">Adds support for GnuPG encryption</flag>
 		<flag name="gtkhtml">Use gtkhtml for HTML rendering</flag>
diff --git a/mail-client/biabam/metadata.xml b/mail-client/biabam/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/biabam/metadata.xml
+++ b/mail-client/biabam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-acpi-notifier/metadata.xml b/mail-client/claws-mail-acpi-notifier/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-acpi-notifier/metadata.xml
+++ b/mail-client/claws-mail-acpi-notifier/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-address_keeper/metadata.xml b/mail-client/claws-mail-address_keeper/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-address_keeper/metadata.xml
+++ b/mail-client/claws-mail-address_keeper/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-archive/metadata.xml b/mail-client/claws-mail-archive/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-archive/metadata.xml
+++ b/mail-client/claws-mail-archive/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-att-remover/metadata.xml b/mail-client/claws-mail-att-remover/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-att-remover/metadata.xml
+++ b/mail-client/claws-mail-att-remover/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-attachwarner/metadata.xml b/mail-client/claws-mail-attachwarner/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-attachwarner/metadata.xml
+++ b/mail-client/claws-mail-attachwarner/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-clamd/metadata.xml b/mail-client/claws-mail-clamd/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-clamd/metadata.xml
+++ b/mail-client/claws-mail-clamd/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-fancy/metadata.xml b/mail-client/claws-mail-fancy/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-fancy/metadata.xml
+++ b/mail-client/claws-mail-fancy/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-fetchinfo/metadata.xml b/mail-client/claws-mail-fetchinfo/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-fetchinfo/metadata.xml
+++ b/mail-client/claws-mail-fetchinfo/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-gdata/metadata.xml b/mail-client/claws-mail-gdata/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-gdata/metadata.xml
+++ b/mail-client/claws-mail-gdata/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-gtkhtml/metadata.xml b/mail-client/claws-mail-gtkhtml/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-gtkhtml/metadata.xml
+++ b/mail-client/claws-mail-gtkhtml/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-mailmbox/metadata.xml b/mail-client/claws-mail-mailmbox/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-mailmbox/metadata.xml
+++ b/mail-client/claws-mail-mailmbox/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-newmail/metadata.xml b/mail-client/claws-mail-newmail/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-newmail/metadata.xml
+++ b/mail-client/claws-mail-newmail/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-notification/metadata.xml b/mail-client/claws-mail-notification/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-notification/metadata.xml
+++ b/mail-client/claws-mail-notification/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-pdf-viewer/metadata.xml b/mail-client/claws-mail-pdf-viewer/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-pdf-viewer/metadata.xml
+++ b/mail-client/claws-mail-pdf-viewer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-perl/metadata.xml b/mail-client/claws-mail-perl/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-perl/metadata.xml
+++ b/mail-client/claws-mail-perl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-python/metadata.xml b/mail-client/claws-mail-python/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-python/metadata.xml
+++ b/mail-client/claws-mail-python/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-rssyl/metadata.xml b/mail-client/claws-mail-rssyl/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-rssyl/metadata.xml
+++ b/mail-client/claws-mail-rssyl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-spam-report/metadata.xml b/mail-client/claws-mail-spam-report/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-spam-report/metadata.xml
+++ b/mail-client/claws-mail-spam-report/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-tnef-parse/metadata.xml b/mail-client/claws-mail-tnef-parse/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-tnef-parse/metadata.xml
+++ b/mail-client/claws-mail-tnef-parse/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail-vcalendar/metadata.xml b/mail-client/claws-mail-vcalendar/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-vcalendar/metadata.xml
+++ b/mail-client/claws-mail-vcalendar/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index a129ca79ec50..ad8d0b941dae 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
 		<flag name="gdata">Enable plugin for access to Google
diff --git a/mail-client/clawsker/metadata.xml b/mail-client/clawsker/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/clawsker/metadata.xml
+++ b/mail-client/clawsker/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 	  <email>fauli@gentoo.org</email>
 	  <name>Christian Faulhammer</name>
 	</maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/cone/metadata.xml b/mail-client/cone/metadata.xml
index 5c974e7d457b..fb89de715acf 100644
--- a/mail-client/cone/metadata.xml
+++ b/mail-client/cone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">courier</remote-id>
 	</upstream>
diff --git a/mail-client/drac/metadata.xml b/mail-client/drac/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/drac/metadata.xml
+++ b/mail-client/drac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/etpan-ng/metadata.xml b/mail-client/etpan-ng/metadata.xml
index b2f66f193014..3b4532ab48f4 100644
--- a/mail-client/etpan-ng/metadata.xml
+++ b/mail-client/etpan-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>etPan is a console mail client that is based on libEtPan!</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">libetpan</remote-id>
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index cfd0a3170188..170bead645a4 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
 		<flag name="crypt">Enable GPG encryption support using
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/hap/metadata.xml b/mail-client/hap/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/hap/metadata.xml
+++ b/mail-client/hap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/mailx-support/metadata.xml
+++ b/mail-client/mailx-support/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/mailx/metadata.xml b/mail-client/mailx/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/mailx/metadata.xml
+++ b/mail-client/mailx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 435dba8c3546..66f737e73413 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>grobian@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
     <flag name="pop">Enable support for pop</flag>
diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
index cec2552c7b96..c23949faad70 100644
--- a/mail-client/nail/metadata.xml
+++ b/mail-client/nail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="net">
       Enable support for network protocols (POP, IMAP and SMTP). If you
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
index 7c09058dd0c2..0c62e021c340 100644
--- a/mail-client/nmh/metadata.xml
+++ b/mail-client/nmh/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>in-gentoo@baka.org</email>
 <name>Seth Robertson</name>
 <description>Maintainer</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/mail-client/pinepgp/metadata.xml b/mail-client/pinepgp/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/pinepgp/metadata.xml
+++ b/mail-client/pinepgp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index 4cb349a08b2c..70bb300d9e28 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">roundcubemail</remote-id>
 	</upstream>
diff --git a/mail-client/squirrelmail/metadata.xml b/mail-client/squirrelmail/metadata.xml
index 7d41afda0934..1e4ec650952d 100644
--- a/mail-client/squirrelmail/metadata.xml
+++ b/mail-client/squirrelmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="filter">Enable <pkg>mail-filter/amavisd-new</pkg>
 		filtering</flag>
diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
index a619498bd13f..3983b2191213 100644
--- a/mail-client/sylpheed/metadata.xml
+++ b/mail-client/sylpheed/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
   </use>
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
index 898de1be8c0f..207b5666e86a 100644
--- a/mail-client/thunderbird-bin/metadata.xml
+++ b/mail-client/thunderbird-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
 	<flag name="crashreporter">Enable crash reporter for bugs</flag>
 </use>
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 3121466c40e3..db5aad8606d9 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
 	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 4f9aa6a88e76..aa11543869cc 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>kde</herd>
 	<maintainer>
 		<email>jkt@gentoo.org</email>
 		<name>Jan Kundrát</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 	</use>
diff --git a/mail-filter/amavisd-milter/metadata.xml b/mail-filter/amavisd-milter/metadata.xml
index 00715a1e10f3..78fe48cdf048 100644
--- a/mail-filter/amavisd-milter/metadata.xml
+++ b/mail-filter/amavisd-milter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 2f0b51b14179..ab787678031b 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
-	<herd>antivirus</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<maintainer>
+		<email>antivirus@gentoo.org</email>
+		<name>Gentoo Antivirus Project</name>
+	</maintainer>
 	<use>
 		<flag name="courier">Add courier support</flag>
 		<flag name="dkim">Add DomainKeys Identified Mail support</flag>
diff --git a/mail-filter/anubis/metadata.xml b/mail-filter/anubis/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-filter/anubis/metadata.xml
+++ b/mail-filter/anubis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/ask/metadata.xml b/mail-filter/ask/metadata.xml
index 6e7a699e30a7..92fa72042472 100644
--- a/mail-filter/ask/metadata.xml
+++ b/mail-filter/ask/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="procmail">Adds support for
 		<pkg>mail-filter/procmail</pkg></flag>
diff --git a/mail-filter/bmf/metadata.xml b/mail-filter/bmf/metadata.xml
index 85b79b68dd90..36698ae88a35 100644
--- a/mail-filter/bmf/metadata.xml
+++ b/mail-filter/bmf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bmf</remote-id>
 	</upstream>
diff --git a/mail-filter/clamassassin/metadata.xml b/mail-filter/clamassassin/metadata.xml
index 888cbb2dcea4..b985df257034 100644
--- a/mail-filter/clamassassin/metadata.xml
+++ b/mail-filter/clamassassin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <use>
 	<flag name="clamd">Use the <pkg>app-antivirus/clamav</pkg> daemon for virus
 		checking</flag>
diff --git a/mail-filter/clamsmtp/metadata.xml b/mail-filter/clamsmtp/metadata.xml
index 798cf022ffdd..65eb995e4b71 100644
--- a/mail-filter/clamsmtp/metadata.xml
+++ b/mail-filter/clamsmtp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software. It accepts SMTP connections and forwards the SMTP commands and responses to another SMTP server. The 'DATA' email body is intercepted and scanned before forwarding.</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/couriersrs/metadata.xml b/mail-filter/couriersrs/metadata.xml
index b507dbb0fd19..06255150cdb3 100644
--- a/mail-filter/couriersrs/metadata.xml
+++ b/mail-filter/couriersrs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
 <maintainer><email>hanno@gentoo.org</email></maintainer>
+<maintainer>
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/dcc/metadata.xml b/mail-filter/dcc/metadata.xml
index 5b46a45ad9db..1c603d23de19 100644
--- a/mail-filter/dcc/metadata.xml
+++ b/mail-filter/dcc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <use>
 	<flag name="rrdtool">Enable <pkg>net-analyzer/rrdtool</pkg> interface
 		scripts</flag>
diff --git a/mail-filter/disspam/metadata.xml b/mail-filter/disspam/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-filter/disspam/metadata.xml
+++ b/mail-filter/disspam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/dovecot_deleted_to_trash/metadata.xml b/mail-filter/dovecot_deleted_to_trash/metadata.xml
index 357afc8de0a5..82b366e6ed8f 100644
--- a/mail-filter/dovecot_deleted_to_trash/metadata.xml
+++ b/mail-filter/dovecot_deleted_to_trash/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lexbrugman/dovecot_deleted_to_trash</remote-id>
 	</upstream>
diff --git a/mail-filter/dspam/metadata.xml b/mail-filter/dspam/metadata.xml
index a8b33acb2055..b2a4dbfa5944 100644
--- a/mail-filter/dspam/metadata.xml
+++ b/mail-filter/dspam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>A statistical-algorithmic hybrid anti-spam filter</longdescription>
 	<use>
 		<flag name="daemon">
diff --git a/mail-filter/exim-geoip/metadata.xml b/mail-filter/exim-geoip/metadata.xml
index dad318e43a03..824582379822 100644
--- a/mail-filter/exim-geoip/metadata.xml
+++ b/mail-filter/exim-geoip/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">This is an IPv6 capable GeoIP dlfunc library for
 		Exim.  It implements an interface between Exim access control lists and
 		MaxMind's GeoIP/GeoLite database.  This can be useful for greylisting
diff --git a/mail-filter/exim-p0f/metadata.xml b/mail-filter/exim-p0f/metadata.xml
index 48bb76108d04..7e1f07c478ff 100644
--- a/mail-filter/exim-p0f/metadata.xml
+++ b/mail-filter/exim-p0f/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">This is p0f version 3 dlfunc library for Exim.
 		It implements an interface between Exim access control lists and the
 		p0f daemon which does passive OS fingerprinting.  This can be useful
diff --git a/mail-filter/gld/metadata.xml b/mail-filter/gld/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-filter/gld/metadata.xml
+++ b/mail-filter/gld/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/imapfilter/metadata.xml b/mail-filter/imapfilter/metadata.xml
index 389142a3fceb..f3d59e16b450 100644
--- a/mail-filter/imapfilter/metadata.xml
+++ b/mail-filter/imapfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lefcha/imapfilter</remote-id>
 	</upstream>
diff --git a/mail-filter/libdkim/metadata.xml b/mail-filter/libdkim/metadata.xml
index 514b6de10ce8..9e0ecee96695 100644
--- a/mail-filter/libdkim/metadata.xml
+++ b/mail-filter/libdkim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>andreis.vinogradovs@gmail.com</email>
     <name>Andreis Vinogradovs</name>
@@ -10,6 +9,10 @@
     <email>qnikst@gentoo.org</email>
     <name>Alexander Vershilov</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>DomainKeys Identified Mail library from Alt-N Inc.</longdescription>
   <use>
 </use>
diff --git a/mail-filter/libmilter/metadata.xml b/mail-filter/libmilter/metadata.xml
index 9326d69db75d..ba524ae9e3b8 100644
--- a/mail-filter/libmilter/metadata.xml
+++ b/mail-filter/libmilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>The Sendmail filter API (Milter)</longdescription>
 <use>
 	<flag name="poll">Use poll instead of select</flag>
diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml
index b511e7fe1c45..8d9a9ebd83b7 100644
--- a/mail-filter/libspf2/metadata.xml
+++ b/mail-filter/libspf2/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair. libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery, commonly used by spammers, scammers and email viruses/worms.</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/libsrs2/metadata.xml b/mail-filter/libsrs2/metadata.xml
index 75fd672f9b54..44d577b40e11 100644
--- a/mail-filter/libsrs2/metadata.xml
+++ b/mail-filter/libsrs2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>
 	libsrs2 is the next generation SRS library from the original designer of
 	SRS. It implements the Sender Rewriting Scheme, a part of the SPF/SRS
diff --git a/mail-filter/libsrs_alt/metadata.xml b/mail-filter/libsrs_alt/metadata.xml
index 0064ac998f52..f3ce2017dc64 100644
--- a/mail-filter/libsrs_alt/metadata.xml
+++ b/mail-filter/libsrs_alt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>
 This is a complete standalone C implementation of the SRS (Sender Rewriting
 Scheme) and includes a command line utility and daemon, test utility and static
diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml
index 58142c1536a3..f4cdbe19b440 100644
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="authlib">Add courier-authlib support</flag>
     <flag name="dovecot">Add dovecot authentication support</flag>
diff --git a/mail-filter/mailfilter/metadata.xml b/mail-filter/mailfilter/metadata.xml
index 35ed8f5cefd6..abbc89f8aadc 100644
--- a/mail-filter/mailfilter/metadata.xml
+++ b/mail-filter/mailfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mailfilter</remote-id>
 	</upstream>
diff --git a/mail-filter/mapson/metadata.xml b/mail-filter/mapson/metadata.xml
index d4dc3ffd0a5b..5d578826a783 100644
--- a/mail-filter/mapson/metadata.xml
+++ b/mail-filter/mapson/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mapson</remote-id>
 	</upstream>
diff --git a/mail-filter/milter-regex/metadata.xml b/mail-filter/milter-regex/metadata.xml
index b3efcc51b39c..ad236567ebf6 100644
--- a/mail-filter/milter-regex/metadata.xml
+++ b/mail-filter/milter-regex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>milter-regex is a very simple milter-based plugin that rejects or discards messages matching
 regular expressions. It doesn't add much processing overhead, so even a busy mail server can afford to run it.</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/mimedefang/metadata.xml b/mail-filter/mimedefang/metadata.xml
index d99e46d5a9da..1c783ea38fa4 100644
--- a/mail-filter/mimedefang/metadata.xml
+++ b/mail-filter/mimedefang/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>A program for Milter supported mail servers that implements antispam, antivirus and other customizable filtering on email messages</longdescription>
 <use>
 	<flag name="poll">Use poll instead of select</flag>
diff --git a/mail-filter/normalizemime/metadata.xml b/mail-filter/normalizemime/metadata.xml
index 04af52a335d1..f59f93c1c441 100644
--- a/mail-filter/normalizemime/metadata.xml
+++ b/mail-filter/normalizemime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
+    <maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 2eaf789b438a..a90ca4b449a3 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>A program implementing the Milter API that signs and verifies
 using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescription>
 	<use>
diff --git a/mail-filter/opendmarc/metadata.xml b/mail-filter/opendmarc/metadata.xml
index 1751753aa8ff..cdd8442076a2 100644
--- a/mail-filter/opendmarc/metadata.xml
+++ b/mail-filter/opendmarc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opendmarc</remote-id>
 	</upstream>
diff --git a/mail-filter/p3scan/metadata.xml b/mail-filter/p3scan/metadata.xml
index 4ace1cd8cdeb..3a8b84906271 100644
--- a/mail-filter/p3scan/metadata.xml
+++ b/mail-filter/p3scan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>P3Scan is a fully transparent scanning proxy-server for POP3-Clients. It provides scanning of incoming email messages for Virus''s, Worms, Trojans, Spam, and harmfull attachments. It can also parse HTML messages.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">p3scan</remote-id>
diff --git a/mail-filter/policyd-weight/metadata.xml b/mail-filter/policyd-weight/metadata.xml
index 84785fb4e4f3..88ad649eb8a5 100644
--- a/mail-filter/policyd-weight/metadata.xml
+++ b/mail-filter/policyd-weight/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">
 		policyd-weight is a Perl policy daemon for the Postfix MTA (2.1 and
 		later) intended to eliminate forged envelope senders and HELOs (i.e. in
diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index 088160100d5c..daecdeeb27f7 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">policyd</remote-id>
   </upstream>
diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index f0d4b84a37b5..f2163f878f80 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
@@ -11,6 +10,10 @@
 		<name>Christian Roessner</name>
 		<description>Proxy-Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+	    <email>proxy-maint@gentoo.org</email>
+	    <name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 	    <maintainer status="active">
 			<email>info@postfwd.org</email>
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 3f9e4f0ef76d..be77e8f64a75 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>proxy-maintainers</herd>
-  <maintainer>
+<maintainer>
 	 <email>andreis.vinogradovs@gmail.com</email>
 	 <name>Andreis Vinogradovs</name>
   </maintainer>
@@ -16,6 +14,14 @@
 	<name>Stefan Weichinger</name>
 	<description>Proxy maintainer under the proxy-maintainers herd</description>
   </maintainer>
+<maintainer>
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+  </maintainer>
+<maintainer>
+	  <email>proxy-maint@gentoo.org</email>
+	  <name>Proxy Maintainers</name>
+  </maintainer>
 <longdescription>Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.</longdescription>
 <use>
 	<flag name="targrey">Enables the targrey patch</flag>
diff --git a/mail-filter/procmail-lib/metadata.xml b/mail-filter/procmail-lib/metadata.xml
index 875462bb5ba5..64a04aec5168 100644
--- a/mail-filter/procmail-lib/metadata.xml
+++ b/mail-filter/procmail-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">procmail-lib</remote-id>
 	</upstream>
diff --git a/mail-filter/procmail/metadata.xml b/mail-filter/procmail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-filter/procmail/metadata.xml
+++ b/mail-filter/procmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/qmail-scanner/metadata.xml b/mail-filter/qmail-scanner/metadata.xml
index 6e2faa5d7457..90a538243e46 100644
--- a/mail-filter/qmail-scanner/metadata.xml
+++ b/mail-filter/qmail-scanner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="spamassassin">Build faster <pkg>mail-filter/spamassassin</pkg>
 		checks into qmail-scanner</flag>
diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index a9c5caae301c..16aee904e074 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>razor-admin@cloudmark.com</email>
 		<description>
@@ -11,6 +9,14 @@
 			upstream care.
 		</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">razor</remote-id>
 	</upstream>
diff --git a/mail-filter/rblcheck/metadata.xml b/mail-filter/rblcheck/metadata.xml
index d2a53afd5dd9..c7fea79e435b 100644
--- a/mail-filter/rblcheck/metadata.xml
+++ b/mail-filter/rblcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rblcheck</remote-id>
 	</upstream>
diff --git a/mail-filter/sid-milter/metadata.xml b/mail-filter/sid-milter/metadata.xml
index 775cc002f35c..de93da497d3c 100644
--- a/mail-filter/sid-milter/metadata.xml
+++ b/mail-filter/sid-milter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>A milter-based application that implements and enforces
 the merged Caller-ID/SPF specification from the IETF MARID working group,
 currently dubbed "Sender-ID"</longdescription>
diff --git a/mail-filter/spamass-milter/metadata.xml b/mail-filter/spamass-milter/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/mail-filter/spamass-milter/metadata.xml
+++ b/mail-filter/spamass-milter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/spamassassin-botnet/metadata.xml b/mail-filter/spamassassin-botnet/metadata.xml
index f529bb137ddf..1d1bc9a2a4d9 100644
--- a/mail-filter/spamassassin-botnet/metadata.xml
+++ b/mail-filter/spamassassin-botnet/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
 <maintainer>
 	<email>chutzpah@gentoo.org</email>
 	<name>Patrick McLean</name>
 </maintainer>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription lang="en">
 A spamassassin that performs DNS validations on the first untrusted relay
 looking for signs of a Botnet infected host, such as no reverse DNS, a
diff --git a/mail-filter/spambayes/metadata.xml b/mail-filter/spambayes/metadata.xml
index 9db371324c33..b74cfd05c008 100644
--- a/mail-filter/spambayes/metadata.xml
+++ b/mail-filter/spambayes/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>lordvan@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">spambayes</remote-id>
     <remote-id type="sourceforge">spambayes</remote-id>
diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml
index ef26bc720c25..8146f2e073e1 100644
--- a/mail-filter/spamdyke/metadata.xml
+++ b/mail-filter/spamdyke/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription lang="en">
 spamdyke is a filter for monitoring and intercepting SMTP connections between a
 remote host and a qmail server. Spam is blocked while the remote server
diff --git a/mail-filter/spampd/metadata.xml b/mail-filter/spampd/metadata.xml
index 6d2e935469e0..319b8575e2ad 100644
--- a/mail-filter/spampd/metadata.xml
+++ b/mail-filter/spampd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mpaperno/spampd</remote-id>
 	</upstream>
diff --git a/mail-filter/spamprobe/metadata.xml b/mail-filter/spamprobe/metadata.xml
index bb04a779a54a..80fe8bd46586 100644
--- a/mail-filter/spamprobe/metadata.xml
+++ b/mail-filter/spamprobe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">spamprobe</remote-id>
 	</upstream>
diff --git a/mail-filter/sqlgrey/metadata.xml b/mail-filter/sqlgrey/metadata.xml
index 5697feb720d0..b30d4538969c 100644
--- a/mail-filter/sqlgrey/metadata.xml
+++ b/mail-filter/sqlgrey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>SQLgrey is a postfix policy service implementing a grey-listing
 policy.</longdescription>
 	<upstream>
diff --git a/mail-filter/tmda/metadata.xml b/mail-filter/tmda/metadata.xml
index 5fd6a74fbfdc..270e2a3932cc 100644
--- a/mail-filter/tmda/metadata.xml
+++ b/mail-filter/tmda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tmda</remote-id>
 	</upstream>
diff --git a/mail-filter/zdkimfilter/metadata.xml b/mail-filter/zdkimfilter/metadata.xml
index ee8f8a7af5c9..726dde3df50d 100644
--- a/mail-filter/zdkimfilter/metadata.xml
+++ b/mail-filter/zdkimfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>A program implementing the DKIM signing/verification for Courier
 </longdescription>
 <use>
diff --git a/mail-mta/courier/metadata.xml b/mail-mta/courier/metadata.xml
index 319a82ad1dfe..c5226b2efa5d 100644
--- a/mail-mta/courier/metadata.xml
+++ b/mail-mta/courier/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		Complete email package consisting of pop, imap, smtp, and fax
 		server and secure version of the above also.
diff --git a/mail-mta/esmtp/metadata.xml b/mail-mta/esmtp/metadata.xml
index 725ab79598b8..d7b9ec0a880a 100644
--- a/mail-mta/esmtp/metadata.xml
+++ b/mail-mta/esmtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">esmtp</remote-id>
 	</upstream>
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 816ff8e0b655..d926a392ac23 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		Exim is a message transfer agent (MTA) developed at the University of
 		Cambridge for use on Unix systems connected to the Internet. It is
diff --git a/mail-mta/mini-qmail/metadata.xml b/mail-mta/mini-qmail/metadata.xml
index 4f23b826fd0f..8db39abdaeda 100644
--- a/mail-mta/mini-qmail/metadata.xml
+++ b/mail-mta/mini-qmail/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 1de9daedd0e8..b68a202a283f 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="mta">Enable this to install as system-wide MTA</flag>
 		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 55bfa8244d3c..c9f347827523 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="authcram">Enable AUTHCRAM support</flag>
 		<flag name="gencertdaily">Generate SSL certificates daily instead of
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index db85406861e4..9d89c0be23ab 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+<maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index b992965950e8..3481b67bbfad 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="dovecot-sasl">Enable <pkg>net-mail/dovecot</pkg> protocol
 			version 1 (server only) SASL implementation</flag>
diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
index 76f44a9e5963..43c0f38d6a27 100644
--- a/mail-mta/qmail-ldap/metadata.xml
+++ b/mail-mta/qmail-ldap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="cluster">Enable this if you want to have cluster support in
 			qmail-ldap</flag>
diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index be5716133be7..13ffc76974fc 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
+    <maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
     <use>
         <flag name="postfix">create user with permissions for proper postfix interaction</flag>
     </use>
diff --git a/mail-mta/sendmail/metadata.xml b/mail-mta/sendmail/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/mail-mta/sendmail/metadata.xml
+++ b/mail-mta/sendmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-mta/ssmtp/metadata.xml b/mail-mta/ssmtp/metadata.xml
index 82edd9a5af46..bae7208d06cf 100644
--- a/mail-mta/ssmtp/metadata.xml
+++ b/mail-mta/ssmtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="mta">Install symlinks for sendmail-compatible MTA.</flag>
   </use>
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml
index 3028d6e49532..687fab890834 100644
--- a/mate-base/caja/metadata.xml
+++ b/mate-base/caja/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which 
 		is needed when this package is used in the MATE desktop 
diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml
index 29638e67c804..47e7bfdb3267 100644
--- a/mate-base/libmatekbd/metadata.xml
+++ b/mate-base/libmatekbd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/libmatekbd</remote-id>
     </upstream>
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
index 7cc8907038a4..5fc19da8e195 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-applets</remote-id>
     </upstream>
diff --git a/mate-base/mate-common/metadata.xml b/mate-base/mate-common/metadata.xml
index 9c63ff9eb0a8..d8616d3d77f4 100644
--- a/mate-base/mate-common/metadata.xml
+++ b/mate-base/mate-common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-common</remote-id>
     </upstream>
diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml
index 064792223806..b7e6ed76e511 100644
--- a/mate-base/mate-control-center/metadata.xml
+++ b/mate-base/mate-control-center/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-control-center</remote-id>
     </upstream>
diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
index fef3aebebc37..c32cb8539289 100644
--- a/mate-base/mate-desktop/metadata.xml
+++ b/mate-base/mate-desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-desktop</remote-id>
     </upstream>
diff --git a/mate-base/mate-menus/metadata.xml b/mate-base/mate-menus/metadata.xml
index e356fdf21ce7..26bc4b63a238 100644
--- a/mate-base/mate-menus/metadata.xml
+++ b/mate-base/mate-menus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-menus</remote-id>
     </upstream>
diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml
index 89e7d8d2f4f3..d09e573557a8 100644
--- a/mate-base/mate-panel/metadata.xml
+++ b/mate-base/mate-panel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-panel</remote-id>
     </upstream>
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
index 8cebc02426d9..f5025d6b9265 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-session-manager</remote-id>
     </upstream>
diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
index d86e8143c78a..92df538b3709 100644
--- a/mate-base/mate-settings-daemon/metadata.xml
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
     </upstream>
diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
index a2016fc9c027..aa521ff165ec 100644
--- a/mate-base/mate/metadata.xml
+++ b/mate-base/mate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="base">Install base MATE Desktop applications that are
 			recommended for the most common usage; for example, this installs
diff --git a/mate-extra/caja-dropbox/metadata.xml b/mate-extra/caja-dropbox/metadata.xml
index 8f12c89e5cd3..7895a5ff04ff 100644
--- a/mate-extra/caja-dropbox/metadata.xml
+++ b/mate-extra/caja-dropbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/caja-dropbox</remote-id>
     </upstream>
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index d719a85807c0..fe071b184c41 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml
index 815ce85792d7..674412bacf6b 100644
--- a/mate-extra/mate-calc/metadata.xml
+++ b/mate-extra/mate-calc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-calc</remote-id>
     </upstream>
diff --git a/mate-extra/mate-dialogs/metadata.xml b/mate-extra/mate-dialogs/metadata.xml
index e05b855fdc01..2a566166e67e 100644
--- a/mate-extra/mate-dialogs/metadata.xml
+++ b/mate-extra/mate-dialogs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-dialogs</remote-id>
     </upstream>
diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml
index 032165d8cc95..966afd3e4cce 100644
--- a/mate-extra/mate-media/metadata.xml
+++ b/mate-extra/mate-media/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="twolame">Bring in twolame gstreamer support</flag>
 	</use>
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
index 98365c2ab31a..9d39d11f5802 100644
--- a/mate-extra/mate-polkit/metadata.xml
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-polkit</remote-id>
     </upstream>
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index bfcc2940094c..0390fd4b5574 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
 		<flag name="man">Build power manager's man page.</flag>
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index 96aee56156f3..4ec18856a8a5 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="consolekit">Enable support for 
 			<pkg>sys-auth/consolkekit</pkg></flag>
diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
index 5c977d7ea185..ddfd662a01b6 100644
--- a/mate-extra/mate-sensors-applet/metadata.xml
+++ b/mate-extra/mate-sensors-applet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-sensors-applet</remote-id>
     </upstream>
diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
index 8a0098558dfa..cc660981b23a 100644
--- a/mate-extra/mate-system-monitor/metadata.xml
+++ b/mate-extra/mate-system-monitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-system-monitor</remote-id>
     </upstream>
diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
index 3b08cd863903..463a237c617b 100644
--- a/mate-extra/mate-user-share/metadata.xml
+++ b/mate-extra/mate-user-share/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-user-share</remote-id>
     </upstream>
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
index dca77826b865..3ee980820b3f 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mate</herd>
+	<maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
 	<use>
 		<flag name="applet">Enable the mate dictionary applet</flag>
 	</use>
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index ad40b69bb820..e2231bc233f6 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 		<description>Proxied maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>A sanserif typeface in the style of xkcd.</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/acroread-asianfonts/metadata.xml b/media-fonts/acroread-asianfonts/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/acroread-asianfonts/metadata.xml
+++ b/media-fonts/acroread-asianfonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/alee-fonts/metadata.xml b/media-fonts/alee-fonts/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/alee-fonts/metadata.xml
+++ b/media-fonts/alee-fonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/alegreya-sans/metadata.xml b/media-fonts/alegreya-sans/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/alegreya-sans/metadata.xml
+++ b/media-fonts/alegreya-sans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/andika/metadata.xml b/media-fonts/andika/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/andika/metadata.xml
+++ b/media-fonts/andika/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/anonymous-pro/metadata.xml b/media-fonts/anonymous-pro/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/anonymous-pro/metadata.xml
+++ b/media-fonts/anonymous-pro/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/aquafont/metadata.xml b/media-fonts/aquafont/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/aquafont/metadata.xml
+++ b/media-fonts/aquafont/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/aquapfont/metadata.xml b/media-fonts/aquapfont/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/aquapfont/metadata.xml
+++ b/media-fonts/aquapfont/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/arabeyes-fonts/metadata.xml b/media-fonts/arabeyes-fonts/metadata.xml
index 10219b66e4cb..c6f5487d5658 100644
--- a/media-fonts/arabeyes-fonts/metadata.xml
+++ b/media-fonts/arabeyes-fonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arabeyes</remote-id>
 	</upstream>
diff --git a/media-fonts/arkpandora/metadata.xml b/media-fonts/arkpandora/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/arkpandora/metadata.xml
+++ b/media-fonts/arkpandora/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/arphicfonts/metadata.xml b/media-fonts/arphicfonts/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/arphicfonts/metadata.xml
+++ b/media-fonts/arphicfonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/artwiz-aleczapka-en/metadata.xml b/media-fonts/artwiz-aleczapka-en/metadata.xml
index d0c3fedc3640..1e6dca73a753 100644
--- a/media-fonts/artwiz-aleczapka-en/metadata.xml
+++ b/media-fonts/artwiz-aleczapka-en/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">artwizaleczapka</remote-id>
 	</upstream>
diff --git a/media-fonts/artwiz-latin1/metadata.xml b/media-fonts/artwiz-latin1/metadata.xml
index e1d9dbb8321c..4c7ae86944f9 100644
--- a/media-fonts/artwiz-latin1/metadata.xml
+++ b/media-fonts/artwiz-latin1/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">artwiz-latin1</remote-id>
 	</upstream>
diff --git a/media-fonts/baekmuk-fonts/metadata.xml b/media-fonts/baekmuk-fonts/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/baekmuk-fonts/metadata.xml
+++ b/media-fonts/baekmuk-fonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/bitstream-cyberbit/metadata.xml b/media-fonts/bitstream-cyberbit/metadata.xml
index 328060bef94a..da6bc2b968d7 100644
--- a/media-fonts/bitstream-cyberbit/metadata.xml
+++ b/media-fonts/bitstream-cyberbit/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/cantarell/metadata.xml b/media-fonts/cantarell/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-fonts/cantarell/metadata.xml
+++ b/media-fonts/cantarell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/cardo/metadata.xml b/media-fonts/cardo/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/cardo/metadata.xml
+++ b/media-fonts/cardo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/cheapskatefonts/metadata.xml b/media-fonts/cheapskatefonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/cheapskatefonts/metadata.xml
+++ b/media-fonts/cheapskatefonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/clearsans/metadata.xml b/media-fonts/clearsans/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/clearsans/metadata.xml
+++ b/media-fonts/clearsans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/cm-unicode/metadata.xml b/media-fonts/cm-unicode/metadata.xml
index c1dd88383ed4..a30bf104e1ed 100644
--- a/media-fonts/cm-unicode/metadata.xml
+++ b/media-fonts/cm-unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cm-unicode</remote-id>
 	</upstream>
diff --git a/media-fonts/comic-neue/metadata.xml b/media-fonts/comic-neue/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/comic-neue/metadata.xml
+++ b/media-fonts/comic-neue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/corefonts/metadata.xml b/media-fonts/corefonts/metadata.xml
index 7a791b502dbf..db422a7a7936 100644
--- a/media-fonts/corefonts/metadata.xml
+++ b/media-fonts/corefonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="tahoma">Also install the Tahoma font. Due to the lack of a free
       bold variant, this may render badly. See bug 184790.</flag>
diff --git a/media-fonts/courier-prime/metadata.xml b/media-fonts/courier-prime/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/courier-prime/metadata.xml
+++ b/media-fonts/courier-prime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/cronyx-fonts/metadata.xml b/media-fonts/cronyx-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/cronyx-fonts/metadata.xml
+++ b/media-fonts/cronyx-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/croscorefonts/metadata.xml b/media-fonts/croscorefonts/metadata.xml
index 37e5dd1e45fc..ca70c071faf9 100644
--- a/media-fonts/croscorefonts/metadata.xml
+++ b/media-fonts/croscorefonts/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Arimo, Cousine and Tinos were designed by Steve Matteson as innovative,
     refreshing default on-screen font designs that are metrically compatible
diff --git a/media-fonts/culmus/metadata.xml b/media-fonts/culmus/metadata.xml
index b5eb37014b42..e2104c4ea31f 100644
--- a/media-fonts/culmus/metadata.xml
+++ b/media-fonts/culmus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<use>
 		<flag name="ancient">Install ancient semitic scripts</flag>
 		<flag name="fancy">Install fancy fonts</flag>
diff --git a/media-fonts/dejavu/metadata.xml b/media-fonts/dejavu/metadata.xml
index 13468490f642..5cffa99d9860 100644
--- a/media-fonts/dejavu/metadata.xml
+++ b/media-fonts/dejavu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<use>
 		<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	</use>
diff --git a/media-fonts/dina/metadata.xml b/media-fonts/dina/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/dina/metadata.xml
+++ b/media-fonts/dina/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/droid/metadata.xml b/media-fonts/droid/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/droid/metadata.xml
+++ b/media-fonts/droid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/dzongkha-fonts/metadata.xml b/media-fonts/dzongkha-fonts/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/dzongkha-fonts/metadata.xml
+++ b/media-fonts/dzongkha-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/eb-garamond/metadata.xml b/media-fonts/eb-garamond/metadata.xml
index f48034fd6e2b..752358120104 100644
--- a/media-fonts/eb-garamond/metadata.xml
+++ b/media-fonts/eb-garamond/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="bitbucket">georgd/eb-garamond</remote-id>
   </upstream>
diff --git a/media-fonts/efont-unicode/metadata.xml b/media-fonts/efont-unicode/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/efont-unicode/metadata.xml
+++ b/media-fonts/efont-unicode/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ekushey-bangla-fonts/metadata.xml b/media-fonts/ekushey-bangla-fonts/metadata.xml
index be42e9a8c171..9cefdeec9014 100644
--- a/media-fonts/ekushey-bangla-fonts/metadata.xml
+++ b/media-fonts/ekushey-bangla-fonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ekushey</remote-id>
 	</upstream>
diff --git a/media-fonts/encodings/metadata.xml b/media-fonts/encodings/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/encodings/metadata.xml
+++ b/media-fonts/encodings/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/essays1743/metadata.xml b/media-fonts/essays1743/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/essays1743/metadata.xml
+++ b/media-fonts/essays1743/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/exljbris-free/metadata.xml b/media-fonts/exljbris-free/metadata.xml
index 7a68d4d4b7a6..6941e2d610b4 100644
--- a/media-fonts/exljbris-free/metadata.xml
+++ b/media-fonts/exljbris-free/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription lang="en">
 		Free fonts from exljbris. Includes the fonts: Delicious, Diavlo, Fontin,
 		Fontin Sans and Tallys.
diff --git a/media-fonts/exo/metadata.xml b/media-fonts/exo/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/exo/metadata.xml
+++ b/media-fonts/exo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/fantasque-sans-mono/metadata.xml b/media-fonts/fantasque-sans-mono/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/fantasque-sans-mono/metadata.xml
+++ b/media-fonts/fantasque-sans-mono/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/farsi-fonts/metadata.xml b/media-fonts/farsi-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/farsi-fonts/metadata.xml
+++ b/media-fonts/farsi-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/fgdc-emergency/metadata.xml b/media-fonts/fgdc-emergency/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/fgdc-emergency/metadata.xml
+++ b/media-fonts/fgdc-emergency/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/fifth-leg/metadata.xml b/media-fonts/fifth-leg/metadata.xml
index 715bb3c8c554..7e9a0a6b3389 100644
--- a/media-fonts/fifth-leg/metadata.xml
+++ b/media-fonts/fifth-leg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+	<email>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
 <longdescription lang="en">
 Fifth Leg font is simplistic, technical sans serif. It is used for openSUSE branded material. Free alternative that mimics Cholla font.
 </longdescription>
diff --git a/media-fonts/fira-mono/metadata.xml b/media-fonts/fira-mono/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/fira-mono/metadata.xml
+++ b/media-fonts/fira-mono/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/fira-sans/metadata.xml b/media-fonts/fira-sans/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/fira-sans/metadata.xml
+++ b/media-fonts/fira-sans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-100dpi/metadata.xml b/media-fonts/font-adobe-100dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-adobe-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-100dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-75dpi/metadata.xml b/media-fonts/font-adobe-75dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-adobe-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-75dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-100dpi/metadata.xml b/media-fonts/font-adobe-utopia-100dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-adobe-utopia-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-100dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-75dpi/metadata.xml b/media-fonts/font-adobe-utopia-75dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-adobe-utopia-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-75dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-type1/metadata.xml b/media-fonts/font-adobe-utopia-type1/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-adobe-utopia-type1/metadata.xml
+++ b/media-fonts/font-adobe-utopia-type1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-alias/metadata.xml b/media-fonts/font-alias/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-alias/metadata.xml
+++ b/media-fonts/font-alias/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-arabic-misc/metadata.xml b/media-fonts/font-arabic-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-arabic-misc/metadata.xml
+++ b/media-fonts/font-arabic-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-100dpi/metadata.xml b/media-fonts/font-bh-100dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-100dpi/metadata.xml
+++ b/media-fonts/font-bh-100dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-75dpi/metadata.xml b/media-fonts/font-bh-75dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-75dpi/metadata.xml
+++ b/media-fonts/font-bh-75dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-ttf/metadata.xml b/media-fonts/font-bh-ttf/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-ttf/metadata.xml
+++ b/media-fonts/font-bh-ttf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-type1/metadata.xml b/media-fonts/font-bh-type1/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bh-type1/metadata.xml
+++ b/media-fonts/font-bh-type1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-100dpi/metadata.xml b/media-fonts/font-bitstream-100dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bitstream-100dpi/metadata.xml
+++ b/media-fonts/font-bitstream-100dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-75dpi/metadata.xml b/media-fonts/font-bitstream-75dpi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bitstream-75dpi/metadata.xml
+++ b/media-fonts/font-bitstream-75dpi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-speedo/metadata.xml b/media-fonts/font-bitstream-speedo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bitstream-speedo/metadata.xml
+++ b/media-fonts/font-bitstream-speedo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-type1/metadata.xml b/media-fonts/font-bitstream-type1/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-bitstream-type1/metadata.xml
+++ b/media-fonts/font-bitstream-type1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-cronyx-cyrillic/metadata.xml b/media-fonts/font-cronyx-cyrillic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-cronyx-cyrillic/metadata.xml
+++ b/media-fonts/font-cronyx-cyrillic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-cursor-misc/metadata.xml b/media-fonts/font-cursor-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-cursor-misc/metadata.xml
+++ b/media-fonts/font-cursor-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-daewoo-misc/metadata.xml b/media-fonts/font-daewoo-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-daewoo-misc/metadata.xml
+++ b/media-fonts/font-daewoo-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-dec-misc/metadata.xml b/media-fonts/font-dec-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-dec-misc/metadata.xml
+++ b/media-fonts/font-dec-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-ibm-type1/metadata.xml b/media-fonts/font-ibm-type1/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-ibm-type1/metadata.xml
+++ b/media-fonts/font-ibm-type1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-isas-misc/metadata.xml b/media-fonts/font-isas-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-isas-misc/metadata.xml
+++ b/media-fonts/font-isas-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-jis-misc/metadata.xml b/media-fonts/font-jis-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-jis-misc/metadata.xml
+++ b/media-fonts/font-jis-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-micro-misc/metadata.xml b/media-fonts/font-micro-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-micro-misc/metadata.xml
+++ b/media-fonts/font-micro-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-cyrillic/metadata.xml b/media-fonts/font-misc-cyrillic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-misc-cyrillic/metadata.xml
+++ b/media-fonts/font-misc-cyrillic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-ethiopic/metadata.xml b/media-fonts/font-misc-ethiopic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-misc-ethiopic/metadata.xml
+++ b/media-fonts/font-misc-ethiopic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-meltho/metadata.xml b/media-fonts/font-misc-meltho/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-misc-meltho/metadata.xml
+++ b/media-fonts/font-misc-meltho/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-misc/metadata.xml b/media-fonts/font-misc-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-misc-misc/metadata.xml
+++ b/media-fonts/font-misc-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-mutt-misc/metadata.xml b/media-fonts/font-mutt-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-mutt-misc/metadata.xml
+++ b/media-fonts/font-mutt-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-schumacher-misc/metadata.xml b/media-fonts/font-schumacher-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-schumacher-misc/metadata.xml
+++ b/media-fonts/font-schumacher-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-screen-cyrillic/metadata.xml b/media-fonts/font-screen-cyrillic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-screen-cyrillic/metadata.xml
+++ b/media-fonts/font-screen-cyrillic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-sony-misc/metadata.xml b/media-fonts/font-sony-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-sony-misc/metadata.xml
+++ b/media-fonts/font-sony-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-sun-misc/metadata.xml b/media-fonts/font-sun-misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-sun-misc/metadata.xml
+++ b/media-fonts/font-sun-misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-util/metadata.xml b/media-fonts/font-util/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-util/metadata.xml
+++ b/media-fonts/font-util/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-winitzki-cyrillic/metadata.xml b/media-fonts/font-winitzki-cyrillic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-winitzki-cyrillic/metadata.xml
+++ b/media-fonts/font-winitzki-cyrillic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/font-xfree86-type1/metadata.xml b/media-fonts/font-xfree86-type1/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-fonts/font-xfree86-type1/metadata.xml
+++ b/media-fonts/font-xfree86-type1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/free-bangla-font/metadata.xml b/media-fonts/free-bangla-font/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/free-bangla-font/metadata.xml
+++ b/media-fonts/free-bangla-font/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/freefont/metadata.xml b/media-fonts/freefont/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/freefont/metadata.xml
+++ b/media-fonts/freefont/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/freefonts/metadata.xml b/media-fonts/freefonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/freefonts/metadata.xml
+++ b/media-fonts/freefonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/fs-fonts/metadata.xml b/media-fonts/fs-fonts/metadata.xml
index 7fc9573410e2..0214a8997960 100644
--- a/media-fonts/fs-fonts/metadata.xml
+++ b/media-fonts/fs-fonts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">x-tt</remote-id>
 	</upstream>
diff --git a/media-fonts/gidole/metadata.xml b/media-fonts/gidole/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/gidole/metadata.xml
+++ b/media-fonts/gidole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/hack/metadata.xml b/media-fonts/hack/metadata.xml
index 85e82b7e2d0e..e5f877dd6940 100644
--- a/media-fonts/hack/metadata.xml
+++ b/media-fonts/hack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chrissimpkins/Hack</remote-id>
 	</upstream>
diff --git a/media-fonts/hermit/metadata.xml b/media-fonts/hermit/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/hermit/metadata.xml
+++ b/media-fonts/hermit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/heuristica/metadata.xml b/media-fonts/heuristica/metadata.xml
index 49a544d5ee70..924f21961da1 100644
--- a/media-fonts/heuristica/metadata.xml
+++ b/media-fonts/heuristica/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">evristika</remote-id>
 	</upstream>
diff --git a/media-fonts/hkscs-ming/metadata.xml b/media-fonts/hkscs-ming/metadata.xml
index aef01fc3d591..c746f2860f8d 100644
--- a/media-fonts/hkscs-ming/metadata.xml
+++ b/media-fonts/hkscs-ming/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/hunkyfonts/metadata.xml b/media-fonts/hunkyfonts/metadata.xml
index d52e94094b1b..80efd9446eb3 100644
--- a/media-fonts/hunkyfonts/metadata.xml
+++ b/media-fonts/hunkyfonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription>Hunky Fonts are free TrueType fonts based on Bitstream's Vera fonts with additional letters for Baltic, Central European, South European and other languages, including Maori, Welsh and Esperanto.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">hunkyfonts</remote-id>
diff --git a/media-fonts/inconsolata-hellenic/metadata.xml b/media-fonts/inconsolata-hellenic/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/inconsolata-hellenic/metadata.xml
+++ b/media-fonts/inconsolata-hellenic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/inconsolata/metadata.xml b/media-fonts/inconsolata/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/inconsolata/metadata.xml
+++ b/media-fonts/inconsolata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/infinality-ultimate-meta/metadata.xml b/media-fonts/infinality-ultimate-meta/metadata.xml
index 73b73031e352..60b4a68073f1 100644
--- a/media-fonts/infinality-ultimate-meta/metadata.xml
+++ b/media-fonts/infinality-ultimate-meta/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
   <maintainer>
     <email>witold.pilat@gmail.com</email>
     <description>Proxied/co-maintainer. CC on bugs.</description>
   </maintainer>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="free">Install fonts for the "free" preset</flag>
     <flag name="latin">Install additional latin fonts</flag>
diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index 3a0faca39ede..7ca970959a08 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 <use>
 	<flag name="bdf">Installs BDF fonts in addition to PCF</flag>
 </use>
diff --git a/media-fonts/ipaex/metadata.xml b/media-fonts/ipaex/metadata.xml
index 997affade248..7fc984ce2c54 100644
--- a/media-fonts/ipaex/metadata.xml
+++ b/media-fonts/ipaex/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+<maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ipamonafont/metadata.xml b/media-fonts/ipamonafont/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/ipamonafont/metadata.xml
+++ b/media-fonts/ipamonafont/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ja-ipafonts/metadata.xml b/media-fonts/ja-ipafonts/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/ja-ipafonts/metadata.xml
+++ b/media-fonts/ja-ipafonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/jisx0213-fonts/metadata.xml b/media-fonts/jisx0213-fonts/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/jisx0213-fonts/metadata.xml
+++ b/media-fonts/jisx0213-fonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/jomolhari/metadata.xml b/media-fonts/jomolhari/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/jomolhari/metadata.xml
+++ b/media-fonts/jomolhari/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/jsmath-extra-dark/metadata.xml b/media-fonts/jsmath-extra-dark/metadata.xml
index a751914a7155..00b3756801cd 100644
--- a/media-fonts/jsmath-extra-dark/metadata.xml
+++ b/media-fonts/jsmath-extra-dark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Extra jsMath fonts, dark version. Used in math web sites.
 </longdescription>
diff --git a/media-fonts/jsmath-extra-light/metadata.xml b/media-fonts/jsmath-extra-light/metadata.xml
index fe7001dc4de9..3fa0b73e0d89 100644
--- a/media-fonts/jsmath-extra-light/metadata.xml
+++ b/media-fonts/jsmath-extra-light/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Extra jsMath fonts, light version. Used in math web sites.
 </longdescription>
diff --git a/media-fonts/jsmath/metadata.xml b/media-fonts/jsmath/metadata.xml
index 4743f5200f6e..f645a427ea7a 100644
--- a/media-fonts/jsmath/metadata.xml
+++ b/media-fonts/jsmath/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Rasterized fonts saved in image files to enable viewing of jsMath
   pages by a web-browser which is missing access to TeX fonts.
diff --git a/media-fonts/kacst-fonts/metadata.xml b/media-fonts/kacst-fonts/metadata.xml
index 10219b66e4cb..c6f5487d5658 100644
--- a/media-fonts/kacst-fonts/metadata.xml
+++ b/media-fonts/kacst-fonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arabeyes</remote-id>
 	</upstream>
diff --git a/media-fonts/kanjistrokeorders/metadata.xml b/media-fonts/kanjistrokeorders/metadata.xml
index 89a87a77fa9c..69ff40eca96c 100644
--- a/media-fonts/kanjistrokeorders/metadata.xml
+++ b/media-fonts/kanjistrokeorders/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/khmer/metadata.xml b/media-fonts/khmer/metadata.xml
index 0bfa1992eff4..2c052194c525 100644
--- a/media-fonts/khmer/metadata.xml
+++ b/media-fonts/khmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">khmer</remote-id>
 	</upstream>
diff --git a/media-fonts/kochi-substitute/metadata.xml b/media-fonts/kochi-substitute/metadata.xml
index 7598201f23ed..6fb81686b1f0 100644
--- a/media-fonts/kochi-substitute/metadata.xml
+++ b/media-fonts/kochi-substitute/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">efont</remote-id>
 	</upstream>
diff --git a/media-fonts/konfont/metadata.xml b/media-fonts/konfont/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/konfont/metadata.xml
+++ b/media-fonts/konfont/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/koruri/metadata.xml b/media-fonts/koruri/metadata.xml
index e0ae22e43102..5a77eb55c8c7 100644
--- a/media-fonts/koruri/metadata.xml
+++ b/media-fonts/koruri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">koruri</remote-id>
   </upstream>
diff --git a/media-fonts/lfpfonts-fix/metadata.xml b/media-fonts/lfpfonts-fix/metadata.xml
index bfe82106acd5..a87d9190257e 100644
--- a/media-fonts/lfpfonts-fix/metadata.xml
+++ b/media-fonts/lfpfonts-fix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xfonts</remote-id>
 	</upstream>
diff --git a/media-fonts/lfpfonts-var/metadata.xml b/media-fonts/lfpfonts-var/metadata.xml
index 81f87bb54510..47ad18b99e1b 100644
--- a/media-fonts/lfpfonts-var/metadata.xml
+++ b/media-fonts/lfpfonts-var/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xfonts</remote-id>
 	</upstream>
diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index ed1a4a131b4d..71fd89cd8dca 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>je_fro@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<use>
 		<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	</use>
diff --git a/media-fonts/libertine/metadata.xml b/media-fonts/libertine/metadata.xml
index 23cc4c91a9ce..a3ad695e8712 100644
--- a/media-fonts/libertine/metadata.xml
+++ b/media-fonts/libertine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">linuxlibertine</remote-id>
   </upstream>
diff --git a/media-fonts/lklug/metadata.xml b/media-fonts/lklug/metadata.xml
index 38b5387e39f4..1df2e332bc2a 100644
--- a/media-fonts/lklug/metadata.xml
+++ b/media-fonts/lklug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sinhala</remote-id>
 	</upstream>
diff --git a/media-fonts/lohit-assamese/metadata.xml b/media-fonts/lohit-assamese/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-assamese/metadata.xml
+++ b/media-fonts/lohit-assamese/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-bengali/metadata.xml b/media-fonts/lohit-bengali/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-bengali/metadata.xml
+++ b/media-fonts/lohit-bengali/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-devanagari/metadata.xml b/media-fonts/lohit-devanagari/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-devanagari/metadata.xml
+++ b/media-fonts/lohit-devanagari/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-fonts/metadata.xml b/media-fonts/lohit-fonts/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/lohit-fonts/metadata.xml
+++ b/media-fonts/lohit-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-gujarati/metadata.xml b/media-fonts/lohit-gujarati/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-gujarati/metadata.xml
+++ b/media-fonts/lohit-gujarati/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-gurmukhi/metadata.xml b/media-fonts/lohit-gurmukhi/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-gurmukhi/metadata.xml
+++ b/media-fonts/lohit-gurmukhi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-kannada/metadata.xml b/media-fonts/lohit-kannada/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-kannada/metadata.xml
+++ b/media-fonts/lohit-kannada/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-malayalam/metadata.xml b/media-fonts/lohit-malayalam/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-malayalam/metadata.xml
+++ b/media-fonts/lohit-malayalam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-marathi/metadata.xml b/media-fonts/lohit-marathi/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-marathi/metadata.xml
+++ b/media-fonts/lohit-marathi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-nepali/metadata.xml b/media-fonts/lohit-nepali/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-nepali/metadata.xml
+++ b/media-fonts/lohit-nepali/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-odia/metadata.xml b/media-fonts/lohit-odia/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-odia/metadata.xml
+++ b/media-fonts/lohit-odia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-tamil-classical/metadata.xml b/media-fonts/lohit-tamil-classical/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-tamil-classical/metadata.xml
+++ b/media-fonts/lohit-tamil-classical/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-tamil/metadata.xml b/media-fonts/lohit-tamil/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-tamil/metadata.xml
+++ b/media-fonts/lohit-tamil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/lohit-telugu/metadata.xml b/media-fonts/lohit-telugu/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/lohit-telugu/metadata.xml
+++ b/media-fonts/lohit-telugu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/mathematica-fonts/metadata.xml b/media-fonts/mathematica-fonts/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/mathematica-fonts/metadata.xml
+++ b/media-fonts/mathematica-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/mgopen/metadata.xml b/media-fonts/mgopen/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/mgopen/metadata.xml
+++ b/media-fonts/mgopen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/mikachan-font-otf/metadata.xml b/media-fonts/mikachan-font-otf/metadata.xml
index 94558b474c67..4cb129fc0179 100644
--- a/media-fonts/mikachan-font-otf/metadata.xml
+++ b/media-fonts/mikachan-font-otf/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/mikachan-font-ttc/metadata.xml b/media-fonts/mikachan-font-ttc/metadata.xml
index 94558b474c67..4cb129fc0179 100644
--- a/media-fonts/mikachan-font-ttc/metadata.xml
+++ b/media-fonts/mikachan-font-ttc/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/mikachan-font-ttf/metadata.xml b/media-fonts/mikachan-font-ttf/metadata.xml
index 15f1ae369793..cb78e691db1b 100644
--- a/media-fonts/mikachan-font-ttf/metadata.xml
+++ b/media-fonts/mikachan-font-ttf/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
-	<herd>x11</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">mikachan</remote-id>
 	</upstream>
diff --git a/media-fonts/mix-mplus-ipa/metadata.xml b/media-fonts/mix-mplus-ipa/metadata.xml
index 09d78af11f00..7744ab96b94e 100644
--- a/media-fonts/mix-mplus-ipa/metadata.xml
+++ b/media-fonts/mix-mplus-ipa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">mix-mplus-ipa</remote-id>
 	</upstream>
diff --git a/media-fonts/monafont/metadata.xml b/media-fonts/monafont/metadata.xml
index b009a20c9f28..7b8c3e7bacfd 100644
--- a/media-fonts/monafont/metadata.xml
+++ b/media-fonts/monafont/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">monafont</remote-id>
 	</upstream>
diff --git a/media-fonts/monoid/metadata.xml b/media-fonts/monoid/metadata.xml
index b7443646b614..5ff8996ce018 100644
--- a/media-fonts/monoid/metadata.xml
+++ b/media-fonts/monoid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">larsenwork/monoid</remote-id>
 	</upstream>
diff --git a/media-fonts/mplus-fonts/metadata.xml b/media-fonts/mplus-fonts/metadata.xml
index 8a4960d68203..7a2fb19dcdb2 100644
--- a/media-fonts/mplus-fonts/metadata.xml
+++ b/media-fonts/mplus-fonts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">mplus-fonts</remote-id>
 	</upstream>
diff --git a/media-fonts/mplus-outline-fonts/metadata.xml b/media-fonts/mplus-outline-fonts/metadata.xml
index 95f7b23dec24..f79cf48237e6 100644
--- a/media-fonts/mplus-outline-fonts/metadata.xml
+++ b/media-fonts/mplus-outline-fonts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="ipafont">Generates new fonts merged with <pkg>media-fonts/ja-ipafonts</pkg></flag>
   </use>
diff --git a/media-fonts/nanum/metadata.xml b/media-fonts/nanum/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/nanum/metadata.xml
+++ b/media-fonts/nanum/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/nanumfont/metadata.xml b/media-fonts/nanumfont/metadata.xml
index 89a87a77fa9c..69ff40eca96c 100644
--- a/media-fonts/nanumfont/metadata.xml
+++ b/media-fonts/nanumfont/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/nepali-fonts/metadata.xml b/media-fonts/nepali-fonts/metadata.xml
index 651397866e43..9614071aa40a 100644
--- a/media-fonts/nepali-fonts/metadata.xml
+++ b/media-fonts/nepali-fonts/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/nunito/metadata.xml b/media-fonts/nunito/metadata.xml
index 8194343ba089..9cbf5f40405c 100644
--- a/media-fonts/nunito/metadata.xml
+++ b/media-fonts/nunito/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Nunito is a well balanced Sans Serif with rounded terminals. Nunito has
 	been designed mainly to be used as a display font but is useable as a
diff --git a/media-fonts/nuosu-sil/metadata.xml b/media-fonts/nuosu-sil/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/nuosu-sil/metadata.xml
+++ b/media-fonts/nuosu-sil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ohsnap/metadata.xml b/media-fonts/ohsnap/metadata.xml
index f8a4a335c69c..fb723a5de96c 100644
--- a/media-fonts/ohsnap/metadata.xml
+++ b/media-fonts/ohsnap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">osnapfont</remote-id>
   </upstream>
diff --git a/media-fonts/oldstandard/metadata.xml b/media-fonts/oldstandard/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/oldstandard/metadata.xml
+++ b/media-fonts/oldstandard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/open-sans/metadata.xml b/media-fonts/open-sans/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/open-sans/metadata.xml
+++ b/media-fonts/open-sans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/opendesktop-fonts/metadata.xml b/media-fonts/opendesktop-fonts/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/opendesktop-fonts/metadata.xml
+++ b/media-fonts/opendesktop-fonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/oto/metadata.xml b/media-fonts/oto/metadata.xml
index f8aec25463e3..59980de9efdc 100644
--- a/media-fonts/oto/metadata.xml
+++ b/media-fonts/oto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">oto</remote-id>
 	</upstream>
diff --git a/media-fonts/paratype/metadata.xml b/media-fonts/paratype/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/paratype/metadata.xml
+++ b/media-fonts/paratype/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/pcf2bdf/metadata.xml b/media-fonts/pcf2bdf/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/pcf2bdf/metadata.xml
+++ b/media-fonts/pcf2bdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/pigiarniq/metadata.xml b/media-fonts/pigiarniq/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/pigiarniq/metadata.xml
+++ b/media-fonts/pigiarniq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/pothana2k/metadata.xml b/media-fonts/pothana2k/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/pothana2k/metadata.xml
+++ b/media-fonts/pothana2k/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/powerline-symbols/metadata.xml b/media-fonts/powerline-symbols/metadata.xml
index 4b8fd1f9b3c3..561aabc26d8b 100644
--- a/media-fonts/powerline-symbols/metadata.xml
+++ b/media-fonts/powerline-symbols/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">powerline/powerline</remote-id>
   </upstream>
diff --git a/media-fonts/proggy-fonts/metadata.xml b/media-fonts/proggy-fonts/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/proggy-fonts/metadata.xml
+++ b/media-fonts/proggy-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/qomolangma/metadata.xml b/media-fonts/qomolangma/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/qomolangma/metadata.xml
+++ b/media-fonts/qomolangma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/quivira/metadata.xml b/media-fonts/quivira/metadata.xml
index 328060bef94a..da6bc2b968d7 100644
--- a/media-fonts/quivira/metadata.xml
+++ b/media-fonts/quivira/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ricty/metadata.xml b/media-fonts/ricty/metadata.xml
index ee46797186f8..dad96b4d0273 100644
--- a/media-fonts/ricty/metadata.xml
+++ b/media-fonts/ricty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">yascentur/Ricty</remote-id>
 	</upstream>
diff --git a/media-fonts/roboto/metadata.xml b/media-fonts/roboto/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/roboto/metadata.xml
+++ b/media-fonts/roboto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/sazanami/metadata.xml b/media-fonts/sazanami/metadata.xml
index 7598201f23ed..6fb81686b1f0 100644
--- a/media-fonts/sazanami/metadata.xml
+++ b/media-fonts/sazanami/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">efont</remote-id>
 	</upstream>
diff --git a/media-fonts/sgi-fonts/metadata.xml b/media-fonts/sgi-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/sgi-fonts/metadata.xml
+++ b/media-fonts/sgi-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/shinonome/metadata.xml b/media-fonts/shinonome/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/shinonome/metadata.xml
+++ b/media-fonts/shinonome/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/signika/metadata.xml b/media-fonts/signika/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/signika/metadata.xml
+++ b/media-fonts/signika/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/sil-abyssinica/metadata.xml b/media-fonts/sil-abyssinica/metadata.xml
index 8df0e8873059..8eadd7ca109e 100644
--- a/media-fonts/sil-abyssinica/metadata.xml
+++ b/media-fonts/sil-abyssinica/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     The Ethiopic script is used for writing many of the languages of
     Ethiopia and Eritrea.  Ethiopic (U+1200..U+137F) was added to
diff --git a/media-fonts/sil-arabicfonts/metadata.xml b/media-fonts/sil-arabicfonts/metadata.xml
index a2a8c2d020d3..18c8b513cced 100644
--- a/media-fonts/sil-arabicfonts/metadata.xml
+++ b/media-fonts/sil-arabicfonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Scheherazade and Lateef are extended Arabic script fonts designed
     by SIL International for modern Unicode-based systems using either
diff --git a/media-fonts/sil-charis/metadata.xml b/media-fonts/sil-charis/metadata.xml
index add35cda6184..3d0af2a53a35 100644
--- a/media-fonts/sil-charis/metadata.xml
+++ b/media-fonts/sil-charis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Welcome to the Charis SIL font package. Charis is similar to
     Bitstream Charter, one of the first fonts designed specifically
diff --git a/media-fonts/sil-doulos/metadata.xml b/media-fonts/sil-doulos/metadata.xml
index 11ebc56ba2e1..28f86f0fcdba 100644
--- a/media-fonts/sil-doulos/metadata.xml
+++ b/media-fonts/sil-doulos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Welcome to the Doulos SIL font package. The goal for this product
     was to provide a single Unicode-based font family that would
diff --git a/media-fonts/sil-ezra/metadata.xml b/media-fonts/sil-ezra/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/sil-ezra/metadata.xml
+++ b/media-fonts/sil-ezra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/sil-galatia/metadata.xml b/media-fonts/sil-galatia/metadata.xml
index 1b783c868284..6e86cb2f0980 100644
--- a/media-fonts/sil-galatia/metadata.xml
+++ b/media-fonts/sil-galatia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Galatia SIL is the second release of a Biblical Greek font package
     from SIL International. The typeface is almost identical to the
diff --git a/media-fonts/sil-gentium/metadata.xml b/media-fonts/sil-gentium/metadata.xml
index 31ca4c256372..a1f26fb01d58 100644
--- a/media-fonts/sil-gentium/metadata.xml
+++ b/media-fonts/sil-gentium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
 	Gentium is a typeface family designed to enable the diverse ethnic
 	groups around the world who use the Latin, Cyrillic and Greek
diff --git a/media-fonts/sil-padauk/metadata.xml b/media-fonts/sil-padauk/metadata.xml
index f2882005c4a7..0c8f7aea9003 100644
--- a/media-fonts/sil-padauk/metadata.xml
+++ b/media-fonts/sil-padauk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <longdescription lang="en">
     Padauk supports the Myanmar script extensions including changes to
     how Burmese is encoded, Sgaw Karen and Mon.
diff --git a/media-fonts/sophia-nubian/metadata.xml b/media-fonts/sophia-nubian/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/sophia-nubian/metadata.xml
+++ b/media-fonts/sophia-nubian/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index c49abbde1940..ecb31ee49e50 100644
--- a/media-fonts/source-han-sans/metadata.xml
+++ b/media-fonts/source-han-sans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">adobe-fonts/source-han-sans</remote-id>
   </upstream>
diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
index 81fc26191e5a..0fe916dd9f8f 100644
--- a/media-fonts/source-pro/metadata.xml
+++ b/media-fonts/source-pro/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>nirbheek@gentoo.org</email>
 		<name>Nirbheek Chauhan</name>
@@ -10,6 +9,10 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">adobe-fonts/source-code-pro</remote-id>
 		<remote-id type="sourceforge">sourcesans.adobe</remote-id>
diff --git a/media-fonts/stix-fonts/metadata.xml b/media-fonts/stix-fonts/metadata.xml
index e80aa890fbb3..649389b9760a 100644
--- a/media-fonts/stix-fonts/metadata.xml
+++ b/media-fonts/stix-fonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stixfonts</remote-id>
 	</upstream>
diff --git a/media-fonts/symbola/metadata.xml b/media-fonts/symbola/metadata.xml
index 328060bef94a..da6bc2b968d7 100644
--- a/media-fonts/symbola/metadata.xml
+++ b/media-fonts/symbola/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/takao-fonts/metadata.xml b/media-fonts/takao-fonts/metadata.xml
index b268f728f9c1..f3a3748ae05d 100644
--- a/media-fonts/takao-fonts/metadata.xml
+++ b/media-fonts/takao-fonts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">takao-fonts</remote-id>
 	</upstream>
diff --git a/media-fonts/tengwar-fonts/metadata.xml b/media-fonts/tengwar-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/tengwar-fonts/metadata.xml
+++ b/media-fonts/tengwar-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 51c9b775d043..f4616847e20a 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
diff --git a/media-fonts/tex-gyre/metadata.xml b/media-fonts/tex-gyre/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/tex-gyre/metadata.xml
+++ b/media-fonts/tex-gyre/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/texcm-ttf/metadata.xml b/media-fonts/texcm-ttf/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/texcm-ttf/metadata.xml
+++ b/media-fonts/texcm-ttf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/thaifonts-scalable/metadata.xml b/media-fonts/thaifonts-scalable/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/thaifonts-scalable/metadata.xml
+++ b/media-fonts/thaifonts-scalable/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/tibetan-machine-font/metadata.xml b/media-fonts/tibetan-machine-font/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/tibetan-machine-font/metadata.xml
+++ b/media-fonts/tibetan-machine-font/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ttf-bitstream-vera/metadata.xml b/media-fonts/ttf-bitstream-vera/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/media-fonts/ttf-bitstream-vera/metadata.xml
+++ b/media-fonts/ttf-bitstream-vera/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/ubuntu-font-family/metadata.xml b/media-fonts/ubuntu-font-family/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/media-fonts/ubuntu-font-family/metadata.xml
+++ b/media-fonts/ubuntu-font-family/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index 8ccedd8c6099..883c6dcc1a23 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mdk-ut</remote-id>
 	</upstream>
diff --git a/media-fonts/unfonts-extra/metadata.xml b/media-fonts/unfonts-extra/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/unfonts-extra/metadata.xml
+++ b/media-fonts/unfonts-extra/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/unfonts/metadata.xml b/media-fonts/unfonts/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/media-fonts/unfonts/metadata.xml
+++ b/media-fonts/unfonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/unifont/metadata.xml b/media-fonts/unifont/metadata.xml
index 7e4704981b0f..9b03adf0e510 100644
--- a/media-fonts/unifont/metadata.xml
+++ b/media-fonts/unifont/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
 <maintainer>
 	<email>floppym@gentoo.org</email>
 	<name>Mike Gilbert</name>
 </maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <use>
 	<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	<flag name="utils">Install unifont utilities</flag>
diff --git a/media-fonts/urw-fonts/metadata.xml b/media-fonts/urw-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/urw-fonts/metadata.xml
+++ b/media-fonts/urw-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/urwvn-fonts/metadata.xml b/media-fonts/urwvn-fonts/metadata.xml
index 0fe59e2fba00..6d37932330d5 100644
--- a/media-fonts/urwvn-fonts/metadata.xml
+++ b/media-fonts/urwvn-fonts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">vntex</remote-id>
   </upstream>
diff --git a/media-fonts/vc-fonts/metadata.xml b/media-fonts/vc-fonts/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/vc-fonts/metadata.xml
+++ b/media-fonts/vc-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/vdrsymbols-ttf/metadata.xml b/media-fonts/vdrsymbols-ttf/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-fonts/vdrsymbols-ttf/metadata.xml
+++ b/media-fonts/vdrsymbols-ttf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-fonts/viga/metadata.xml b/media-fonts/viga/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/viga/metadata.xml
+++ b/media-fonts/viga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/vlgothic/metadata.xml b/media-fonts/vlgothic/metadata.xml
index c6bfaa83e0b7..02074ca5dba4 100644
--- a/media-fonts/vlgothic/metadata.xml
+++ b/media-fonts/vlgothic/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">vlgothic</remote-id>
   </upstream>
diff --git a/media-fonts/vollkorn/metadata.xml b/media-fonts/vollkorn/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/vollkorn/metadata.xml
+++ b/media-fonts/vollkorn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/webby-fonts/metadata.xml b/media-fonts/webby-fonts/metadata.xml
index c62efd4a8c1d..09cec591d727 100644
--- a/media-fonts/webby-fonts/metadata.xml
+++ b/media-fonts/webby-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-fonts/wqy-bitmapfont/metadata.xml b/media-fonts/wqy-bitmapfont/metadata.xml
index c59d5a426436..890bfcc56329 100644
--- a/media-fonts/wqy-bitmapfont/metadata.xml
+++ b/media-fonts/wqy-bitmapfont/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription>
 WenQuanYi project intends to provide the open-source community with the most
 complete, standard compliant, high-quality Chinese fonts and resources. TrueType
diff --git a/media-fonts/wqy-microhei/metadata.xml b/media-fonts/wqy-microhei/metadata.xml
index 35afcbc30f07..f65218d992b6 100644
--- a/media-fonts/wqy-microhei/metadata.xml
+++ b/media-fonts/wqy-microhei/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wqy</remote-id>
 	</upstream>
diff --git a/media-fonts/wqy-unibit/metadata.xml b/media-fonts/wqy-unibit/metadata.xml
index deb09f1e7494..c52a5db599b1 100644
--- a/media-fonts/wqy-unibit/metadata.xml
+++ b/media-fonts/wqy-unibit/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wqy</remote-id>
 	</upstream>
diff --git a/media-fonts/wqy-zenhei/metadata.xml b/media-fonts/wqy-zenhei/metadata.xml
index 30ddb0f15866..de1b875b51dc 100644
--- a/media-fonts/wqy-zenhei/metadata.xml
+++ b/media-fonts/wqy-zenhei/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wqy</remote-id>
 	</upstream>
diff --git a/media-fonts/x11fonts-jmk/metadata.xml b/media-fonts/x11fonts-jmk/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-fonts/x11fonts-jmk/metadata.xml
+++ b/media-fonts/x11fonts-jmk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/zh-kcfonts/metadata.xml b/media-fonts/zh-kcfonts/metadata.xml
index 6e63c30f1bb2..e7552514bd67 100644
--- a/media-fonts/zh-kcfonts/metadata.xml
+++ b/media-fonts/zh-kcfonts/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index 62ebf7726c21..45758ad8b831 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">log69/aaphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index f99fc2d51a77..ebab8c2e66bd 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
 	<flag name="themes">Install optional themes</flag>
diff --git a/media-gfx/aoi/metadata.xml b/media-gfx/aoi/metadata.xml
index 670266a8b580..fa02d5ba65e9 100644
--- a/media-gfx/aoi/metadata.xml
+++ b/media-gfx/aoi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aoi</remote-id>
 	</upstream>
diff --git a/media-gfx/apng2gif/metadata.xml b/media-gfx/apng2gif/metadata.xml
index cf8762004522..1babef065d29 100644
--- a/media-gfx/apng2gif/metadata.xml
+++ b/media-gfx/apng2gif/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">apng2gif</remote-id>
 	</upstream>
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index e61abad77a70..43cb51dd62b1 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">apngasm</remote-id>
 	</upstream>
diff --git a/media-gfx/apngdis/metadata.xml b/media-gfx/apngdis/metadata.xml
index dd79e90cbe52..88f37f1556f9 100644
--- a/media-gfx/apngdis/metadata.xml
+++ b/media-gfx/apngdis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">apngdis</remote-id>
 	</upstream>
diff --git a/media-gfx/apngopt/metadata.xml b/media-gfx/apngopt/metadata.xml
index 03df6f2be2c9..383b9cc9d7ba 100644
--- a/media-gfx/apngopt/metadata.xml
+++ b/media-gfx/apngopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">apng</remote-id>
 	</upstream>
diff --git a/media-gfx/aqsis/metadata.xml b/media-gfx/aqsis/metadata.xml
index 457cf2a57988..debad32debcd 100644
--- a/media-gfx/aqsis/metadata.xml
+++ b/media-gfx/aqsis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aqsis</remote-id>
 	</upstream>
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 83bd6f53fce8..8608301b517f 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Asymptote is a powerful descriptive vector graphics language that
 		provides a natural coordinate-based framework for technical drawing.
diff --git a/media-gfx/autopano-sift-C/metadata.xml b/media-gfx/autopano-sift-C/metadata.xml
index 239509055f5b..07ea463b1da9 100644
--- a/media-gfx/autopano-sift-C/metadata.xml
+++ b/media-gfx/autopano-sift-C/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>autopano-sift-C is a program to automatically find control points
 		for stitching together panoramas.</longdescription>
 	<upstream>
diff --git a/media-gfx/autotrace/metadata.xml b/media-gfx/autotrace/metadata.xml
index 96803e953658..1f4ec8b687be 100644
--- a/media-gfx/autotrace/metadata.xml
+++ b/media-gfx/autotrace/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">autotrace</remote-id>
 	</upstream>
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 6ffe7acbb6ef..d51fb381fe6e 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-
   <maintainer>
     <email>hasufell@gentoo.org</email>
     <name>Julian Ospald</name>
@@ -13,6 +11,11 @@
     <name>Luca Barbato</name>
   </maintainer>
 
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
+
   <longdescription>
     Blender, the open source software for 3D modeling, animation,
     rendering, post-production, interactive creation and playback.
diff --git a/media-gfx/brlcad/metadata.xml b/media-gfx/brlcad/metadata.xml
index 83f8886b3bf8..dc7de7f7947e 100644
--- a/media-gfx/brlcad/metadata.xml
+++ b/media-gfx/brlcad/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>dongxuli2011@gmail.com</email>
     <description>please assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG)
   solid modeling system that includes an interactive geometry editor,
diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml
index 995bd87ffbb2..3ad1d51b7fb6 100644
--- a/media-gfx/cairosvg/metadata.xml
+++ b/media-gfx/cairosvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">CairoSVG</remote-id>
   </upstream>
diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/cellwriter/metadata.xml
+++ b/media-gfx/cellwriter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/colorhug-client/metadata.xml b/media-gfx/colorhug-client/metadata.xml
index 8b406a44083e..0344105eb11f 100644
--- a/media-gfx/colorhug-client/metadata.xml
+++ b/media-gfx/colorhug-client/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>gregkh@gentoo.org</email>
 		<name>Greg Kroah-Hartman</name>
 		<description>Please CC him on bugs and assign to herd</description>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/comical/metadata.xml b/media-gfx/comical/metadata.xml
index 20cf5ef857a0..e191632318c8 100644
--- a/media-gfx/comical/metadata.xml
+++ b/media-gfx/comical/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">comical</remote-id>
 	</upstream>
diff --git a/media-gfx/comix/metadata.xml b/media-gfx/comix/metadata.xml
index 2d8ef46af84b..b42f1e0fe682 100644
--- a/media-gfx/comix/metadata.xml
+++ b/media-gfx/comix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="rar">
 		Pulls app-arch/unrar for rar file support
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index f40b4c7dfbaf..14fca4cd6cbf 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">converseen</remote-id>
 	</upstream>
diff --git a/media-gfx/cptutils/metadata.xml b/media-gfx/cptutils/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/cptutils/metadata.xml
+++ b/media-gfx/cptutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index abd4ce3d1a03..c8662273c22f 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 		<flag name="graphicsmagick">Use <pkg>media-gfx/graphicsmagick</pkg> for image importing</flag>
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
index 7e312f55fd62..98b379cffbf8 100644
--- a/media-gfx/dawn/metadata.xml
+++ b/media-gfx/dawn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   Fukui Renderer DAWN (Drawer for Academic WritiNgs) 
   is a renderer, which reads 3D geometrical data and visualize them.  
diff --git a/media-gfx/dcraw/metadata.xml b/media-gfx/dcraw/metadata.xml
index 6e97918e06d0..c27886870e97 100644
--- a/media-gfx/dcraw/metadata.xml
+++ b/media-gfx/dcraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 		This utility converts the native (RAW), format of various digital cameras into
 		netpbm portable pixmap (.ppm) image. Supports the following models: Canon,
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 6764ab604d64..d5b9761d1973 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
 <maintainer><email>dilfridge@gentoo.org</email></maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="addressbook">Add support for kdepim</flag>
 	<flag name="themedesigner">Build the digikam theme designer</flag>
diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/dispcalgui/metadata.xml
index 8d4a696bdca9..ad1f7b76eb9e 100644
--- a/media-gfx/dispcalgui/metadata.xml
+++ b/media-gfx/dispcalgui/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gentoo@xayto.net</email>
     <name>Craig Inches</name>
     <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/media-gfx/dpic/metadata.xml b/media-gfx/dpic/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/media-gfx/dpic/metadata.xml
+++ b/media-gfx/dpic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/duhdraw/metadata.xml b/media-gfx/duhdraw/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/duhdraw/metadata.xml
+++ b/media-gfx/duhdraw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/ebdftopcf/metadata.xml b/media-gfx/ebdftopcf/metadata.xml
index 0274ccfd143d..8fe8314d735f 100644
--- a/media-gfx/ebdftopcf/metadata.xml
+++ b/media-gfx/ebdftopcf/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 	<description>Maintainer and upstream author.</description>
 </maintainer>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index f4732882ad96..893f21b61e53 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <use>
     <flag name="gpu">GPU support for Enblend</flag>
     <flag name="image-cache">allow for processing of large images</flag>
diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index 48621e50c16b..5d058f1a8476 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
   <maintainer>
     <email>lu_zero@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/eog-plugins/metadata.xml b/media-gfx/eog-plugins/metadata.xml
index 041a5ae2a66d..0703e36284b2 100644
--- a/media-gfx/eog-plugins/metadata.xml
+++ b/media-gfx/eog-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="flickr">Enable uploading to Flickr</flag>
 	<flag name="map">Enable world map display using	<pkg>media-libs/libchamplain</pkg></flag>
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index c303968e7ba8..70aa68e6f360 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Eye of GNOME image viewer is the official image viewer for the GNOME
 		Desktop environment. With it, you can view single image files, as well 
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index b8d1003d2c27..181599c4bc69 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/eom</remote-id>
     </upstream>
diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index dfa41b336ccd..b2d8f575742e 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <use>
 	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
 </use>
diff --git a/media-gfx/exif/metadata.xml b/media-gfx/exif/metadata.xml
index 5c7a0372083d..c6b9f470221a 100644
--- a/media-gfx/exif/metadata.xml
+++ b/media-gfx/exif/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libexif</remote-id>
   </upstream>
diff --git a/media-gfx/exiftags/metadata.xml b/media-gfx/exiftags/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/exiftags/metadata.xml
+++ b/media-gfx/exiftags/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index c3371bd5c3aa..8232d6ff922d 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Exiv2 is a C++ library and command line utility to read and
 		write EXIF, IPTC and XMP image metadata.
diff --git a/media-gfx/feh/metadata.xml b/media-gfx/feh/metadata.xml
index 72ace7364311..210d8b32d5f9 100644
--- a/media-gfx/feh/metadata.xml
+++ b/media-gfx/feh/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
 <maintainer>
 	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <longdescription>
 feh is an image viewer at heart, though it does other cool stuff.
 </longdescription>
diff --git a/media-gfx/fondu/metadata.xml b/media-gfx/fondu/metadata.xml
index 53e8fc800d53..0ada140a6faf 100644
--- a/media-gfx/fondu/metadata.xml
+++ b/media-gfx/fondu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fondu</remote-id>
 	</upstream>
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index fdda9ca1172d..7d742dc60f4f 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription>
 	FontForge -- An outline font editor that lets you create your own
 	postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
diff --git a/media-gfx/fontypython/metadata.xml b/media-gfx/fontypython/metadata.xml
index f7359919c39a..107310296fd5 100644
--- a/media-gfx/fontypython/metadata.xml
+++ b/media-gfx/fontypython/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/fotowall/metadata.xml b/media-gfx/fotowall/metadata.xml
index 62354bfd2c85..a4e878acf0cb 100644
--- a/media-gfx/fotowall/metadata.xml
+++ b/media-gfx/fotowall/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="webcam">Enable webcam support</flag>
 	</use>
diff --git a/media-gfx/fr0st/metadata.xml b/media-gfx/fr0st/metadata.xml
index 7c84dffebda5..ad5b8f04f581 100644
--- a/media-gfx/fr0st/metadata.xml
+++ b/media-gfx/fr0st/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">fr0st</remote-id>
 	</upstream>
diff --git a/media-gfx/gif2apng/metadata.xml b/media-gfx/gif2apng/metadata.xml
index 10f3816a1001..219a836fd7d9 100644
--- a/media-gfx/gif2apng/metadata.xml
+++ b/media-gfx/gif2apng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gif2apng</remote-id>
 	</upstream>
diff --git a/media-gfx/gif2png/metadata.xml b/media-gfx/gif2png/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gif2png/metadata.xml
+++ b/media-gfx/gif2png/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gifsicle/metadata.xml b/media-gfx/gifsicle/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gifsicle/metadata.xml
+++ b/media-gfx/gifsicle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml
index 930b43de954c..75bec1677259 100644
--- a/media-gfx/gimageview/metadata.xml
+++ b/media-gfx/gimageview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkmmviewer</remote-id>
 	</upstream>
diff --git a/media-gfx/gimmage/metadata.xml b/media-gfx/gimmage/metadata.xml
index 80e97c37d478..6bd4331efad4 100644
--- a/media-gfx/gimmage/metadata.xml
+++ b/media-gfx/gimmage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		gimmage: the gtkmm image viewer
 	</longdescription>
diff --git a/media-gfx/gliv/metadata.xml b/media-gfx/gliv/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gliv/metadata.xml
+++ b/media-gfx/gliv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 250b14f8c1c7..c050add39377 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="graphicsmagick">Enable support for many common image file formats using the GraphicsMagick++ library</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index 4e0171efad95..f80eeaa048a5 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnofract4d</remote-id>
 	</upstream>
diff --git a/media-gfx/gnome-font-viewer/metadata.xml b/media-gfx/gnome-font-viewer/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-font-viewer/metadata.xml
+++ b/media-gfx/gnome-font-viewer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-photos/metadata.xml
+++ b/media-gfx/gnome-photos/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gnome-raw-thumbnailer/metadata.xml b/media-gfx/gnome-raw-thumbnailer/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/media-gfx/gnome-raw-thumbnailer/metadata.xml
+++ b/media-gfx/gnome-raw-thumbnailer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gnome-screenshot/metadata.xml b/media-gfx/gnome-screenshot/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-screenshot/metadata.xml
+++ b/media-gfx/gnome-screenshot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gnome-specimen/metadata.xml b/media-gfx/gnome-specimen/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gnome-specimen/metadata.xml
+++ b/media-gfx/gnome-specimen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index f0e3725b295f..cfab7e58e267 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gphotofs/metadata.xml b/media-gfx/gphotofs/metadata.xml
index 8f88f2314eed..cef2527f569f 100644
--- a/media-gfx/gphotofs/metadata.xml
+++ b/media-gfx/gphotofs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
 	<maintainer>
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml
index 30802789f1b2..dda8d886b84e 100644
--- a/media-gfx/gpicview/metadata.xml
+++ b/media-gfx/gpicview/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>lxde</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
 	</upstream>
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index e0c49a133083..18e82b531893 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 		<name>Michael Sterrett</name>
 	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gqview</remote-id>
 	</upstream>
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 09f36fa05818..39b4575b486a 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription lang="en">
   This is a port of GraphicsMagick(TM), the "swiss army knife" of
   image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/graphite2/metadata.xml b/media-gfx/graphite2/metadata.xml
index 46f34458c158..5869736230ba 100644
--- a/media-gfx/graphite2/metadata.xml
+++ b/media-gfx/graphite2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">silgraphite</remote-id>
 	</upstream>
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 4772c3130252..424fb7e4bfc3 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>
 graphviz  is a set of graph drawing tools for Unix or MS-Windows 
 (win32), including a web service interface (webdot). Source code and 
diff --git a/media-gfx/grub-splashes/metadata.xml b/media-gfx/grub-splashes/metadata.xml
index 17bf9b50f5e7..52101d55b38d 100644
--- a/media-gfx/grub-splashes/metadata.xml
+++ b/media-gfx/grub-splashes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <longdescription>
 A collection of grub themes provided and maintained by the Gentoo Artwork project
 </longdescription>
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 3a949feaea9f..e8a7ac6107f2 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
diff --git a/media-gfx/gtkam/metadata.xml b/media-gfx/gtkam/metadata.xml
index f0e3725b295f..cfab7e58e267 100644
--- a/media-gfx/gtkam/metadata.xml
+++ b/media-gfx/gtkam/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gtkimageview/metadata.xml b/media-gfx/gtkimageview/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/gtkimageview/metadata.xml
+++ b/media-gfx/gtkimageview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/hp2xx/metadata.xml b/media-gfx/hp2xx/metadata.xml
index 6f8798ceede2..30290434cc85 100644
--- a/media-gfx/hp2xx/metadata.xml
+++ b/media-gfx/hp2xx/metadata.xml
@@ -5,6 +5,12 @@
 		<email>konstantin@muenning.com</email>
 		<name>Konstantin Münning</name>
 	</maintainer>
-	<herd>printing</herd>
-	<herd>proxy-maintainers</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 68c618299a63..0febb0af7e52 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>hugin is a panorama stitching program</longdescription>
   <use>
     <flag name="sift">automatically align images with
diff --git a/media-gfx/icon-slicer/metadata.xml b/media-gfx/icon-slicer/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/icon-slicer/metadata.xml
+++ b/media-gfx/icon-slicer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index ea5470657aae..a2a255f39326 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<herd>proxy-maintainers</herd>
-        <maintainer>
+		<maintainer>
                 <email>res@crystalspace3d.org</email>
                 <name>Frank Richter (upstream)</name>
         </maintainer>
@@ -10,4 +9,8 @@
                 <email>patrick@gentoo.org</email>
                 <name>Patrick Lauer (proxy)</name>
         </maintainer>
+<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml
index 4f711930ce13..d79fc62467f7 100644
--- a/media-gfx/igal/metadata.xml
+++ b/media-gfx/igal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		iGal is a Perl program that can generate and publish an entire online
 		picture show (static HTML slides, thumbnails and index page) with just
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index aef99b918509..9e914b527f3f 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <use>
     <flag name="autotrace">Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
     <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index df4bab735af7..d111c5dd18fd 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <use>
     <flag name="cdr">Enable support for CorelDRAW Diagrams</flag>
     <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
diff --git a/media-gfx/ipe/metadata.xml b/media-gfx/ipe/metadata.xml
index a92043c8c104..c42db525957a 100644
--- a/media-gfx/ipe/metadata.xml
+++ b/media-gfx/ipe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Ipe is a drawing editor for creating figures in PDF or
   (encapsulated) Postscript format. Ipe supports making small figures
diff --git a/media-gfx/iscan-data/metadata.xml b/media-gfx/iscan-data/metadata.xml
index ef34db7e8ac3..ff9e65d3d1fd 100644
--- a/media-gfx/iscan-data/metadata.xml
+++ b/media-gfx/iscan-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mattsch@gmail.com</email>
 		<name>Matthew Schultz</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Provides the necessary support files for Image Scan! for Linux,
 		including device information and policy file generation logic.
diff --git a/media-gfx/iscan-plugin-gt-x770/metadata.xml b/media-gfx/iscan-plugin-gt-x770/metadata.xml
index 2b67f8ab7eb6..5f88cbfd7ed9 100644
--- a/media-gfx/iscan-plugin-gt-x770/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x770/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>mattsch@gmail.com</email>
   </maintainer>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan-plugin-gt-x820/metadata.xml b/media-gfx/iscan-plugin-gt-x820/metadata.xml
index 16393b245a9d..9f586d066cf5 100644
--- a/media-gfx/iscan-plugin-gt-x820/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x820/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nitro@legroom.net</email>
   </maintainer>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index c36e6d4286c6..8a3d74649564 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mattsch@gmail.com</email>
 		<name>Matthew Schultz</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Image Scan! is a graphical scanner utility for people that do not need all
 		the bells and whistles provided by several of the other utilities out there
diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jhead/metadata.xml
+++ b/media-gfx/jhead/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jigl/metadata.xml b/media-gfx/jigl/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/jigl/metadata.xml
+++ b/media-gfx/jigl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index 4048f766a6e5..084de8957f2b 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+  </maintainer>
 <use>
 	<flag name="metric">
 		Default to A4 paper size
diff --git a/media-gfx/jpeginfo/metadata.xml b/media-gfx/jpeginfo/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jpeginfo/metadata.xml
+++ b/media-gfx/jpeginfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jpegoptim/metadata.xml b/media-gfx/jpegoptim/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jpegoptim/metadata.xml
+++ b/media-gfx/jpegoptim/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jpegpixi/metadata.xml b/media-gfx/jpegpixi/metadata.xml
index 3dc83742cd89..1b6ad21449e2 100644
--- a/media-gfx/jpegpixi/metadata.xml
+++ b/media-gfx/jpegpixi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 		Almost lossless JPEG pixel interpolator, for correcting digital camera
 		defects.
diff --git a/media-gfx/jpegtoavi/metadata.xml b/media-gfx/jpegtoavi/metadata.xml
index 69de869b54a4..98e76403b67d 100644
--- a/media-gfx/jpegtoavi/metadata.xml
+++ b/media-gfx/jpegtoavi/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">jpegtoavi</remote-id>
   </upstream>
diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
index 815649b187cb..0f3a16d6d3fc 100644
--- a/media-gfx/k3d/metadata.xml
+++ b/media-gfx/k3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="3ds">Enable support for 3D Studio models</flag>
 		<flag name="cuda">Use nvidia cuda toolkit for speeding up
diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kcoloredit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kcoloredit/metadata.xml
+++ b/media-gfx/kcoloredit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kfax/metadata.xml b/media-gfx/kfax/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kfax/metadata.xml
+++ b/media-gfx/kfax/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kflickr/metadata.xml b/media-gfx/kflickr/metadata.xml
index 850777e1942d..8d67957597a8 100644
--- a/media-gfx/kflickr/metadata.xml
+++ b/media-gfx/kflickr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription>KDE App for easy upload of your favourite photos to your Flickr.com account</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">kflickr</remote-id>
diff --git a/media-gfx/kgrab/metadata.xml b/media-gfx/kgrab/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kgrab/metadata.xml
+++ b/media-gfx/kgrab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kgraphviewer/metadata.xml b/media-gfx/kgraphviewer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/kgraphviewer/metadata.xml
+++ b/media-gfx/kgraphviewer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kiconedit/metadata.xml b/media-gfx/kiconedit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kiconedit/metadata.xml
+++ b/media-gfx/kiconedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index eed8e30287bc..e2feaf100685 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="face">Enable face detection and recognition using <pkg>kde-apps/libkface</pkg></flag>
 		<flag name="geolocation">Add support for <pkg>kde-apps/marble</pkg></flag>
diff --git a/media-gfx/kpovmodeler/metadata.xml b/media-gfx/kpovmodeler/metadata.xml
index 965fe97f7312..65ed8a3d7f88 100644
--- a/media-gfx/kpovmodeler/metadata.xml
+++ b/media-gfx/kpovmodeler/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kuickshow/metadata.xml
+++ b/media-gfx/kuickshow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/kxstitch/metadata.xml b/media-gfx/kxstitch/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/kxstitch/metadata.xml
+++ b/media-gfx/kxstitch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index 83d1a5939755..5b4bc34e7092 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
 <maintainer>
   <email>aballier@gentoo.org</email>
   <name>Alexis Ballier</name>
 </maintainer>
+<maintainer>
+  <email>graphics@gentoo.org</email>
+  <name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml
index 8496ad6a2fad..e6490afb955e 100644
--- a/media-gfx/luminance-hdr/metadata.xml
+++ b/media-gfx/luminance-hdr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	Qtpfsgui is an open source graphical user interface application that aims
 	to provide a workflow for HDR imaging.
diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/media-gfx/lximage-qt/metadata.xml
+++ b/media-gfx/lximage-qt/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index f34f1d95dc92..2f318a3d0112 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 		Mandelbulber is an easy to use, handy but experimental application 
 		designed to help you render 3D Mandelbrot fractals called Mandelbulb 
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index 7cb3023cf69d..09099b933593 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
   <maintainer>
     <email>rhill@gentoo.org</email>
     <name>Ryan Hill</name>
   </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
   </upstream>
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 5ef1f3b61674..4f96de83a86e 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>3dprint</herd>
 	<maintainer>
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D print</name>
+	</maintainer>
 	<longdescription lang="en">
  Printrun is a set of G-code sending applications for RepRap.
  It consists of printcore (dumb G-code sender), pronsole (featured command line
diff --git a/media-gfx/metapixel/metadata.xml b/media-gfx/metapixel/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/metapixel/metadata.xml
+++ b/media-gfx/metapixel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/mirage/metadata.xml b/media-gfx/mirage/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/mirage/metadata.xml
+++ b/media-gfx/mirage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/mscgen/metadata.xml b/media-gfx/mscgen/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/mscgen/metadata.xml
+++ b/media-gfx/mscgen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/nip2/metadata.xml b/media-gfx/nip2/metadata.xml
index 68e745047f19..d374e3db9318 100644
--- a/media-gfx/nip2/metadata.xml
+++ b/media-gfx/nip2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="goffice">use <pkg>x11-libs/goffice</pkg> to show plots</flag>
 	</use>
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 0025d46170c3..e357da6f50d0 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nomacs</remote-id>
 		<bugs-to>http://www.nomacs.org/redmine/projects/nomacs</bugs-to>
diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index 27668c513a99..a122b2de3c02 100644
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>
 The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
 use with both leading graphics APIs, runtime libraries for CgFX, example
diff --git a/media-gfx/opcion/metadata.xml b/media-gfx/opcion/metadata.xml
index 4a2bc1931f55..de6d7ddc738e 100644
--- a/media-gfx/opcion/metadata.xml
+++ b/media-gfx/opcion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opcion</remote-id>
 	</upstream>
diff --git a/media-gfx/openclipart/metadata.xml b/media-gfx/openclipart/metadata.xml
index 7600f7a1fc40..4369682fb872 100644
--- a/media-gfx/openclipart/metadata.xml
+++ b/media-gfx/openclipart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="gzip">Compresses clip art using gzip</flag>
 	</use>
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index 505d9f262d83..2751c7df7801 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-gfx/paint-mono/metadata.xml b/media-gfx/paint-mono/metadata.xml
index 3e1ab24888e2..5bc7f336a19e 100644
--- a/media-gfx/paint-mono/metadata.xml
+++ b/media-gfx/paint-mono/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">paint-mono</remote-id>
 		<remote-id type="github">shana/paint-mono</remote-id>
diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index 8f3639ff8807..71f148b64b3e 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pvqt</remote-id>
 	</upstream>
diff --git a/media-gfx/pdf2svg/metadata.xml b/media-gfx/pdf2svg/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/pdf2svg/metadata.xml
+++ b/media-gfx/pdf2svg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
index 073e1fa4a9f2..51cde55380f3 100644
--- a/media-gfx/photivo/metadata.xml
+++ b/media-gfx/photivo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>opensource@andmarios.com</email>
 		<name>Marios Andreopoulos</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">photivo</remote-id>
 		<bugs-to>https://code.google.com/p/photivo/issues/list</bugs-to>
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index 399fbb27eb24..55326bef8f88 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="exiv2">
       Use <pkg>media-gfx/exiv2</pkg> as optional dependency
diff --git a/media-gfx/phototonic/metadata.xml b/media-gfx/phototonic/metadata.xml
index 56722af239a3..344862a94a01 100644
--- a/media-gfx/phototonic/metadata.xml
+++ b/media-gfx/phototonic/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">oferkv/phototonic</remote-id>
   </upstream>
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
index 7135366e52fa..eedc4f4ab0c3 100644
--- a/media-gfx/pinta/metadata.xml
+++ b/media-gfx/pinta/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>axelgenus@gmail.com</email>
 		<name>Alessandro Calorì</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>cameronwhite91@gmail.com</email>
diff --git a/media-gfx/pixie/metadata.xml b/media-gfx/pixie/metadata.xml
index 9dc1ecece7da..7a445a8b9359 100644
--- a/media-gfx/pixie/metadata.xml
+++ b/media-gfx/pixie/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
     <description>Proxying maintainer</description>
@@ -10,6 +9,10 @@
     <email>toffanin.mauro@gmail.com</email>
     <description>Proxied maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Pixie is an open source photorealistic renderer that uses a RenderMan-like
     interface. Features include programmable shading, motion blur, depth of
diff --git a/media-gfx/plantuml/metadata.xml b/media-gfx/plantuml/metadata.xml
index cbdad507dd9f..799e80b73f0c 100644
--- a/media-gfx/plantuml/metadata.xml
+++ b/media-gfx/plantuml/metadata.xml
@@ -5,7 +5,10 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	PlantUMLis a component that allows to quickly write: sequence diagram, use
 	case diagram, class diagram, activity diagram, component diagram, state
diff --git a/media-gfx/png2ico/metadata.xml b/media-gfx/png2ico/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/png2ico/metadata.xml
+++ b/media-gfx/png2ico/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pngcheck/metadata.xml b/media-gfx/pngcheck/metadata.xml
index 8e5a86cf66d2..c9899d2fc4e0 100644
--- a/media-gfx/pngcheck/metadata.xml
+++ b/media-gfx/pngcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">png-mng</remote-id>
 	</upstream>
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index bbdda004cb79..e642b9ab15a2 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>glennrp@gmail.com</email>
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 5c413eb1ea87..712298c2ecf9 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>alex_y_xu@yahoo.ca</email>
     <name>Alex Xu</name>
     <description>Proxied maintainer</description>
   </maintainer>
+<maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pngrewrite/metadata.xml b/media-gfx/pngrewrite/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/pngrewrite/metadata.xml
+++ b/media-gfx/pngrewrite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pngtools/metadata.xml b/media-gfx/pngtools/metadata.xml
index 97d39bb23a76..b4b30b89ec7b 100644
--- a/media-gfx/pngtools/metadata.xml
+++ b/media-gfx/pngtools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>graphics@gentoo.org</email>
+  <name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/postr/metadata.xml b/media-gfx/postr/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/postr/metadata.xml
+++ b/media-gfx/postr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/potrace/metadata.xml b/media-gfx/potrace/metadata.xml
index 9768ddf6ae63..fddaeb1696c5 100644
--- a/media-gfx/potrace/metadata.xml
+++ b/media-gfx/potrace/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="metric">
 			default to a4 paper size and metric measurement
diff --git a/media-gfx/povtree/metadata.xml b/media-gfx/povtree/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/povtree/metadata.xml
+++ b/media-gfx/povtree/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index 09572f4b3efe..836a7b3e9101 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>phillip.berndt@googlemail.com</email>
diff --git a/media-gfx/pqstego/metadata.xml b/media-gfx/pqstego/metadata.xml
index 6183a8f271b6..f7cb40052005 100644
--- a/media-gfx/pqstego/metadata.xml
+++ b/media-gfx/pqstego/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pqstego</remote-id>
   </upstream>
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
index b2ffe0a55b80..4e0e29ecb1af 100644
--- a/media-gfx/printrun/metadata.xml
+++ b/media-gfx/printrun/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>3dprint</herd>
 	<maintainer>
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D print</name>
+	</maintainer>
 	<longdescription lang="en">
  Printrun is a set of G-code sending applications for RepRap.
  It consists of printcore (dumb G-code sender), pronsole (featured command line
diff --git a/media-gfx/psftools/metadata.xml b/media-gfx/psftools/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-gfx/psftools/metadata.xml
+++ b/media-gfx/psftools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml
index 3ce910543639..303ada526391 100644
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>tex</herd>
-  <herd>printing</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
     <flag name="flash">Enable <pkg>media-libs/ming</pkg> SWF support</flag>
diff --git a/media-gfx/pydot/metadata.xml b/media-gfx/pydot/metadata.xml
index b11b15cd9f32..14e965ada9b6 100644
--- a/media-gfx/pydot/metadata.xml
+++ b/media-gfx/pydot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>Python bindings for Graphviz</longdescription>
   <upstream>
     <remote-id type="google-code">pydot</remote-id>
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 978159afc5ac..46ce30920e8f 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 	</use>
diff --git a/media-gfx/qiviewer/metadata.xml b/media-gfx/qiviewer/metadata.xml
index 77264be218d8..a5640bef3060 100644
--- a/media-gfx/qiviewer/metadata.xml
+++ b/media-gfx/qiviewer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="webp">Build support for WEBP image format</flag>
 	</use>
diff --git a/media-gfx/qosmic/metadata.xml b/media-gfx/qosmic/metadata.xml
index a1247f0f8286..45bb9586e496 100644
--- a/media-gfx/qosmic/metadata.xml
+++ b/media-gfx/qosmic/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>qt</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">qosmic</remote-id>
 	</upstream>
diff --git a/media-gfx/qvv/metadata.xml b/media-gfx/qvv/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/qvv/metadata.xml
+++ b/media-gfx/qvv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 65b786ac033f..cc4d36ccb0f4 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">raw-thumbnailer</remote-id>
 		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/rotoscope/metadata.xml b/media-gfx/rotoscope/metadata.xml
index 57ee4c30506e..95f6ab045502 100644
--- a/media-gfx/rotoscope/metadata.xml
+++ b/media-gfx/rotoscope/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rotoscope</remote-id>
 	</upstream>
diff --git a/media-gfx/sam2p/metadata.xml b/media-gfx/sam2p/metadata.xml
index 8c6fbf3b4e63..4fc84594994c 100644
--- a/media-gfx/sam2p/metadata.xml
+++ b/media-gfx/sam2p/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">sam2p</remote-id>
 	</upstream>
diff --git a/media-gfx/scantailor/metadata.xml b/media-gfx/scantailor/metadata.xml
index 84bf0479f90f..945175095646 100644
--- a/media-gfx/scantailor/metadata.xml
+++ b/media-gfx/scantailor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">scantailor</remote-id>
   </upstream>
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index 39922da90f27..e463ad0a34a8 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>sff to bmp converter</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sfftools</remote-id>
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index fe9e3eaa0b39..b81654077d3c 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription lang="en">
 	Shotwell is a digital photo organizer designed for the GNOME desktop
 	environment. It allows you to import photos from disk or camera, organize
diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index 66fd1959cc77..dcb57f299635 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		A really easy way to scan both documents and photos. You can crop out
 		the bad parts of a photo and rotate it if it is the wrong way round.
diff --git a/media-gfx/splash-themes-livecd/metadata.xml b/media-gfx/splash-themes-livecd/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/media-gfx/splash-themes-livecd/metadata.xml
+++ b/media-gfx/splash-themes-livecd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/splash-themes-livedvd/metadata.xml b/media-gfx/splash-themes-livedvd/metadata.xml
index fd827a8640da..986bb5499d61 100644
--- a/media-gfx/splash-themes-livedvd/metadata.xml
+++ b/media-gfx/splash-themes-livedvd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <longdescription lang="en">
 A collection of Gentoo themes for splashutils.
 </longdescription>
@@ -9,5 +8,12 @@ A collection of Gentoo themes for splashutils.
   <email>email@missionaccomplish.com</email>
   <name>Fernando Orocu</name>
 </maintainer>
-<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml
index bd1cf9583173..86cba6c36594 100644
--- a/media-gfx/splashutils/metadata.xml
+++ b/media-gfx/splashutils/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>asaf.gery@gmail.com</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="fbcondecor">
 		Support for the fbcondecor kernel patch.
diff --git a/media-gfx/structure-synth/metadata.xml b/media-gfx/structure-synth/metadata.xml
index f40803ba438d..d6e7b6f49d11 100644
--- a/media-gfx/structure-synth/metadata.xml
+++ b/media-gfx/structure-synth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">structuresynth</remote-id>
   </upstream>
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index edf9479ddd04..4f209cc47bf6 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 		The tool can be used as a console application to convert SVG to PDF
 		files.
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
index 58236c941bbb..c753635475e2 100644
--- a/media-gfx/swftools/metadata.xml
+++ b/media-gfx/swftools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>dblaci@dblaci.hu</email>
 	<description>Please assign bugs</description>
@@ -10,4 +9,8 @@
 	<email>pacho@gentoo.org</email>
 	<description>proxy-maintainer, please CC on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index 1a6425684731..ea13346a3a20 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">muennich/sxiv</remote-id>
   </upstream>
diff --git a/media-gfx/symboleditor/metadata.xml b/media-gfx/symboleditor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/symboleditor/metadata.xml
+++ b/media-gfx/symboleditor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/tachyon/metadata.xml b/media-gfx/tachyon/metadata.xml
index e7b28c02178f..0594d0592f13 100644
--- a/media-gfx/tachyon/metadata.xml
+++ b/media-gfx/tachyon/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>alexxy@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/tic98/metadata.xml b/media-gfx/tic98/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/tic98/metadata.xml
+++ b/media-gfx/tic98/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/tif22pnm/metadata.xml b/media-gfx/tif22pnm/metadata.xml
index 8c6fbf3b4e63..4fc84594994c 100644
--- a/media-gfx/tif22pnm/metadata.xml
+++ b/media-gfx/tif22pnm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">sam2p</remote-id>
 	</upstream>
diff --git a/media-gfx/tintii/metadata.xml b/media-gfx/tintii/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/tintii/metadata.xml
+++ b/media-gfx/tintii/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/tuxpaint-stamps/metadata.xml b/media-gfx/tuxpaint-stamps/metadata.xml
index 74f748621c92..9a12d140f4c2 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>
   These are additional stamps for the Tux Paint drawing program.
 </longdescription>
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index 251afdaea786..bf4c65bcb6d3 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>
   Tux Paint is a free drawing program designed for young children
   (kids ages 3 and up). It has a simple, easy-to-use interface, fun
diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index 56bf6e46d23e..c9dc099bbb11 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="contrast">
 			enable contrast setting option
diff --git a/media-gfx/uniconvertor/metadata.xml b/media-gfx/uniconvertor/metadata.xml
index b66884cd1c1d..3b3e78815f10 100644
--- a/media-gfx/uniconvertor/metadata.xml
+++ b/media-gfx/uniconvertor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">uniconvertor</remote-id>
   </upstream>
diff --git a/media-gfx/wally/metadata.xml b/media-gfx/wally/metadata.xml
index 60f988e1b73e..7c23b4748651 100644
--- a/media-gfx/wally/metadata.xml
+++ b/media-gfx/wally/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wally</remote-id>
   </upstream>
diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index 1faadf36651d..0f9b526550f8 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 Wings 3D is a polygon mesh modeler inspired by Nendo and 
 Mirai from Izware.
diff --git a/media-gfx/wkhtmltopdf/metadata.xml b/media-gfx/wkhtmltopdf/metadata.xml
index 9022e05f424b..7d1db7cd52ec 100644
--- a/media-gfx/wkhtmltopdf/metadata.xml
+++ b/media-gfx/wkhtmltopdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id>
 	</upstream>
diff --git a/media-gfx/xli/metadata.xml b/media-gfx/xli/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/xli/metadata.xml
+++ b/media-gfx/xli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xloadimage/metadata.xml b/media-gfx/xloadimage/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/xloadimage/metadata.xml
+++ b/media-gfx/xloadimage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index f4ee3494255f..b2bf15a15461 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<herd>graphics</herd>
 <maintainer>
 	<email>pacho@gentoo.org</email>
 </maintainer>
+<maintainer>
+        <email>printing@gentoo.org</email>
+        <name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+        <email>graphics@gentoo.org</email>
+        <name>Gentoo Graphics Project</name>
+</maintainer>
 <use>
         <flag name="ocr">Enable support for Optical Character Recognition reader</flag>
 </use>
diff --git a/media-gfx/xsvg/metadata.xml b/media-gfx/xsvg/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/xsvg/metadata.xml
+++ b/media-gfx/xsvg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
index d78b1f849f9b..fd7fcca213f9 100644
--- a/media-gfx/xzgv/metadata.xml
+++ b/media-gfx/xzgv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xzgv</remote-id>
 	</upstream>
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 058d1eb998a8..1b341d030d6c 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <longdescription lang="en">
 YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
 An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
diff --git a/media-libs/FusionSound/metadata.xml b/media-libs/FusionSound/metadata.xml
index 5e71b4c24efb..6ee7c71b8a27 100644
--- a/media-libs/FusionSound/metadata.xml
+++ b/media-libs/FusionSound/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 9f049b0e14b9..cd5a9ae375ce 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
   <maintainer>
     <email>sci-physics@gentoo.org</email>
     <description>Feel free to maintain/fix</description>
diff --git a/media-libs/a52dec/metadata.xml b/media-libs/a52dec/metadata.xml
index 74493e67165a..2750253df5a4 100644
--- a/media-libs/a52dec/metadata.xml
+++ b/media-libs/a52dec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="djbfft">Prefer D.J. Bernstein's library for fourier transforms</flag>
   </use>
diff --git a/media-libs/aalib/metadata.xml b/media-libs/aalib/metadata.xml
index b89813c0f491..9cba32157005 100644
--- a/media-libs/aalib/metadata.xml
+++ b/media-libs/aalib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/adplug/metadata.xml b/media-libs/adplug/metadata.xml
index 88d380c3ac81..2fed612d2400 100644
--- a/media-libs/adplug/metadata.xml
+++ b/media-libs/adplug/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">adplug</remote-id>
 	</upstream>
diff --git a/media-libs/aften/metadata.xml b/media-libs/aften/metadata.xml
index 27e3137c34a7..07a63fb9f164 100644
--- a/media-libs/aften/metadata.xml
+++ b/media-libs/aften/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Aften is an audio encoder which generates compressed audio streams based
 		on ATSC A/52 specification. This type of audio is also known as AC-3 or
diff --git a/media-libs/aldumb/metadata.xml b/media-libs/aldumb/metadata.xml
index ae7b4a0b0ad5..0efe24573715 100644
--- a/media-libs/aldumb/metadata.xml
+++ b/media-libs/aldumb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dumb</remote-id>
 	</upstream>
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 7d103d5f8d67..23295124aaca 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Allegro is a game programming library for C/C++ developers distributed
 freely, supporting the following platforms: DOS, Unix (Linux, FreeBSD,
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
index 0ea67aec405a..0973a22eaf20 100644
--- a/media-libs/alsa-lib/metadata.xml
+++ b/media-libs/alsa-lib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>alsa</herd>
   <maintainer>
     <email>alsa-bugs@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/alsa-oss/metadata.xml b/media-libs/alsa-oss/metadata.xml
index 8987e55f2c06..f16125d4f480 100644
--- a/media-libs/alsa-oss/metadata.xml
+++ b/media-libs/alsa-oss/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>alsa</herd>
 <maintainer>
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/alure/metadata.xml b/media-libs/alure/metadata.xml
index d2599dbf709f..caf0a4baf955 100644
--- a/media-libs/alure/metadata.xml
+++ b/media-libs/alure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="dumb">Enable <pkg>media-libs/dumb</pkg> module library support</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis</flag>
diff --git a/media-libs/aubio/metadata.xml b/media-libs/aubio/metadata.xml
index 89e25f6460e8..0eb93d14bd73 100644
--- a/media-libs/aubio/metadata.xml
+++ b/media-libs/aubio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<use>
 		<flag name="double-precision">Compile in double precision mode.</flag>
 	</use>
diff --git a/media-libs/audiofile/metadata.xml b/media-libs/audiofile/metadata.xml
index b016c18b5446..661a15a3b950 100644
--- a/media-libs/audiofile/metadata.xml
+++ b/media-libs/audiofile/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index eca3d560ed57..30fafcbabdb9 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 795f8bbed276..39b3a41f11bf 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
diff --git a/media-libs/bio2jack/metadata.xml b/media-libs/bio2jack/metadata.xml
index 43393326f925..e856506354cb 100644
--- a/media-libs/bio2jack/metadata.xml
+++ b/media-libs/bio2jack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bio2jack</remote-id>
 	</upstream>
diff --git a/media-libs/blib/metadata.xml b/media-libs/blib/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/blib/metadata.xml
+++ b/media-libs/blib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/ccaudio2/metadata.xml b/media-libs/ccaudio2/metadata.xml
index 60c7f53239ef..c5570c3e872e 100644
--- a/media-libs/ccaudio2/metadata.xml
+++ b/media-libs/ccaudio2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/celt/metadata.xml b/media-libs/celt/metadata.xml
index 07e45eced00b..7cdf3557a104 100644
--- a/media-libs/celt/metadata.xml
+++ b/media-libs/celt/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>tgurr@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 		CELT is a very low delay audio codec designed for high-quality
 		communications.
diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index 43c573448c82..015a1f28be04 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="tools">Build and install fpcalc and fpcollect tools</flag>
   </use>
diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml
index fe1493dba75c..755b43b17bb3 100644
--- a/media-libs/cimg/metadata.xml
+++ b/media-libs/cimg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cimg</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=96492</bugs-to>
diff --git a/media-libs/clutter-gst/metadata.xml b/media-libs/clutter-gst/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-libs/clutter-gst/metadata.xml
+++ b/media-libs/clutter-gst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/clutter-gtk/metadata.xml b/media-libs/clutter-gtk/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-libs/clutter-gtk/metadata.xml
+++ b/media-libs/clutter-gtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index e82af824d4b8..508ea95b37b9 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="egl">Enable EGL backend.</flag>
 	<flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index 465b183131a8..ee35510a6189 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 	<flag name="kms">Enable KMS support.</flag>
diff --git a/media-libs/compface/metadata.xml b/media-libs/compface/metadata.xml
index 01f3621f3cda..635dc9e13ba5 100644
--- a/media-libs/compface/metadata.xml
+++ b/media-libs/compface/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/ctl/metadata.xml b/media-libs/ctl/metadata.xml
index de95417e2be2..1f5be3474040 100644
--- a/media-libs/ctl/metadata.xml
+++ b/media-libs/ctl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 30db632a5379..7928ca1e4665 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="allegro">Add support for Allegro</flag>
     <flag name="nvtt">Add support for <pkg>dev-util/nvidia-texture-tools</pkg></flag>
diff --git a/media-libs/dssi/metadata.xml b/media-libs/dssi/metadata.xml
index ecc06c7ce1db..27c2236954f9 100644
--- a/media-libs/dssi/metadata.xml
+++ b/media-libs/dssi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dssi</remote-id>
 	</upstream>
diff --git a/media-libs/dumb/metadata.xml b/media-libs/dumb/metadata.xml
index ef5cb01f98d2..c36fea69e31c 100644
--- a/media-libs/dumb/metadata.xml
+++ b/media-libs/dumb/metadata.xml
@@ -5,7 +5,10 @@
 		<email>joker@gentoo.org</email>
 		<name>Christian Birchinger</name>
 	</maintainer>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dumb</remote-id>
 	</upstream>
diff --git a/media-libs/edje/metadata.xml b/media-libs/edje/metadata.xml
index 799168dc72e7..581b09eec8b7 100644
--- a/media-libs/edje/metadata.xml
+++ b/media-libs/edje/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="cache">Enable caching</flag>
 </use>
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index 2d945fa8205d..15182cfa918f 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="quicklaunch">Enable quick-launch support</flag>
 </use>
diff --git a/media-libs/emfengine/metadata.xml b/media-libs/emfengine/metadata.xml
index 4bf6dbc6b1ea..bd11e068faaf 100644
--- a/media-libs/emfengine/metadata.xml
+++ b/media-libs/emfengine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>sci@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 225efc963526..9b032006b535 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="vlc">Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
 </use>
diff --git a/media-libs/esdl/metadata.xml b/media-libs/esdl/metadata.xml
index 969ea43fe180..3580f39cea3e 100644
--- a/media-libs/esdl/metadata.xml
+++ b/media-libs/esdl/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
   <maintainer>
     <email>george@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription>
 ESDL - What is that?
 
diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
index a54dd9c166cc..8905f42418af 100644
--- a/media-libs/ethumb/metadata.xml
+++ b/media-libs/ethumb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="emotion">Add support for <pkg>media-libs/emotion</pkg></flag>
 </use>
diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index fb7ffeebcd1c..13178216fef9 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="bmp">Support windows bitmap (bmp) image loader</flag>
 	<flag name="eet">Support dev-libs/eet</flag>
diff --git a/media-libs/exempi/metadata.xml b/media-libs/exempi/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/media-libs/exempi/metadata.xml
+++ b/media-libs/exempi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/exiftool/metadata.xml b/media-libs/exiftool/metadata.xml
index 8ba0ae9d57de..8b634fcab82a 100644
--- a/media-libs/exiftool/metadata.xml
+++ b/media-libs/exiftool/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>perl</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<longdescription>ExifTool is a platform-independent Perl library plus a
       command-line application for reading, writing and editing meta
       information in image, audio and video files. ExifTool supports
diff --git a/media-libs/faac/metadata.xml b/media-libs/faac/metadata.xml
index da0ce7d9131e..6bf33cadcd1d 100644
--- a/media-libs/faac/metadata.xml
+++ b/media-libs/faac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">faac</remote-id>
 	</upstream>
diff --git a/media-libs/faad2/metadata.xml b/media-libs/faad2/metadata.xml
index 3cd31fce10b9..9bf0301c2a26 100644
--- a/media-libs/faad2/metadata.xml
+++ b/media-libs/faad2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files</longdescription>
   <use>
     <flag name="digitalradio">Digital Radio Mondiale (warning: disables other decoders)</flag>
diff --git a/media-libs/fdk-aac/metadata.xml b/media-libs/fdk-aac/metadata.xml
index 8503e5e2cc11..1c8eac2ec003 100644
--- a/media-libs/fdk-aac/metadata.xml
+++ b/media-libs/fdk-aac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">Fraunhofer FDK AAC Codec Library for Android</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">opencore-amr</remote-id>
diff --git a/media-libs/ffmpegsource/metadata.xml b/media-libs/ffmpegsource/metadata.xml
index 88c4964cd5ed..dc896732e058 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
@@ -15,6 +14,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">FFMS/ffms2</remote-id>
 	</upstream>
diff --git a/media-libs/fidlib/metadata.xml b/media-libs/fidlib/metadata.xml
index af0275e2998a..7ae4362bbf0f 100644
--- a/media-libs/fidlib/metadata.xml
+++ b/media-libs/fidlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/flac/metadata.xml b/media-libs/flac/metadata.xml
index a2b8f3b8933f..dc6b232d9597 100644
--- a/media-libs/flac/metadata.xml
+++ b/media-libs/flac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">flac</remote-id>
 	</upstream>
diff --git a/media-libs/flickcurl/metadata.xml b/media-libs/flickcurl/metadata.xml
index bbe3ae036794..ecbd04f84a11 100644
--- a/media-libs/flickcurl/metadata.xml
+++ b/media-libs/flickcurl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="raptor">Use <pkg>media-libs/raptor</pkg> for proper RDF serializing</flag>
 	</use>
diff --git a/media-libs/fluidsynth-dssi/metadata.xml b/media-libs/fluidsynth-dssi/metadata.xml
index 8fd4eb63c1fb..83da604977fc 100644
--- a/media-libs/fluidsynth-dssi/metadata.xml
+++ b/media-libs/fluidsynth-dssi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">dssi</remote-id>
   </upstream>
diff --git a/media-libs/fmod/metadata.xml b/media-libs/fmod/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/fmod/metadata.xml
+++ b/media-libs/fmod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/fontconfig-infinality/metadata.xml b/media-libs/fontconfig-infinality/metadata.xml
index 3d5889849e10..3f364ac910b5 100644
--- a/media-libs/fontconfig-infinality/metadata.xml
+++ b/media-libs/fontconfig-infinality/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
-  <herd>fonts</herd>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <use>
     <flag name="nyx">Additional style using croscorefonts</flag>
   </use>
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
index 33de2dc0257f..1dc0400d4027 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
   <maintainer>
     <email>witold.pilat@gmail.com</email>
     <description>Proxied/co-maintainer. CC on bugs.</description>
   </maintainer>
+  <maintainer>
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bohoomil/fontconfig-ultimate</remote-id>
   </upstream>
diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
index a46832ff9ef6..2a2812f0e46c 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>yngwin@gentoo.org</email>
 		<name>Ben de Groot</name>
@@ -11,5 +10,9 @@
 		<name>gx86-multilib project</name>
 		<description>Handling the bugs related to multilib support in the package and related changes.</description>
 	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
 </pkgmetadata>
diff --git a/media-libs/freealut/metadata.xml b/media-libs/freealut/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-libs/freealut/metadata.xml
+++ b/media-libs/freealut/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml
index 2bac441ccc74..4c14bd1ec41d 100644
--- a/media-libs/freeglut/metadata.xml
+++ b/media-libs/freeglut/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<longdescription>
 	Freeglut provides an open-source alternative to the OpenGL Utility Toolkit
 	(GLUT) library. It is actively developed and maintained, while not being
diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
index a1cf48602f18..ee29d4caaaca 100644
--- a/media-libs/freeimage/metadata.xml
+++ b/media-libs/freeimage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freeimage</remote-id>
 	</upstream>
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index d93cdef5cb08..a7543d2c8007 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
 	<maintainer>
 		<email>yngwin@gentoo.org</email>
 		<name>Ben de Groot</name>
@@ -16,6 +15,10 @@
 		<description>Handling the bugs related to multilib support in the
 			package and related changes.</description>
 	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<use>
 		<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
 		<flag name="auto-hinter">Use the unpatented auto-hinter instead
diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml
index 2001569e0bbf..09bf1cf549e3 100644
--- a/media-libs/freeverb3/metadata.xml
+++ b/media-libs/freeverb3/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="audacious">Build Audacious plugin</flag>
 		<flag name="forcefpu">Disable assembly code</flag>
diff --git a/media-libs/ftgl/metadata.xml b/media-libs/ftgl/metadata.xml
index cf3590a61d88..0de95ca9bfde 100644
--- a/media-libs/ftgl/metadata.xml
+++ b/media-libs/ftgl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ftgl</remote-id>
 	</upstream>
diff --git a/media-libs/game-music-emu/metadata.xml b/media-libs/game-music-emu/metadata.xml
index 09332b4694c7..8fd198b51fcd 100644
--- a/media-libs/game-music-emu/metadata.xml
+++ b/media-libs/game-music-emu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">game-music-emu</remote-id>
 		<remote-id type="bitbucket">mpyne/game-music-emu</remote-id>
diff --git a/media-libs/ganv/metadata.xml b/media-libs/ganv/metadata.xml
index 8f0e433951ee..13221fc18b7b 100644
--- a/media-libs/ganv/metadata.xml
+++ b/media-libs/ganv/metadata.xml
@@ -5,7 +5,10 @@
     <email>karl.j.linden@gmail.com</email>
     <name>Karl Lindén</name>
   </maintainer>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="fdgl">Use experimental force-directed graph layout</flag>
   </use>
diff --git a/media-libs/gavl/metadata.xml b/media-libs/gavl/metadata.xml
index 79a37f98e4af..879a0f042dbe 100644
--- a/media-libs/gavl/metadata.xml
+++ b/media-libs/gavl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 5d65c5067414..ae8653163faa 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 gd is a graphics library. It allows your code to quickly draw images complete  
 with lines, arcs, text, multiple colors, cut and paste from other images, and
diff --git a/media-libs/gexiv2/metadata.xml b/media-libs/gexiv2/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-libs/gexiv2/metadata.xml
+++ b/media-libs/gexiv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/giblib/metadata.xml b/media-libs/giblib/metadata.xml
index 2a8e42b4aa1d..2e0efefbdaec 100644
--- a/media-libs/giblib/metadata.xml
+++ b/media-libs/giblib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 giblib is a utility library used by many of the applications I write. It 
 incorporates doubly linked lists, some string functions, and a wrapper 
diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
index c5d674103568..f3188046c2fc 100644
--- a/media-libs/giflib/metadata.xml
+++ b/media-libs/giflib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <use>
     <flag name="rle">Build converters for RLE format (utah raster toolkit)</flag>
   </use>
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index ca66c0fcb12a..66422ec64c58 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Use EGL instead of GLX for GL context creation</flag>
 	</use>
diff --git a/media-libs/glu/metadata.xml b/media-libs/glu/metadata.xml
index 7f7fe83cd799..306d9a0a1303 100644
--- a/media-libs/glu/metadata.xml
+++ b/media-libs/glu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/gluon/metadata.xml b/media-libs/gluon/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-libs/gluon/metadata.xml
+++ b/media-libs/gluon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/glyr/metadata.xml b/media-libs/glyr/metadata.xml
index f4394f6a0b57..fb9c3c55743e 100644
--- a/media-libs/glyr/metadata.xml
+++ b/media-libs/glyr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sahib/glyr</remote-id>
 	</upstream>
diff --git a/media-libs/gmtk/metadata.xml b/media-libs/gmtk/metadata.xml
index ba67427253b7..9a47f04dac4e 100644
--- a/media-libs/gmtk/metadata.xml
+++ b/media-libs/gmtk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/gnonlin/metadata.xml b/media-libs/gnonlin/metadata.xml
index 2eb27a71abee..b9d01b0b8299 100644
--- a/media-libs/gnonlin/metadata.xml
+++ b/media-libs/gnonlin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnonlin</remote-id>
 	</upstream>
diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index a2dcfcee4536..bd087cda5a79 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="network">Enable network access for media discovery using
 			<pkg>net-libs/libsoup</pkg></flag>
diff --git a/media-libs/gsound/metadata.xml b/media-libs/gsound/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/media-libs/gsound/metadata.xml
+++ b/media-libs/gsound/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index 730ab73210a7..4c4566c43b8e 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="gles2">Enable GLES2 support</flag>
diff --git a/media-libs/gst-plugins-base/metadata.xml b/media-libs/gst-plugins-base/metadata.xml
index 7b5b837f3466..e9e812ffdd06 100644
--- a/media-libs/gst-plugins-base/metadata.xml
+++ b/media-libs/gst-plugins-base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="pango">Enable pango GStreamer plugin</flag>
 		<flag name="ivorbis">Enable integer based vorbis decoder.</flag>
diff --git a/media-libs/gst-plugins-good/metadata.xml b/media-libs/gst-plugins-good/metadata.xml
index d1096fb54bd8..3794041ace8a 100644
--- a/media-libs/gst-plugins-good/metadata.xml
+++ b/media-libs/gst-plugins-good/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-ugly/metadata.xml b/media-libs/gst-plugins-ugly/metadata.xml
index 2e2190488705..9d06079563c0 100644
--- a/media-libs/gst-plugins-ugly/metadata.xml
+++ b/media-libs/gst-plugins-ugly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gstreamer</remote-id>
 	</upstream>
diff --git a/media-libs/gst-rtsp-server/metadata.xml b/media-libs/gst-rtsp-server/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-libs/gst-rtsp-server/metadata.xml
+++ b/media-libs/gst-rtsp-server/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/gstreamer-editing-services/metadata.xml b/media-libs/gstreamer-editing-services/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-libs/gstreamer-editing-services/metadata.xml
+++ b/media-libs/gstreamer-editing-services/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/gstreamer/metadata.xml b/media-libs/gstreamer/metadata.xml
index 5ed0f2f88bb5..72f8311d2640 100644
--- a/media-libs/gstreamer/metadata.xml
+++ b/media-libs/gstreamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="orc">Disable some PaX memory protections to allow plugins
 			that use <pkg>dev-lang/orc</pkg> for runtime optimization to be
diff --git a/media-libs/guilib/metadata.xml b/media-libs/guilib/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-libs/guilib/metadata.xml
+++ b/media-libs/guilib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/gupnp-dlna/metadata.xml b/media-libs/gupnp-dlna/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-libs/gupnp-dlna/metadata.xml
+++ b/media-libs/gupnp-dlna/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
index aea8ccf0ec5f..eef1d6e3a06f 100644
--- a/media-libs/harfbuzz/metadata.xml
+++ b/media-libs/harfbuzz/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="glib">Compile with GLib Unicode support</flag>
 		<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>
diff --git a/media-libs/herqq/metadata.xml b/media-libs/herqq/metadata.xml
index db06e3ffda3c..429216a673f3 100644
--- a/media-libs/herqq/metadata.xml
+++ b/media-libs/herqq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hupnp</remote-id>
 	</upstream>
diff --git a/media-libs/hupnp-ng/metadata.xml b/media-libs/hupnp-ng/metadata.xml
index 2db1d62a8043..5a9dfc884771 100644
--- a/media-libs/hupnp-ng/metadata.xml
+++ b/media-libs/hupnp-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">0xd34df00d/hupnp-ng</remote-id>
 	</upstream>
diff --git a/media-libs/icclib/metadata.xml b/media-libs/icclib/metadata.xml
index 173bc3668b43..7cec9df393fd 100644
--- a/media-libs/icclib/metadata.xml
+++ b/media-libs/icclib/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>printing</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">icclib</remote-id>
 	</upstream>
diff --git a/media-libs/id3lib/metadata.xml b/media-libs/id3lib/metadata.xml
index df6eee6a10ef..111600620848 100644
--- a/media-libs/id3lib/metadata.xml
+++ b/media-libs/id3lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">id3lib</remote-id>
   </upstream>
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/imlib/metadata.xml b/media-libs/imlib/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-libs/imlib/metadata.xml
+++ b/media-libs/imlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index ce816adda011..8b6df87369c1 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <longdescription>
 Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
 completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
diff --git a/media-libs/jasper/metadata.xml b/media-libs/jasper/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/media-libs/jasper/metadata.xml
+++ b/media-libs/jasper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/jbig2dec/metadata.xml b/media-libs/jbig2dec/metadata.xml
index 6a8762ea2602..530b5c85233f 100644
--- a/media-libs/jbig2dec/metadata.xml
+++ b/media-libs/jbig2dec/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-  <herd>printing</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">jbig2dec</remote-id>
   </upstream>
diff --git a/media-libs/jbigkit/metadata.xml b/media-libs/jbigkit/metadata.xml
index 8a08fd3f9e1b..c6acfc421c47 100644
--- a/media-libs/jbigkit/metadata.xml
+++ b/media-libs/jbigkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">Provides a library implementing a 
 	highly effective data compression algorithm for bi-level 
 	high-resolution images such as fax pages or scanned documents.
diff --git a/media-libs/jpeg/metadata.xml b/media-libs/jpeg/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-libs/jpeg/metadata.xml
+++ b/media-libs/jpeg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
index b0301965a081..8d1ee8b922fa 100644
--- a/media-libs/kvazaar/metadata.xml
+++ b/media-libs/kvazaar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/ladspa-cmt/metadata.xml b/media-libs/ladspa-cmt/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/ladspa-cmt/metadata.xml
+++ b/media-libs/ladspa-cmt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/ladspa-sdk/metadata.xml b/media-libs/ladspa-sdk/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/ladspa-sdk/metadata.xml
+++ b/media-libs/ladspa-sdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/lasi/metadata.xml b/media-libs/lasi/metadata.xml
index 01ee798826cf..81370e8f864c 100644
--- a/media-libs/lasi/metadata.xml
+++ b/media-libs/lasi/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription lang="en">
   libLASi is a library written by Larry Siden that provides a C++
   stream output interface for creating Postscript documents that can
diff --git a/media-libs/lastfmlib/metadata.xml b/media-libs/lastfmlib/metadata.xml
index 17f241ddb540..3b140a4dbcaa 100644
--- a/media-libs/lastfmlib/metadata.xml
+++ b/media-libs/lastfmlib/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dirk.vdb@gmail.com</email>
 		<name>Dirk Vanden Boer</name>
 		<description>Proxy maintainer and upstream developer. Please CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index 65b8a18eb022..3cb99eb09b68 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lcms</remote-id>
 	</upstream>
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 007927e3fe5b..314fbfa66835 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">
 The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
 </longdescription>
diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml
index 6dd50faab98c..c8d43d04c1b0 100644
--- a/media-libs/lib3ds/metadata.xml
+++ b/media-libs/lib3ds/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
-<herd>3dprint</herd>
 <maintainer>
 	<email>amynka@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<maintainer>
+	<email>3dprint@gentoo.org</email>
+	<name>Gentoo 3D print</name>
+</maintainer>
 <longdescription>
 lib3ds is an overall software library for managing 3D-Studio Release 3 and 4 ".3DS" files.
 </longdescription>
diff --git a/media-libs/libaacplus/metadata.xml b/media-libs/libaacplus/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-libs/libaacplus/metadata.xml
+++ b/media-libs/libaacplus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libaacs/metadata.xml b/media-libs/libaacs/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-libs/libaacs/metadata.xml
+++ b/media-libs/libaacs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
index 1aeaad41901e..c4c0c0ba01a2 100644
--- a/media-libs/libafterimage/metadata.xml
+++ b/media-libs/libafterimage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   libAfterImage is a generic image manipulation library.
   It was initially implemented to address AfterStep Window Manager's needs for
diff --git a/media-libs/libao/metadata.xml b/media-libs/libao/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libao/metadata.xml
+++ b/media-libs/libao/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libart_lgpl/metadata.xml b/media-libs/libart_lgpl/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-libs/libart_lgpl/metadata.xml
+++ b/media-libs/libart_lgpl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index 511cf814fe9e..99f6ab0992f6 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libbdplus/metadata.xml b/media-libs/libbdplus/metadata.xml
index 20932a6cfada..6061616f99f2 100644
--- a/media-libs/libbdplus/metadata.xml
+++ b/media-libs/libbdplus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="aacs">Add support for decryption of AACS</flag>
   </use>
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index 1137d0514c81..9e63922ab7be 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="aacs">Add support for decryption of AACS</flag>
     <flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
diff --git a/media-libs/libbs2b/metadata.xml b/media-libs/libbs2b/metadata.xml
index 9ecb53a9d80d..7db3740009b9 100644
--- a/media-libs/libbs2b/metadata.xml
+++ b/media-libs/libbs2b/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bs2b</remote-id>
   </upstream>
diff --git a/media-libs/libcaca/metadata.xml b/media-libs/libcaca/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/libcaca/metadata.xml
+++ b/media-libs/libcaca/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 048af1d3ead3..4df161fa8c8a 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 		A small and lightweight implementation of the XDG Sound Theme Specification
 		(http://0pointer.de/public/sound-theme-spec.html)
diff --git a/media-libs/libcdaudio/metadata.xml b/media-libs/libcdaudio/metadata.xml
index 385a5882ed42..92c77b54cad5 100644
--- a/media-libs/libcdaudio/metadata.xml
+++ b/media-libs/libcdaudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libcdaudio</remote-id>
 	</upstream>
diff --git a/media-libs/libcddb/metadata.xml b/media-libs/libcddb/metadata.xml
index 9cbe1d82af9a..1e1dad1e3bb4 100644
--- a/media-libs/libcddb/metadata.xml
+++ b/media-libs/libcddb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libcddb</remote-id>
 	</upstream>
diff --git a/media-libs/libcdr/metadata.xml b/media-libs/libcdr/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/media-libs/libcdr/metadata.xml
+++ b/media-libs/libcdr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libclalsadrv/metadata.xml b/media-libs/libclalsadrv/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libclalsadrv/metadata.xml
+++ b/media-libs/libclalsadrv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libclastfm/metadata.xml b/media-libs/libclastfm/metadata.xml
index 48da25009c3f..d12adc99163c 100644
--- a/media-libs/libclastfm/metadata.xml
+++ b/media-libs/libclastfm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">liblastfm</remote-id>
 	</upstream>
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libclthreads/metadata.xml
+++ b/media-libs/libclthreads/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libclxclient/metadata.xml b/media-libs/libclxclient/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libclxclient/metadata.xml
+++ b/media-libs/libclxclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libcue/metadata.xml b/media-libs/libcue/metadata.xml
index b70536994b66..195568a5c6ef 100644
--- a/media-libs/libcue/metadata.xml
+++ b/media-libs/libcue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libcue</remote-id>
 	</upstream>
diff --git a/media-libs/libcuefile/metadata.xml b/media-libs/libcuefile/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-libs/libcuefile/metadata.xml
+++ b/media-libs/libcuefile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libdc1394/metadata.xml b/media-libs/libdc1394/metadata.xml
index 0ad59fcffb30..8df5f86e3417 100644
--- a/media-libs/libdc1394/metadata.xml
+++ b/media-libs/libdc1394/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libdca/metadata.xml b/media-libs/libdca/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libdca/metadata.xml
+++ b/media-libs/libdca/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml
index dba98e6d2a82..df6b03a4cd3f 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
diff --git a/media-libs/libdiscid/metadata.xml b/media-libs/libdiscid/metadata.xml
index 22b5b2dc7090..80ca3d3cae78 100644
--- a/media-libs/libdiscid/metadata.xml
+++ b/media-libs/libdiscid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>libdiscid is a C library for creating MusicBrainz DiscIDs
     from audio CDs. It reads a CD's table of contents (TOC) and generates an
     identifier which can be used to lookup the CD at MusicBrainz.
diff --git a/media-libs/libdmtx/metadata.xml b/media-libs/libdmtx/metadata.xml
index d081f5e429f7..58a91603c305 100644
--- a/media-libs/libdmtx/metadata.xml
+++ b/media-libs/libdmtx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libdmtx</remote-id>
 	</upstream>
diff --git a/media-libs/libdv/metadata.xml b/media-libs/libdv/metadata.xml
index dbae49788e6e..85cbce873823 100644
--- a/media-libs/libdv/metadata.xml
+++ b/media-libs/libdv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libdvb/metadata.xml b/media-libs/libdvb/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-libs/libdvb/metadata.xml
+++ b/media-libs/libdvb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/media-libs/libdvbpsi/metadata.xml b/media-libs/libdvbpsi/metadata.xml
index 2677d846fc47..ef7ee8a82666 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer><email>lordvan@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-libs/libdvdcss/metadata.xml b/media-libs/libdvdcss/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/libdvdcss/metadata.xml
+++ b/media-libs/libdvdcss/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libdvdnav/metadata.xml b/media-libs/libdvdnav/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-libs/libdvdnav/metadata.xml
+++ b/media-libs/libdvdnav/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libdvdplay/metadata.xml b/media-libs/libdvdplay/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/libdvdplay/metadata.xml
+++ b/media-libs/libdvdplay/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libdvdread/metadata.xml b/media-libs/libdvdread/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-libs/libdvdread/metadata.xml
+++ b/media-libs/libdvdread/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libechonest/metadata.xml b/media-libs/libechonest/metadata.xml
index ff73030e0408..6b0210f2d3b9 100644
--- a/media-libs/libechonest/metadata.xml
+++ b/media-libs/libechonest/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
@@ -11,4 +9,12 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer> 
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libepoxy/metadata.xml b/media-libs/libepoxy/metadata.xml
index 8f185a37f13b..92bb455edb48 100644
--- a/media-libs/libepoxy/metadata.xml
+++ b/media-libs/libepoxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">anholt/libepoxy</remote-id>
 	</upstream>
diff --git a/media-libs/libexif-gtk/metadata.xml b/media-libs/libexif-gtk/metadata.xml
index 5c7a0372083d..c6b9f470221a 100644
--- a/media-libs/libexif-gtk/metadata.xml
+++ b/media-libs/libexif-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libexif</remote-id>
   </upstream>
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index 59b180fa99e1..d8a8342b8c96 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libexif</remote-id>
 	</upstream>
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 421725e0514f..7e4a2ebe08b9 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
diff --git a/media-libs/libfame/metadata.xml b/media-libs/libfame/metadata.xml
index 2fbced3903fb..63aa8a10f213 100644
--- a/media-libs/libfame/metadata.xml
+++ b/media-libs/libfame/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libfishsound/metadata.xml b/media-libs/libfishsound/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-libs/libfishsound/metadata.xml
+++ b/media-libs/libfishsound/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libfpx/metadata.xml b/media-libs/libfpx/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-libs/libfpx/metadata.xml
+++ b/media-libs/libfpx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libfreehand/metadata.xml b/media-libs/libfreehand/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/media-libs/libfreehand/metadata.xml
+++ b/media-libs/libfreehand/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libggi/metadata.xml b/media-libs/libggi/metadata.xml
index 55a6e7af8ea8..d9fc536f1ad3 100644
--- a/media-libs/libggi/metadata.xml
+++ b/media-libs/libggi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libggigcp/metadata.xml b/media-libs/libggigcp/metadata.xml
index 4428fc215295..2d2ed1eb349e 100644
--- a/media-libs/libggigcp/metadata.xml
+++ b/media-libs/libggigcp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libggimisc/metadata.xml b/media-libs/libggimisc/metadata.xml
index 4428fc215295..2d2ed1eb349e 100644
--- a/media-libs/libggimisc/metadata.xml
+++ b/media-libs/libggimisc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libggiwmh/metadata.xml b/media-libs/libggiwmh/metadata.xml
index 4428fc215295..2d2ed1eb349e 100644
--- a/media-libs/libggiwmh/metadata.xml
+++ b/media-libs/libggiwmh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libgig/metadata.xml b/media-libs/libgig/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libgig/metadata.xml
+++ b/media-libs/libgig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libgii/metadata.xml b/media-libs/libgii/metadata.xml
index 4428fc215295..2d2ed1eb349e 100644
--- a/media-libs/libgii/metadata.xml
+++ b/media-libs/libgii/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libgltf/metadata.xml b/media-libs/libgltf/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/media-libs/libgltf/metadata.xml
+++ b/media-libs/libgltf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index f0ad460eebf7..36da28650c4d 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="serial">Enable serial port support</flag>
 	</use>
diff --git a/media-libs/libgpod/metadata.xml b/media-libs/libgpod/metadata.xml
index 0ec33c7f18ed..8e98659c8e4b 100644
--- a/media-libs/libgpod/metadata.xml
+++ b/media-libs/libgpod/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
 	<longdescription lang="en">
 		libgpod is a shared library to access the contents of an iPod. This
 		library is based on code used in the gtkpod project.
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index da18ef767991..8d100df97e09 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	This library provides decoding and encoding of audio on a playlist. It is intended to be used as a backend for music player applications. That said, it is also generic enough to be used as a backend for any streaming audio processing utility.
 </longdescription>
diff --git a/media-libs/libharu/metadata.xml b/media-libs/libharu/metadata.xml
index 638ccc8b7924..82538a4a9bb4 100644
--- a/media-libs/libharu/metadata.xml
+++ b/media-libs/libharu/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Haru PDF library is a ANSI/C library for generating PDF files.
   It supports the following features:
diff --git a/media-libs/libicns/metadata.xml b/media-libs/libicns/metadata.xml
index f59bd2ed590c..b3594951f99d 100644
--- a/media-libs/libicns/metadata.xml
+++ b/media-libs/libicns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">icns</remote-id>
 	</upstream>
diff --git a/media-libs/libid3tag/metadata.xml b/media-libs/libid3tag/metadata.xml
index 315b2eb6f52e..eb6c750caeba 100644
--- a/media-libs/libid3tag/metadata.xml
+++ b/media-libs/libid3tag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mad</remote-id>
 	</upstream>
diff --git a/media-libs/libiec61883/metadata.xml b/media-libs/libiec61883/metadata.xml
index 6d0be58b7c46..5eedb99f140c 100644
--- a/media-libs/libiec61883/metadata.xml
+++ b/media-libs/libiec61883/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>calchan@gentoo.org</email>
 	<name>Denis Dupeyron</name>
 	<description>Main maintainer for this is the herd, please CC on
 	bugs.</description>
 </maintainer>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 <longdescription lang="en">
 This library provides third generation media reception and transmission for DV,
 MPEG2-TS, and AMDTP (audio and music) using only raw1394 and not the complicated
diff --git a/media-libs/libifp/metadata.xml b/media-libs/libifp/metadata.xml
index 74257d7e3e82..35be62e6693a 100644
--- a/media-libs/libifp/metadata.xml
+++ b/media-libs/libifp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ifp-driver</remote-id>
 	</upstream>
diff --git a/media-libs/libilbc/metadata.xml b/media-libs/libilbc/metadata.xml
index 7e328c947817..009400873a5f 100644
--- a/media-libs/libilbc/metadata.xml
+++ b/media-libs/libilbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">iLBC BSD implementation from WebRTC</longdescription>
 	<upstream>
 		<remote-id type="github">dekkers/libilbc</remote-id>
diff --git a/media-libs/libjackasyn/metadata.xml b/media-libs/libjackasyn/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/libjackasyn/metadata.xml
+++ b/media-libs/libjackasyn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 0ca0b0e3817c..3e29a3ebedf0 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
@@ -10,6 +9,10 @@
     <email>anarchy@gentoo.org</email>
     <name>Jory A. Pratt</name>
   </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libjpeg-turbo</remote-id>
   </upstream>
diff --git a/media-libs/libjsw/metadata.xml b/media-libs/libjsw/metadata.xml
index a57a2b839230..b140296e61c2 100644
--- a/media-libs/libjsw/metadata.xml
+++ b/media-libs/libjsw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">libjsw</remote-id>
 	</upstream>
diff --git a/media-libs/libkarma/metadata.xml b/media-libs/libkarma/metadata.xml
index dd3b4caeeb08..8f97b438e7fe 100644
--- a/media-libs/libkarma/metadata.xml
+++ b/media-libs/libkarma/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libkate/metadata.xml b/media-libs/libkate/metadata.xml
index 479ab999d31a..bbe9c24f9935 100644
--- a/media-libs/libkate/metadata.xml
+++ b/media-libs/libkate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">Kate is a codec for karaoke and text encapsulation for Ogg. Most of the
 		time, this would be multiplexed with audio/video to carry subtitles,
 		song lyrics (with or without karaoke data), etc, but doesn't have to be.
diff --git a/media-libs/liblastfm/metadata.xml b/media-libs/liblastfm/metadata.xml
index c33c1c76a319..2e766e22e11f 100644
--- a/media-libs/liblastfm/metadata.xml
+++ b/media-libs/liblastfm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="fingerprint">Build the lastfm-fingerprint library</flag>
 	</use>
diff --git a/media-libs/liblingoteach/metadata.xml b/media-libs/liblingoteach/metadata.xml
index 8506b03f6bd0..11c66a851fc3 100644
--- a/media-libs/liblingoteach/metadata.xml
+++ b/media-libs/liblingoteach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lingoteach</remote-id>
   </upstream>
diff --git a/media-libs/liblo/metadata.xml b/media-libs/liblo/metadata.xml
index 2d400e11954c..d4e9f81e998c 100644
--- a/media-libs/liblo/metadata.xml
+++ b/media-libs/liblo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>liblo is an implementation of the Open Sound Control protocol for POSIX systems, started by Steve Harris.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">liblo</remote-id>
diff --git a/media-libs/liblrdf/metadata.xml b/media-libs/liblrdf/metadata.xml
index 7bbcd54ed8d3..0fad5caefa71 100644
--- a/media-libs/liblrdf/metadata.xml
+++ b/media-libs/liblrdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">swh/LRDF</remote-id>
 	</upstream>
diff --git a/media-libs/liblscp/metadata.xml b/media-libs/liblscp/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/liblscp/metadata.xml
+++ b/media-libs/liblscp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libmad/metadata.xml b/media-libs/libmad/metadata.xml
index 315b2eb6f52e..eb6c750caeba 100644
--- a/media-libs/libmad/metadata.xml
+++ b/media-libs/libmad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mad</remote-id>
 	</upstream>
diff --git a/media-libs/libmatroska/metadata.xml b/media-libs/libmatroska/metadata.xml
index 5effe57bd8db..d7e88cb8b002 100644
--- a/media-libs/libmatroska/metadata.xml
+++ b/media-libs/libmatroska/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libmediaart/metadata.xml b/media-libs/libmediaart/metadata.xml
index defff19a494b..4b41c89a546b 100644
--- a/media-libs/libmediaart/metadata.xml
+++ b/media-libs/libmediaart/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">GNOME/libmediaart</remote-id>
 	</upstream>
diff --git a/media-libs/libmediainfo/metadata.xml b/media-libs/libmediainfo/metadata.xml
index 7cc6e853becc..0557507d5f04 100644
--- a/media-libs/libmediainfo/metadata.xml
+++ b/media-libs/libmediainfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mediainfo</remote-id>
 	</upstream>
diff --git a/media-libs/libmikmod/metadata.xml b/media-libs/libmikmod/metadata.xml
index b86266440788..a382cc1d7e6c 100644
--- a/media-libs/libmikmod/metadata.xml
+++ b/media-libs/libmikmod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mikmod</remote-id>
 	</upstream>
diff --git a/media-libs/libmms/metadata.xml b/media-libs/libmms/metadata.xml
index 5ed47c256631..896c7ad4710b 100644
--- a/media-libs/libmms/metadata.xml
+++ b/media-libs/libmms/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index e0d457ab7dfb..d7a189ad6138 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmng</remote-id>
 	</upstream>
diff --git a/media-libs/libmodplug/metadata.xml b/media-libs/libmodplug/metadata.xml
index 60a7ab7a3a5b..d42accb4c014 100644
--- a/media-libs/libmodplug/metadata.xml
+++ b/media-libs/libmodplug/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">modplug-xmms</remote-id>
   </upstream>
diff --git a/media-libs/libmp3splt/metadata.xml b/media-libs/libmp3splt/metadata.xml
index 33770ad622d0..7155422f134e 100644
--- a/media-libs/libmp3splt/metadata.xml
+++ b/media-libs/libmp3splt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3splt</remote-id>
 	</upstream>
diff --git a/media-libs/libmp4v2/metadata.xml b/media-libs/libmp4v2/metadata.xml
index 2dbc62f18142..c908cc894679 100644
--- a/media-libs/libmp4v2/metadata.xml
+++ b/media-libs/libmp4v2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="utils">Install command-line utilities</flag>
 	</use>
diff --git a/media-libs/libmpd/metadata.xml b/media-libs/libmpd/metadata.xml
index e9f44e438159..b935d1ba3406 100644
--- a/media-libs/libmpd/metadata.xml
+++ b/media-libs/libmpd/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
   <email>angelos@gentoo.org</email>
   <name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 <longdescription>A library handling connection to a MPD server.</longdescription>
 </pkgmetadata>
diff --git a/media-libs/libmpdclient/metadata.xml b/media-libs/libmpdclient/metadata.xml
index f939777e6a35..2fa6e9be702f 100644
--- a/media-libs/libmpdclient/metadata.xml
+++ b/media-libs/libmpdclient/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libmpeg2/metadata.xml b/media-libs/libmpeg2/metadata.xml
index 3086b17ad2c5..d1e2cc29bd13 100644
--- a/media-libs/libmpeg2/metadata.xml
+++ b/media-libs/libmpeg2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libmpeg3/metadata.xml b/media-libs/libmpeg3/metadata.xml
index 27f31563080f..93d0965ebb51 100644
--- a/media-libs/libmpeg3/metadata.xml
+++ b/media-libs/libmpeg3/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 8e741341963f..d5b5c29942f5 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmtp</remote-id>
 	</upstream>
diff --git a/media-libs/libmygpo-qt/metadata.xml b/media-libs/libmygpo-qt/metadata.xml
index 121c9aab0707..492fe9657218 100644
--- a/media-libs/libmygpo-qt/metadata.xml
+++ b/media-libs/libmygpo-qt/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <herd>sound</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gpodder/libmygpo-qt</remote-id>
   </upstream>
diff --git a/media-libs/libnjb/metadata.xml b/media-libs/libnjb/metadata.xml
index 6a6641a7fe21..9a3d9c3a3745 100644
--- a/media-libs/libnjb/metadata.xml
+++ b/media-libs/libnjb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libnjb</remote-id>
 	</upstream>
diff --git a/media-libs/libnut/metadata.xml b/media-libs/libnut/metadata.xml
index 42cce5e3e85e..cbe4c9e85b5d 100644
--- a/media-libs/libnut/metadata.xml
+++ b/media-libs/libnut/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libofa/metadata.xml b/media-libs/libofa/metadata.xml
index 1f84290ed170..67d39d3f2a6f 100644
--- a/media-libs/libofa/metadata.xml
+++ b/media-libs/libofa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">musicip-libofa</remote-id>
 	</upstream>
diff --git a/media-libs/libogg/metadata.xml b/media-libs/libogg/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libogg/metadata.xml
+++ b/media-libs/libogg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/liboggz/metadata.xml b/media-libs/liboggz/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/liboggz/metadata.xml
+++ b/media-libs/liboggz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libomxil-bellagio/metadata.xml b/media-libs/libomxil-bellagio/metadata.xml
index 81ed2f2df468..d2997d3cdd83 100644
--- a/media-libs/libomxil-bellagio/metadata.xml
+++ b/media-libs/libomxil-bellagio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="audioeffects">enable audio volume/mixer effects components</flag>
 		<flag name="clocksrc">enable clock component</flag>
diff --git a/media-libs/libopendaap/metadata.xml b/media-libs/libopendaap/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/media-libs/libopendaap/metadata.xml
+++ b/media-libs/libopendaap/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/media-libs/libopenraw/metadata.xml b/media-libs/libopenraw/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/media-libs/libopenraw/metadata.xml
+++ b/media-libs/libopenraw/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libpagemaker/metadata.xml b/media-libs/libpagemaker/metadata.xml
index eb4b372590c5..26686eeba121 100644
--- a/media-libs/libpagemaker/metadata.xml
+++ b/media-libs/libpagemaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>office</herd>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <use>
     <flag name="tools">Build build tools</flag>
   </use>
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index 9530e85e3dfd..aa05ebc59abb 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">panotools</remote-id>
 	</upstream>
diff --git a/media-libs/libpgf/metadata.xml b/media-libs/libpgf/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-libs/libpgf/metadata.xml
+++ b/media-libs/libpgf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 4cbaf67478fa..cd4cdbff6247 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
 	</use>
diff --git a/media-libs/libpostproc/metadata.xml b/media-libs/libpostproc/metadata.xml
index 4d39c3c2955a..456e61fcfdc7 100644
--- a/media-libs/libpostproc/metadata.xml
+++ b/media-libs/libpostproc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libpqstego/metadata.xml b/media-libs/libpqstego/metadata.xml
index 6183a8f271b6..f7cb40052005 100644
--- a/media-libs/libpqstego/metadata.xml
+++ b/media-libs/libpqstego/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pqstego</remote-id>
   </upstream>
diff --git a/media-libs/libprojectm-qt/metadata.xml b/media-libs/libprojectm-qt/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-libs/libprojectm-qt/metadata.xml
+++ b/media-libs/libprojectm-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">projectm</remote-id>
 	</upstream>
diff --git a/media-libs/libprojectm/metadata.xml b/media-libs/libprojectm/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-libs/libprojectm/metadata.xml
+++ b/media-libs/libprojectm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">projectm</remote-id>
 	</upstream>
diff --git a/media-libs/libquicktime/metadata.xml b/media-libs/libquicktime/metadata.xml
index b161cd86186b..013ff226e920 100644
--- a/media-libs/libquicktime/metadata.xml
+++ b/media-libs/libquicktime/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/libquvi-scripts/metadata.xml b/media-libs/libquvi-scripts/metadata.xml
index 7c06664547ca..87e31fb6919f 100644
--- a/media-libs/libquvi-scripts/metadata.xml
+++ b/media-libs/libquvi-scripts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">quvi</remote-id>
 	</upstream>
diff --git a/media-libs/libquvi/metadata.xml b/media-libs/libquvi/metadata.xml
index 7c06664547ca..87e31fb6919f 100644
--- a/media-libs/libquvi/metadata.xml
+++ b/media-libs/libquvi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">quvi</remote-id>
 	</upstream>
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index d66c6b2beced..e76f2081d7b5 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="demosaic">Enable support for external interpolation algorithms</flag> 
 	</use>
diff --git a/media-libs/libreplaygain/metadata.xml b/media-libs/libreplaygain/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-libs/libreplaygain/metadata.xml
+++ b/media-libs/libreplaygain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsamplerate/metadata.xml b/media-libs/libsamplerate/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libsamplerate/metadata.xml
+++ b/media-libs/libsamplerate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsbsms/metadata.xml b/media-libs/libsbsms/metadata.xml
index 8b48dd28506f..6445de5c6c83 100644
--- a/media-libs/libsbsms/metadata.xml
+++ b/media-libs/libsbsms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sbsms</remote-id>
 	</upstream>
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index 32c5821fcc2f..3c10912d716e 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription>
 Simple DirectMedia Layer is a cross-platform multimedia library designed 
 to provide low level access to audio, keyboard, mouse, joystick, 3D 
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 008e512a52c7..a1813fb517b0 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 		Simple DirectMedia Layer is a cross-platform multimedia library
 		designed to provide low level access to audio, keyboard, mouse,
diff --git a/media-libs/libshout/metadata.xml b/media-libs/libshout/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libshout/metadata.xml
+++ b/media-libs/libshout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsidplayfp/metadata.xml b/media-libs/libsidplayfp/metadata.xml
index 8c08b7258eec..90aa617a4a63 100644
--- a/media-libs/libsidplayfp/metadata.xml
+++ b/media-libs/libsidplayfp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sidplay-residfp</remote-id>
 	</upstream>
diff --git a/media-libs/libsmf/metadata.xml b/media-libs/libsmf/metadata.xml
index d3093c51f3e9..4351f4903ca1 100644
--- a/media-libs/libsmf/metadata.xml
+++ b/media-libs/libsmf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libsmf</remote-id>
 	</upstream>
diff --git a/media-libs/libsndfile/metadata.xml b/media-libs/libsndfile/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-libs/libsndfile/metadata.xml
+++ b/media-libs/libsndfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsoundio/metadata.xml b/media-libs/libsoundio/metadata.xml
index c6026bf4e066..903fe85387f2 100644
--- a/media-libs/libsoundio/metadata.xml
+++ b/media-libs/libsoundio/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	C99 library providing cross-platform audio input and output. The API is
 	suitable for real-time software such as digital audio workstations as
diff --git a/media-libs/libsoundtouch/metadata.xml b/media-libs/libsoundtouch/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-libs/libsoundtouch/metadata.xml
+++ b/media-libs/libsoundtouch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsvg/metadata.xml b/media-libs/libsvg/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-libs/libsvg/metadata.xml
+++ b/media-libs/libsvg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/libtaginfo/metadata.xml b/media-libs/libtaginfo/metadata.xml
index 2b3b4e4e3fad..6e49a8b31dad 100644
--- a/media-libs/libtaginfo/metadata.xml
+++ b/media-libs/libtaginfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">shuerhaaken/libtaginfo</remote-id>
 	</upstream>
diff --git a/media-libs/libtheora/metadata.xml b/media-libs/libtheora/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-libs/libtheora/metadata.xml
+++ b/media-libs/libtheora/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/libtiger/metadata.xml b/media-libs/libtiger/metadata.xml
index f8d4166ac6fd..a41b90d85ab6 100644
--- a/media-libs/libtiger/metadata.xml
+++ b/media-libs/libtiger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">libtiger is a rendering library for Kate streams using Pango and Cairo.
 		More information about Kate streams may be found at
 		http://wiki.xiph.org/index.php/OggKate</longdescription>
diff --git a/media-libs/libtimidity/metadata.xml b/media-libs/libtimidity/metadata.xml
index 9ec4f8c12dbb..e8e455339dd9 100644
--- a/media-libs/libtimidity/metadata.xml
+++ b/media-libs/libtimidity/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libtimidity</remote-id>
 	</upstream>
diff --git a/media-libs/libtxc_dxtn/metadata.xml b/media-libs/libtxc_dxtn/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/media-libs/libtxc_dxtn/metadata.xml
+++ b/media-libs/libtxc_dxtn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libuninameslist/metadata.xml b/media-libs/libuninameslist/metadata.xml
index d7c7c86a9ef4..209c94908ae8 100644
--- a/media-libs/libuninameslist/metadata.xml
+++ b/media-libs/libuninameslist/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libuninameslist</remote-id>
 	</upstream>
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index 1bcf6b693d84..d41bca24b1ff 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
diff --git a/media-libs/libvisio/metadata.xml b/media-libs/libvisio/metadata.xml
index bbd6a9a94bf3..471088e28a9c 100644
--- a/media-libs/libvisio/metadata.xml
+++ b/media-libs/libvisio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Build conversion tools</flag>
 	</use>
diff --git a/media-libs/libvisual/metadata.xml b/media-libs/libvisual/metadata.xml
index 1c16bbf70ae0..77d67e187297 100644
--- a/media-libs/libvisual/metadata.xml
+++ b/media-libs/libvisual/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libvisual</remote-id>
 	</upstream>
diff --git a/media-libs/libvorbis/metadata.xml b/media-libs/libvorbis/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/libvorbis/metadata.xml
+++ b/media-libs/libvorbis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 7f147f9aef7b..ed218e1d7522 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<use>
 		<flag name="postproc">Enable additional post processing filters</flag>
 	</use>
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index bd8332629d5c..f8bd140e32b2 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<herd>chromium</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<use>
 		<flag name="experimental">Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
 		<flag name="swap-16bit-csp">Enable byte swapping for 16 bit colorspace</flag>
diff --git a/media-libs/libxmi/metadata.xml b/media-libs/libxmi/metadata.xml
index d78e2cb3ed54..2992c40d523b 100644
--- a/media-libs/libxmi/metadata.xml
+++ b/media-libs/libxmi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <longdescription>
 GNU libxmi is a C/C++ function library for rasterizing 2-D vector graphics. It
 can draw 2-D graphical primitives, including wide polygonal lines and circular
diff --git a/media-libs/libxspf/metadata.xml b/media-libs/libxspf/metadata.xml
index 57004d18bdda..6bdf3d5ae772 100644
--- a/media-libs/libxspf/metadata.xml
+++ b/media-libs/libxspf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		libxspf brings XSPF playlist reading and writing support to your C++
 		application.  XSPF is an open XML format for sharing playlists.
diff --git a/media-libs/libxtract/metadata.xml b/media-libs/libxtract/metadata.xml
index 53685ee65c8f..b52b19767820 100644
--- a/media-libs/libxtract/metadata.xml
+++ b/media-libs/libxtract/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">downloads/jamiebullock</remote-id>
 	</upstream>
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index 129f1d6b486b..e5832c1d8960 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/libzen/metadata.xml b/media-libs/libzen/metadata.xml
index e1410a9cfab9..b1bdac7a6202 100644
--- a/media-libs/libzen/metadata.xml
+++ b/media-libs/libzen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zenlib</remote-id>
 	</upstream>
diff --git a/media-libs/lilv/metadata.xml b/media-libs/lilv/metadata.xml
index 3d40c7743f80..3dce2a1697bb 100644
--- a/media-libs/lilv/metadata.xml
+++ b/media-libs/lilv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
 <longdescription lang="en">
 	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
 </longdescription>
diff --git a/media-libs/lv2-ui/metadata.xml b/media-libs/lv2-ui/metadata.xml
index 630499147bb2..1b319f7bc02c 100644
--- a/media-libs/lv2-ui/metadata.xml
+++ b/media-libs/lv2-ui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	This extension defines an interface that can be used in LV2 plugins and hosts to create UIs for plugins. The UIs are similar to plugins and reside in shared object files in an LV2 bundle.
 </longdescription>
diff --git a/media-libs/lv2/metadata.xml b/media-libs/lv2/metadata.xml
index 17306fa7a5a8..0241349ea625 100644
--- a/media-libs/lv2/metadata.xml
+++ b/media-libs/lv2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="plugins">Enables examples plugins.</flag>
   </use>
diff --git a/media-libs/lv2core/metadata.xml b/media-libs/lv2core/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/lv2core/metadata.xml
+++ b/media-libs/lv2core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/lvtk/metadata.xml b/media-libs/lvtk/metadata.xml
index 5a7d94e97b70..d90aa0ed2bfc 100644
--- a/media-libs/lvtk/metadata.xml
+++ b/media-libs/lvtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> based GUI support</flag>
     <flag name="tools">Compile and install ttl2c tool</flag>
diff --git a/media-libs/mash/metadata.xml b/media-libs/mash/metadata.xml
index b4df7ab52805..58e7339b1dc5 100644
--- a/media-libs/mash/metadata.xml
+++ b/media-libs/mash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
   <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
     for introspection</flag>
diff --git a/media-libs/memphis/metadata.xml b/media-libs/memphis/metadata.xml
index 71e60c617ba5..4bd3379c0679 100644
--- a/media-libs/memphis/metadata.xml
+++ b/media-libs/memphis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
     <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
     <flag name="vala">Add support for Vala</flag>
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 4cb96e214bf0..5e435e6d5afc 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="bindist">Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
 		<flag name="classic">Build drivers based on the classic architecture.</flag>
diff --git a/media-libs/ming/metadata.xml b/media-libs/ming/metadata.xml
index 7f65c68b40d2..8dd6563f423e 100644
--- a/media-libs/ming/metadata.xml
+++ b/media-libs/ming/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ming</remote-id>
 	</upstream>
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index c3245e4d85a6..0c136b5b24a1 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>kde</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <use>
     <flag name="compressed-lumas">Compress the luma files in png.</flag>
     <flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
diff --git a/media-libs/musicbrainz/metadata.xml b/media-libs/musicbrainz/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/musicbrainz/metadata.xml
+++ b/media-libs/musicbrainz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/mutagen/metadata.xml b/media-libs/mutagen/metadata.xml
index 397fc0064927..96ab178523fc 100644
--- a/media-libs/mutagen/metadata.xml
+++ b/media-libs/mutagen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mutagen</remote-id>
 		<remote-id type="bitbucket">lazka/mutagen</remote-id>
diff --git a/media-libs/nas/metadata.xml b/media-libs/nas/metadata.xml
index c86db974637e..15d4cea2d0cf 100644
--- a/media-libs/nas/metadata.xml
+++ b/media-libs/nas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nas</remote-id>
 	</upstream>
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index c53b71153996..2292863276ab 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
 	</use>
diff --git a/media-libs/openal/metadata.xml b/media-libs/openal/metadata.xml
index 271c2e30529e..bdead0ed92b0 100644
--- a/media-libs/openal/metadata.xml
+++ b/media-libs/openal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="alstream">Build and install the FFmpeg based alstream example utility</flag>
 	</use>
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index ec6ff0fdeb75..fb5cd7b315e6 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
 	</upstream>
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 607c9d102e0e..1818c01184f3 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
 	<use>
 		<flag name="pdf">Install extra documentation in PDF format</flag>
diff --git a/media-libs/opencore-amr/metadata.xml b/media-libs/opencore-amr/metadata.xml
index e57f03bbfbeb..1f679faccef0 100644
--- a/media-libs/opencore-amr/metadata.xml
+++ b/media-libs/opencore-amr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opencore-amr</remote-id>
 	</upstream>
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 5d3d4dbc3a6f..c2f6348005f2 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>3dprint</herd>
   <maintainer>
     <email>amynka@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>3dprint@gentoo.org</email>
+    <name>Gentoo 3D print</name>
+  </maintainer>
   <longdescription>
 	OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
   </longdescription>
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index eb2d81e28e2d..eee03133ea39 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
@@ -11,6 +10,10 @@
 		<name>Amy Winston</name>
 		<description>Assign bugs on me.</description>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription>
 OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
 Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/openexr_ctl/metadata.xml b/media-libs/openexr_ctl/metadata.xml
index de95417e2be2..1f5be3474040 100644
--- a/media-libs/openexr_ctl/metadata.xml
+++ b/media-libs/openexr_ctl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/opengl-apple/metadata.xml b/media-libs/opengl-apple/metadata.xml
index f737f232e3bf..6bd94e0770d5 100644
--- a/media-libs/opengl-apple/metadata.xml
+++ b/media-libs/opengl-apple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prefix</herd>
+  <maintainer>
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/opengtl/metadata.xml b/media-libs/opengtl/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-libs/opengtl/metadata.xml
+++ b/media-libs/opengtl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 59898d1f8d68..f29068b46155 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-	<maintainer>
+  <maintainer>
 		<email>axs@gentoo.org</email>
 		<name>Ian Stakenvicius</name>
 	</maintainer>
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index c557813f5e6e..ad38aabf46b1 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="colorio">Use <pkg>media-gfx/opencolorio</pkg></flag>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 7c804ffbed5a..4ab18049bb3a 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">openjpeg</remote-id>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
index 82bdb149a9cc..0f56e249a5af 100644
--- a/media-libs/opus/metadata.xml
+++ b/media-libs/opus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="custom-modes">Build with custom-modes.</flag>
   </use>
diff --git a/media-libs/phat/metadata.xml b/media-libs/phat/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/phat/metadata.xml
+++ b/media-libs/phat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/phonon-gstreamer/metadata.xml b/media-libs/phonon-gstreamer/metadata.xml
index cd1b62290e85..51f078e75410 100644
--- a/media-libs/phonon-gstreamer/metadata.xml
+++ b/media-libs/phonon-gstreamer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="network">Enable network streaming support via libsoup</flag>
 	</use>
diff --git a/media-libs/phonon-qt7/metadata.xml b/media-libs/phonon-qt7/metadata.xml
index b968c7e47ff2..73511f4340d8 100644
--- a/media-libs/phonon-qt7/metadata.xml
+++ b/media-libs/phonon-qt7/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>prefix</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/phonon-vlc/metadata.xml b/media-libs/phonon-vlc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-libs/phonon-vlc/metadata.xml
+++ b/media-libs/phonon-vlc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index d261a0ea40fb..ba5bbddd4c24 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="vlc">Install VLC Phonon backend</flag>
diff --git a/media-libs/plib/metadata.xml b/media-libs/plib/metadata.xml
index 266d597fc58b..f437c09432f0 100644
--- a/media-libs/plib/metadata.xml
+++ b/media-libs/plib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">plib</remote-id>
 	</upstream>
diff --git a/media-libs/plotutils/metadata.xml b/media-libs/plotutils/metadata.xml
index 447cad30a8fc..81ae2b6553cf 100644
--- a/media-libs/plotutils/metadata.xml
+++ b/media-libs/plotutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/pnglite/metadata.xml b/media-libs/pnglite/metadata.xml
index 7f56be77e1aa..d73f13253bae 100644
--- a/media-libs/pnglite/metadata.xml
+++ b/media-libs/pnglite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pnglite</remote-id>
 	</upstream>
diff --git a/media-libs/portaudio/metadata.xml b/media-libs/portaudio/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/portaudio/metadata.xml
+++ b/media-libs/portaudio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/portmidi/metadata.xml b/media-libs/portmidi/metadata.xml
index 59be10030bfb..08a1b91e2eee 100644
--- a/media-libs/portmidi/metadata.xml
+++ b/media-libs/portmidi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="test-programs">Install various example programs</flag>
   </use>
diff --git a/media-libs/prison/metadata.xml b/media-libs/prison/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-libs/prison/metadata.xml
+++ b/media-libs/prison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/pymemphis/metadata.xml b/media-libs/pymemphis/metadata.xml
index d21d11884553..bd2549cbee2d 100644
--- a/media-libs/pymemphis/metadata.xml
+++ b/media-libs/pymemphis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index 40b5a161adbe..7d7b67650359 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Qhull computes the convex hull, Delaunay triangulation, Voronoi
   diagram, halfspace intersection about a point, furthest-site
diff --git a/media-libs/qimageblitz/metadata.xml b/media-libs/qimageblitz/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-libs/qimageblitz/metadata.xml
+++ b/media-libs/qimageblitz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/qt-gstreamer/metadata.xml b/media-libs/qt-gstreamer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-libs/qt-gstreamer/metadata.xml
+++ b/media-libs/qt-gstreamer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/quesoglc/metadata.xml b/media-libs/quesoglc/metadata.xml
index 728be142d715..1a4ee44f0ba0 100644
--- a/media-libs/quesoglc/metadata.xml
+++ b/media-libs/quesoglc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">quesoglc</remote-id>
 	</upstream>
diff --git a/media-libs/quvi/metadata.xml b/media-libs/quvi/metadata.xml
index 1be208d63c61..8023667b762b 100644
--- a/media-libs/quvi/metadata.xml
+++ b/media-libs/quvi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<use>
 		<flag name="json">Enable support for JSON output</flag>
 	</use>
diff --git a/media-libs/raptor/metadata.xml b/media-libs/raptor/metadata.xml
index 20b42e75e861..db4112e52822 100644
--- a/media-libs/raptor/metadata.xml
+++ b/media-libs/raptor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="json">Enable support for JSON parsing</flag>
   </use>
diff --git a/media-libs/raul/metadata.xml b/media-libs/raul/metadata.xml
index 44aedffdc316..a84de3061101 100644
--- a/media-libs/raul/metadata.xml
+++ b/media-libs/raul/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	Raul (Realtime Audio Utility Library) is a C++ utility library primarily
 	aimed at audio/musical applications. 
diff --git a/media-libs/resid/metadata.xml b/media-libs/resid/metadata.xml
index f13b23f890ed..dfcab150551c 100644
--- a/media-libs/resid/metadata.xml
+++ b/media-libs/resid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sidplay2</remote-id>
 	</upstream>
diff --git a/media-libs/rtaudio/metadata.xml b/media-libs/rtaudio/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/rtaudio/metadata.xml
+++ b/media-libs/rtaudio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/rubberband/metadata.xml b/media-libs/rubberband/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/rubberband/metadata.xml
+++ b/media-libs/rubberband/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/sbc/metadata.xml b/media-libs/sbc/metadata.xml
index c9b0be6242ce..15d9c6b1cce6 100644
--- a/media-libs/sbc/metadata.xml
+++ b/media-libs/sbc/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/schroedinger/metadata.xml b/media-libs/schroedinger/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-libs/schroedinger/metadata.xml
+++ b/media-libs/schroedinger/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/sdif/metadata.xml b/media-libs/sdif/metadata.xml
index c71fe6c363c6..23b2159765d4 100644
--- a/media-libs/sdif/metadata.xml
+++ b/media-libs/sdif/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>
     The general idea of SDIF is to store information related to signal
     processing and specifically of sound, in files, according to a common
diff --git a/media-libs/sdl-gfx/metadata.xml b/media-libs/sdl-gfx/metadata.xml
index 71195a1e8908..f92f1ed5ab6a 100644
--- a/media-libs/sdl-gfx/metadata.xml
+++ b/media-libs/sdl-gfx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 SDL graphics drawing primitives and other support functions
 The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing 
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index de3f80197ffc..45fcc5d79719 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	 <email>games@gentoo.org</email>
+	 <name>Gentoo Games Project</name>
+</maintainer>
 <use>
 	 <flag name="webp">support loading WEBP images</flag>
 </use>
diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index 98a087528ad9..fa073e4ca1ba 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
 <use>
  <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
  <flag name="midi">basic support for MIDI files</flag>
diff --git a/media-libs/sdl-net/metadata.xml b/media-libs/sdl-net/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/media-libs/sdl-net/metadata.xml
+++ b/media-libs/sdl-net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/sdl-pango/metadata.xml b/media-libs/sdl-pango/metadata.xml
index e3da3b15e437..4a570e1a512d 100644
--- a/media-libs/sdl-pango/metadata.xml
+++ b/media-libs/sdl-pango/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdlpango</remote-id>
 	</upstream>
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index da870654e9e3..b90fc45798fb 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="physfs">Enable physfs support</flag>
   </use>
diff --git a/media-libs/sdl-terminal/metadata.xml b/media-libs/sdl-terminal/metadata.xml
index 75fc14c34956..2a0f398feaed 100644
--- a/media-libs/sdl-terminal/metadata.xml
+++ b/media-libs/sdl-terminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdl-terminal</remote-id>
 	</upstream>
diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml
index 24f70e6408cb..392d53dd0020 100644
--- a/media-libs/sdl-ttf/metadata.xml
+++ b/media-libs/sdl-ttf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 This is a sample library which allows you to use TrueType fonts in your SDL applications. It 
 comes with an example program "showfont" which displays an example string for a given 
diff --git a/media-libs/sdl2-gfx/metadata.xml b/media-libs/sdl2-gfx/metadata.xml
index a2c38b643e95..b15e021b8712 100644
--- a/media-libs/sdl2-gfx/metadata.xml
+++ b/media-libs/sdl2-gfx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		The SDL2_gfx library provides the basic drawing functions such
 		as lines, circles or polygons provided by SDL_gfx on SDL2 against
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index 7ac32c762e2c..be2d64c2e2d4 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		 <email>games@gentoo.org</email>
+		 <name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		 <flag name="webp">support loading WEBP images</flag>
 	</use>
diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 827251de7b54..fd8fbc92eb72 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg>
 			for MIDI support</flag>
diff --git a/media-libs/sdl2-net/metadata.xml b/media-libs/sdl2-net/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/media-libs/sdl2-net/metadata.xml
+++ b/media-libs/sdl2-net/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/sdl2-ttf/metadata.xml b/media-libs/sdl2-ttf/metadata.xml
index e7ce72ada858..3c3eb1547e9f 100644
--- a/media-libs/sdl2-ttf/metadata.xml
+++ b/media-libs/sdl2-ttf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<longdescription>
 		This is a sample library which allows you to use TrueType
 		fonts in your SDL applications. It
diff --git a/media-libs/sg/metadata.xml b/media-libs/sg/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/media-libs/sg/metadata.xml
+++ b/media-libs/sg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/sge/metadata.xml b/media-libs/sge/metadata.xml
index 2f8b9cdd638d..6aa9618a9642 100644
--- a/media-libs/sge/metadata.xml
+++ b/media-libs/sge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+  <maintainer>
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="image">enable sdl-image support</flag>
   </use>
diff --git a/media-libs/shivavg/metadata.xml b/media-libs/shivavg/metadata.xml
index 11f6c619655a..c961bc388345 100644
--- a/media-libs/shivavg/metadata.xml
+++ b/media-libs/shivavg/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
   <maintainer>
     <email>lu_zero@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <longdescription>
 ShivaVG is an open-source ANSI C implementation of the Khronos'
 OpenVG specification for hardware-accelerated vector graphics API. It is built
diff --git a/media-libs/silgraphite/metadata.xml b/media-libs/silgraphite/metadata.xml
index 07d4510f8b76..706650efdfbf 100644
--- a/media-libs/silgraphite/metadata.xml
+++ b/media-libs/silgraphite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<use>
 		<flag name="pango">Enables the pango-graphite pango module.</flag>
 	</use>
diff --git a/media-libs/slv2/metadata.xml b/media-libs/slv2/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/slv2/metadata.xml
+++ b/media-libs/slv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/smpeg/metadata.xml b/media-libs/smpeg/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/media-libs/smpeg/metadata.xml
+++ b/media-libs/smpeg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/smpeg2/metadata.xml b/media-libs/smpeg2/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/media-libs/smpeg2/metadata.xml
+++ b/media-libs/smpeg2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/soxr/metadata.xml b/media-libs/soxr/metadata.xml
index ef7c79f9fa79..df36fecb403f 100644
--- a/media-libs/soxr/metadata.xml
+++ b/media-libs/soxr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">soxr</remote-id>
   </upstream>
diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
index d4990648f895..d5ea893f893b 100644
--- a/media-libs/speex/metadata.xml
+++ b/media-libs/speex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
 </upstream>
diff --git a/media-libs/sratom/metadata.xml b/media-libs/sratom/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/sratom/metadata.xml
+++ b/media-libs/sratom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/stimg/metadata.xml b/media-libs/stimg/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-libs/stimg/metadata.xml
+++ b/media-libs/stimg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/stk/metadata.xml b/media-libs/stk/metadata.xml
index 3092d1fc5554..1cff67b66fa3 100644
--- a/media-libs/stk/metadata.xml
+++ b/media-libs/stk/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>aballier@gentoo.org</email>
   <name>Alexis Ballier</name>
@@ -11,4 +9,12 @@
   <email>gimpel@sonnenkinder.org</email>
   <name>Thomas Kuther</name>
 </maintainer>
+<maintainer>
+  <email>proaudio@gentoo.org</email>
+  <name>Gentoo ProAudio Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/stops/metadata.xml b/media-libs/stops/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/stops/metadata.xml
+++ b/media-libs/stops/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/sublib/metadata.xml b/media-libs/sublib/metadata.xml
index 1875b60c1e8f..97ba7cc03811 100644
--- a/media-libs/sublib/metadata.xml
+++ b/media-libs/sublib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 SubLib is a library that eases the development of subtitling applications. It
 supports the most common text-based subtitle formats and allows for subtitle
diff --git a/media-libs/suil/metadata.xml b/media-libs/suil/metadata.xml
index 640383e7be81..de87eb733ec6 100644
--- a/media-libs/suil/metadata.xml
+++ b/media-libs/suil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
 </longdescription>
diff --git a/media-libs/t1lib/metadata.xml b/media-libs/t1lib/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-libs/t1lib/metadata.xml
+++ b/media-libs/t1lib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/taglib-extras/metadata.xml b/media-libs/taglib-extras/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-libs/taglib-extras/metadata.xml
+++ b/media-libs/taglib-extras/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index 190574691596..3c586f3cf288 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
 	</use>
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index fee1dc15ab8d..ecddd6f34ef1 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <longdescription>TIFF image library and tools, mostly for scanner and fax
  support, but also used by GIS and other imaging tools.</longdescription>
 </pkgmetadata>
diff --git a/media-libs/tremor/metadata.xml b/media-libs/tremor/metadata.xml
index a1063d45eb1c..bba54d209bcd 100644
--- a/media-libs/tremor/metadata.xml
+++ b/media-libs/tremor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="low-accuracy">enable 32bit only multiply operations</flag>
 	</use>
diff --git a/media-libs/tse3/metadata.xml b/media-libs/tse3/metadata.xml
index 715950308ec2..7a69b18bfb2c 100644
--- a/media-libs/tse3/metadata.xml
+++ b/media-libs/tse3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tse3</remote-id>
 	</upstream>
diff --git a/media-libs/urt/metadata.xml b/media-libs/urt/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-libs/urt/metadata.xml
+++ b/media-libs/urt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/vamp-plugin-sdk/metadata.xml b/media-libs/vamp-plugin-sdk/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/vamp-plugin-sdk/metadata.xml
+++ b/media-libs/vamp-plugin-sdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 20bfa7518e26..5c9039f239ae 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ukoethe/vigra</remote-id>
 	</upstream>
diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml
index 1115b2ab2aef..8b244ed0a05b 100644
--- a/media-libs/vips/metadata.xml
+++ b/media-libs/vips/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
 	</use>
diff --git a/media-libs/virglrenderer/metadata.xml b/media-libs/virglrenderer/metadata.xml
index a0569b3cccda..f8d5811c56c1 100644
--- a/media-libs/virglrenderer/metadata.xml
+++ b/media-libs/virglrenderer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qemu</herd>
+<maintainer>
+	<email>qemu@gentoo.org</email>
+	<name>Gentoo QEMU Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/vo-aacenc/metadata.xml b/media-libs/vo-aacenc/metadata.xml
index 4e08d8ecdfd1..13ae34c160d2 100644
--- a/media-libs/vo-aacenc/metadata.xml
+++ b/media-libs/vo-aacenc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">VisualOn AAC encoder library This library contains an encoder implementation
 of the Advanced Audio Coding (AAC) audio codec. The library is based on
 a codec implementation by VisualOn, part of the Stagefright framework from
diff --git a/media-libs/vo-amrwbenc/metadata.xml b/media-libs/vo-amrwbenc/metadata.xml
index 6d37ec544972..7f5ab354166f 100644
--- a/media-libs/vo-amrwbenc/metadata.xml
+++ b/media-libs/vo-amrwbenc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 VisualOn AMR-WB encoder library
 This library contains an encoder implementation of the Adaptive Multi
diff --git a/media-libs/volpack/metadata.xml b/media-libs/volpack/metadata.xml
index 32643e2e2130..be5ed7a3340e 100644
--- a/media-libs/volpack/metadata.xml
+++ b/media-libs/volpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The VolPack Volume Rendering Library is a portable software library for
   volume rendering based on a new family of fast volume rendering
diff --git a/media-libs/waffle/metadata.xml b/media-libs/waffle/metadata.xml
index 4e444db49a88..f44a4b303e5f 100644
--- a/media-libs/waffle/metadata.xml
+++ b/media-libs/waffle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="gbm">Enable support for the Generic Buffer Manager (gbm)</flag>
diff --git a/media-libs/wxsvg/metadata.xml b/media-libs/wxsvg/metadata.xml
index 895135c3c2d9..3d85bca72a60 100644
--- a/media-libs/wxsvg/metadata.xml
+++ b/media-libs/wxsvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wxsvg</remote-id>
 	</upstream>
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 4854bbd25485..94dc544362b8 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 65829b88a345..2165f10c107e 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index b870e92015a9..2560108f54a9 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/xvid/metadata.xml b/media-libs/xvid/metadata.xml
index cc1a0288e38f..a26e4a970b25 100644
--- a/media-libs/xvid/metadata.xml
+++ b/media-libs/xvid/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/zimg/metadata.xml b/media-libs/zimg/metadata.xml
index 2ae93287f753..8b189279f948 100644
--- a/media-libs/zimg/metadata.xml
+++ b/media-libs/zimg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-libs/zita-alsa-pcmi/metadata.xml b/media-libs/zita-alsa-pcmi/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-libs/zita-alsa-pcmi/metadata.xml
+++ b/media-libs/zita-alsa-pcmi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/zita-convolver/metadata.xml b/media-libs/zita-convolver/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-libs/zita-convolver/metadata.xml
+++ b/media-libs/zita-convolver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/zvbi/metadata.xml b/media-libs/zvbi/metadata.xml
index d4fa9a81e2b5..2415cc0d1eec 100644
--- a/media-libs/zvbi/metadata.xml
+++ b/media-libs/zvbi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>media-tv@gentoo.org</email>
 		<name>Television related Applications in Gentoo's Portage</name>
diff --git a/media-plugins/alsa-plugins/metadata.xml b/media-plugins/alsa-plugins/metadata.xml
index 7a7ed4ca3bbe..a927b56be820 100644
--- a/media-plugins/alsa-plugins/metadata.xml
+++ b/media-plugins/alsa-plugins/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>alsa</herd>
 <maintainer>
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
diff --git a/media-plugins/alsaequal/metadata.xml b/media-plugins/alsaequal/metadata.xml
index af0275e2998a..7ae4362bbf0f 100644
--- a/media-plugins/alsaequal/metadata.xml
+++ b/media-plugins/alsaequal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-plugins/amb-plugins/metadata.xml b/media-plugins/amb-plugins/metadata.xml
index 3a8ea7e02972..9d7a19de1f88 100644
--- a/media-plugins/amb-plugins/metadata.xml
+++ b/media-plugins/amb-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/ams-lv2/metadata.xml b/media-plugins/ams-lv2/metadata.xml
index 0325c5cea542..f3455d3f39e4 100644
--- a/media-plugins/ams-lv2/metadata.xml
+++ b/media-plugins/ams-lv2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">blablack/ams-lv2</remote-id>
   </upstream>
diff --git a/media-plugins/audacious-dumb/metadata.xml b/media-plugins/audacious-dumb/metadata.xml
index fe3c0b333337..df72aa733ba9 100644
--- a/media-plugins/audacious-dumb/metadata.xml
+++ b/media-plugins/audacious-dumb/metadata.xml
@@ -5,5 +5,8 @@
 <email>joker@gentoo.org</email>
 <name>Christian Birchinger</name>
 </maintainer>
-<herd>sound</herd>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 3b90ee923af6..67e78b5ed1ef 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 <use>
 	<flag name="adplug">Build with AdPlug (Adlib sound card emulation)
 		support</flag>
diff --git a/media-plugins/banshee-community-extensions/metadata.xml b/media-plugins/banshee-community-extensions/metadata.xml
index ceff0fb2ab2a..2f64d9769fd0 100644
--- a/media-plugins/banshee-community-extensions/metadata.xml
+++ b/media-plugins/banshee-community-extensions/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <herd>gstreamer</herd>
+  <maintainer>
+	  <email>dotnet@gentoo.org</email>
+	  <name>Gentoo Dotnet Project</name>
+  </maintainer>
+  <maintainer>
+	  <email>gstreamer@gentoo.org</email>
+	  <name>GStreamer package maintainers</name>
+  </maintainer>
   <use>
 	  <flag name="lastfmfingerprint">Enable support to ientify your
 	  music automatically, using the Last.fm online service.</flag>
diff --git a/media-plugins/calf/metadata.xml b/media-plugins/calf/metadata.xml
index 7e7647c57c5a..da64e3ba0eea 100644
--- a/media-plugins/calf/metadata.xml
+++ b/media-plugins/calf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="lv2">Add support for Ladspa V2</flag>
   </use>
diff --git a/media-plugins/caps-plugins/metadata.xml b/media-plugins/caps-plugins/metadata.xml
index b56ef9e42ed2..f34e98daa644 100644
--- a/media-plugins/caps-plugins/metadata.xml
+++ b/media-plugins/caps-plugins/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription>The CAPS Audio Plugin Suite - LADSPA plugin suite which includes DSP units emulating instrument amplifiers, stomp-box classics, versatile 'virtual analogue' oscillators, fractal oscillation, reverb, equalization and others</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/emotion_generic_players/metadata.xml b/media-plugins/emotion_generic_players/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/media-plugins/emotion_generic_players/metadata.xml
+++ b/media-plugins/emotion_generic_players/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/fil-plugins/metadata.xml b/media-plugins/fil-plugins/metadata.xml
index 3a8ea7e02972..9d7a19de1f88 100644
--- a/media-plugins/fil-plugins/metadata.xml
+++ b/media-plugins/fil-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/frei0r-plugins/metadata.xml b/media-plugins/frei0r-plugins/metadata.xml
index e831e31f37ff..01ff05346be9 100644
--- a/media-plugins/frei0r-plugins/metadata.xml
+++ b/media-plugins/frei0r-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="facedetect">Enables building of facedetect plugin, which
       depends on <pkg>media-libs/opencv</pkg>
diff --git a/media-plugins/g2reverb/metadata.xml b/media-plugins/g2reverb/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/g2reverb/metadata.xml
+++ b/media-plugins/g2reverb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gimp-gmic/metadata.xml b/media-plugins/gimp-gmic/metadata.xml
index e17a902d43af..d8c44cb7d2f6 100644
--- a/media-plugins/gimp-gmic/metadata.xml
+++ b/media-plugins/gimp-gmic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gmic</remote-id>
 	</upstream>
diff --git a/media-plugins/gimp-lensfun/metadata.xml b/media-plugins/gimp-lensfun/metadata.xml
index 91089c8462f8..77fed0581bdd 100644
--- a/media-plugins/gimp-lensfun/metadata.xml
+++ b/media-plugins/gimp-lensfun/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dev@kicherer.org</email>
 		<name>Mario</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/media-plugins/gkrellmpc/metadata.xml b/media-plugins/gkrellmpc/metadata.xml
index 15505756c200..cd02e1e45be7 100644
--- a/media-plugins/gkrellmpc/metadata.xml
+++ b/media-plugins/gkrellmpc/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>desktop-dock</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="threads">Use separate thread to init connection (unsafe)</flag>
 	</use>
diff --git a/media-plugins/gmpc-alarm/metadata.xml b/media-plugins/gmpc-alarm/metadata.xml
index 1e7b9d7494a9..f33a41d3b88d 100644
--- a/media-plugins/gmpc-alarm/metadata.xml
+++ b/media-plugins/gmpc-alarm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-albumview/metadata.xml b/media-plugins/gmpc-albumview/metadata.xml
index 1e7b9d7494a9..f33a41d3b88d 100644
--- a/media-plugins/gmpc-albumview/metadata.xml
+++ b/media-plugins/gmpc-albumview/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-avahi/metadata.xml b/media-plugins/gmpc-avahi/metadata.xml
index f939777e6a35..2fa6e9be702f 100644
--- a/media-plugins/gmpc-avahi/metadata.xml
+++ b/media-plugins/gmpc-avahi/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-awn/metadata.xml b/media-plugins/gmpc-awn/metadata.xml
index 1e7b9d7494a9..f33a41d3b88d 100644
--- a/media-plugins/gmpc-awn/metadata.xml
+++ b/media-plugins/gmpc-awn/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-discogs/metadata.xml b/media-plugins/gmpc-discogs/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-discogs/metadata.xml
+++ b/media-plugins/gmpc-discogs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-extraplaylist/metadata.xml b/media-plugins/gmpc-extraplaylist/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-extraplaylist/metadata.xml
+++ b/media-plugins/gmpc-extraplaylist/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-jamendo/metadata.xml b/media-plugins/gmpc-jamendo/metadata.xml
index 1e7b9d7494a9..f33a41d3b88d 100644
--- a/media-plugins/gmpc-jamendo/metadata.xml
+++ b/media-plugins/gmpc-jamendo/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-last-fm/metadata.xml b/media-plugins/gmpc-last-fm/metadata.xml
index 23c5bf54f89b..8bb2a4ba9090 100644
--- a/media-plugins/gmpc-last-fm/metadata.xml
+++ b/media-plugins/gmpc-last-fm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>The last.fm plugin can fetch artist images, from last.fm. This plugin doesn't scrobble your music, use a dedicated client like mpdscribble for this.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
diff --git a/media-plugins/gmpc-libnotify/metadata.xml b/media-plugins/gmpc-libnotify/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-libnotify/metadata.xml
+++ b/media-plugins/gmpc-libnotify/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-lyrics/metadata.xml b/media-plugins/gmpc-lyrics/metadata.xml
index 4d4c3986b1fd..10db6a7fffc9 100644
--- a/media-plugins/gmpc-lyrics/metadata.xml
+++ b/media-plugins/gmpc-lyrics/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 This plugin fetches lyrics from the internet. It uses the following websites as sources:
     * LyricWiki
diff --git a/media-plugins/gmpc-lyricwiki/metadata.xml b/media-plugins/gmpc-lyricwiki/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-lyricwiki/metadata.xml
+++ b/media-plugins/gmpc-lyricwiki/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-magnatune/metadata.xml b/media-plugins/gmpc-magnatune/metadata.xml
index e8bfc2428ef3..ffdb0a16d827 100644
--- a/media-plugins/gmpc-magnatune/metadata.xml
+++ b/media-plugins/gmpc-magnatune/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 The magnatune plugin provides an interface to the www.magnatune.com website. The plugin allows you to browse, and preview available albums. (It uses the 128kbit mp3 version).
 The magnatune plugin provides a double function, it also uses the data from the
diff --git a/media-plugins/gmpc-mdcover/metadata.xml b/media-plugins/gmpc-mdcover/metadata.xml
index 60077b677b4e..e2ff34639a21 100644
--- a/media-plugins/gmpc-mdcover/metadata.xml
+++ b/media-plugins/gmpc-mdcover/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>This plugin fetches cover art, artist art,album and artist information from the file system.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
diff --git a/media-plugins/gmpc-mmkeys/metadata.xml b/media-plugins/gmpc-mmkeys/metadata.xml
index 1e7b9d7494a9..f33a41d3b88d 100644
--- a/media-plugins/gmpc-mmkeys/metadata.xml
+++ b/media-plugins/gmpc-mmkeys/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gmpc-mserver/metadata.xml b/media-plugins/gmpc-mserver/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-mserver/metadata.xml
+++ b/media-plugins/gmpc-mserver/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-playlistsort/metadata.xml b/media-plugins/gmpc-playlistsort/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-playlistsort/metadata.xml
+++ b/media-plugins/gmpc-playlistsort/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-shout/metadata.xml b/media-plugins/gmpc-shout/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-shout/metadata.xml
+++ b/media-plugins/gmpc-shout/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-tagedit/metadata.xml b/media-plugins/gmpc-tagedit/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-tagedit/metadata.xml
+++ b/media-plugins/gmpc-tagedit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/gmpc-wikipedia/metadata.xml b/media-plugins/gmpc-wikipedia/metadata.xml
index 974a58e83522..f32621a82509 100644
--- a/media-plugins/gmpc-wikipedia/metadata.xml
+++ b/media-plugins/gmpc-wikipedia/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-plugins/grilo-plugins/metadata.xml b/media-plugins/grilo-plugins/metadata.xml
index ce10d8e0c78e..86ad740d9c60 100644
--- a/media-plugins/grilo-plugins/metadata.xml
+++ b/media-plugins/grilo-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="daap">Enable dmap support through <pkg>net-libs/libdmapsharing</pkg></flag>
 	<flag name="flickr">Enable Flickr support</flag>
diff --git a/media-plugins/gst-plugins-a52dec/metadata.xml b/media-plugins/gst-plugins-a52dec/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-a52dec/metadata.xml
+++ b/media-plugins/gst-plugins-a52dec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-alsa/metadata.xml b/media-plugins/gst-plugins-alsa/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-alsa/metadata.xml
+++ b/media-plugins/gst-plugins-alsa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-amr/metadata.xml b/media-plugins/gst-plugins-amr/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-amr/metadata.xml
+++ b/media-plugins/gst-plugins-amr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-annodex/metadata.xml b/media-plugins/gst-plugins-annodex/metadata.xml
index c5041a1fea02..016edeca0c76 100644
--- a/media-plugins/gst-plugins-annodex/metadata.xml
+++ b/media-plugins/gst-plugins-annodex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for annodex stream manipulation
 
diff --git a/media-plugins/gst-plugins-assrender/metadata.xml b/media-plugins/gst-plugins-assrender/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-assrender/metadata.xml
+++ b/media-plugins/gst-plugins-assrender/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-bluez/metadata.xml b/media-plugins/gst-plugins-bluez/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-bluez/metadata.xml
+++ b/media-plugins/gst-plugins-bluez/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-cdio/metadata.xml b/media-plugins/gst-plugins-cdio/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-cdio/metadata.xml
+++ b/media-plugins/gst-plugins-cdio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-cdparanoia/metadata.xml b/media-plugins/gst-plugins-cdparanoia/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-cdparanoia/metadata.xml
+++ b/media-plugins/gst-plugins-cdparanoia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-dash/metadata.xml b/media-plugins/gst-plugins-dash/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-dash/metadata.xml
+++ b/media-plugins/gst-plugins-dash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-dtls/metadata.xml b/media-plugins/gst-plugins-dtls/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-dtls/metadata.xml
+++ b/media-plugins/gst-plugins-dtls/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-dts/metadata.xml b/media-plugins/gst-plugins-dts/metadata.xml
index d1096fb54bd8..3794041ace8a 100644
--- a/media-plugins/gst-plugins-dts/metadata.xml
+++ b/media-plugins/gst-plugins-dts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-dv/metadata.xml b/media-plugins/gst-plugins-dv/metadata.xml
index 27e89d01dbbb..57a551c018b7 100644
--- a/media-plugins/gst-plugins-dv/metadata.xml
+++ b/media-plugins/gst-plugins-dv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer DV demuxer and decoder plugin based on libdv (libdv.sf.net)
 </longdescription>
diff --git a/media-plugins/gst-plugins-dvb/metadata.xml b/media-plugins/gst-plugins-dvb/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-dvb/metadata.xml
+++ b/media-plugins/gst-plugins-dvb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-dvdread/metadata.xml b/media-plugins/gst-plugins-dvdread/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-dvdread/metadata.xml
+++ b/media-plugins/gst-plugins-dvdread/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-faac/metadata.xml b/media-plugins/gst-plugins-faac/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-faac/metadata.xml
+++ b/media-plugins/gst-plugins-faac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-faad/metadata.xml b/media-plugins/gst-plugins-faad/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-faad/metadata.xml
+++ b/media-plugins/gst-plugins-faad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-ffmpeg/metadata.xml b/media-plugins/gst-plugins-ffmpeg/metadata.xml
index d1096fb54bd8..3794041ace8a 100644
--- a/media-plugins/gst-plugins-ffmpeg/metadata.xml
+++ b/media-plugins/gst-plugins-ffmpeg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-flac/metadata.xml b/media-plugins/gst-plugins-flac/metadata.xml
index 55eedbe9d48c..c1eb2871f8c8 100644
--- a/media-plugins/gst-plugins-flac/metadata.xml
+++ b/media-plugins/gst-plugins-flac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for The FLAC Lossless compressor Codec
 
diff --git a/media-plugins/gst-plugins-gconf/metadata.xml b/media-plugins/gst-plugins-gconf/metadata.xml
index 4cb144fa4e13..677d5f977d95 100644
--- a/media-plugins/gst-plugins-gconf/metadata.xml
+++ b/media-plugins/gst-plugins-gconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin wrapping the GStreamer/GConf audio/video output settings
 
diff --git a/media-plugins/gst-plugins-gdkpixbuf/metadata.xml b/media-plugins/gst-plugins-gdkpixbuf/metadata.xml
index 711608e2a27d..f117a06d95f1 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/metadata.xml
+++ b/media-plugins/gst-plugins-gdkpixbuf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for GdkPixbuf-based image decoder, overlay and sink
 
diff --git a/media-plugins/gst-plugins-gio/metadata.xml b/media-plugins/gst-plugins-gio/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-gio/metadata.xml
+++ b/media-plugins/gst-plugins-gio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-gl/metadata.xml b/media-plugins/gst-plugins-gl/metadata.xml
index 0c83022c9abc..d75aa0321cad 100644
--- a/media-plugins/gst-plugins-gl/metadata.xml
+++ b/media-plugins/gst-plugins-gl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="libvisual">Enable visualization effects via
 			<pkg>media-libs/libvisual</pkg></flag>
diff --git a/media-plugins/gst-plugins-gnomevfs/metadata.xml b/media-plugins/gst-plugins-gnomevfs/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-gnomevfs/metadata.xml
+++ b/media-plugins/gst-plugins-gnomevfs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-gsm/metadata.xml b/media-plugins/gst-plugins-gsm/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-gsm/metadata.xml
+++ b/media-plugins/gst-plugins-gsm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-hls/metadata.xml b/media-plugins/gst-plugins-hls/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-hls/metadata.xml
+++ b/media-plugins/gst-plugins-hls/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-ivorbis/metadata.xml b/media-plugins/gst-plugins-ivorbis/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-ivorbis/metadata.xml
+++ b/media-plugins/gst-plugins-ivorbis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-jack/metadata.xml b/media-plugins/gst-plugins-jack/metadata.xml
index 7883696bd076..d8bdcf90b1aa 100644
--- a/media-plugins/gst-plugins-jack/metadata.xml
+++ b/media-plugins/gst-plugins-jack/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
 <maintainer>
 	<email>miknix@gentoo.org</email>
 	<name>Angelo Arrifano</name>
 	<description>Regular ebuild maintenance, bugs and stuff..</description>
 </maintainer>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for JACK audio elements
 
diff --git a/media-plugins/gst-plugins-jpeg/metadata.xml b/media-plugins/gst-plugins-jpeg/metadata.xml
index cffe81367809..77c9425031bc 100644
--- a/media-plugins/gst-plugins-jpeg/metadata.xml
+++ b/media-plugins/gst-plugins-jpeg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for the JPEG format.
 
diff --git a/media-plugins/gst-plugins-ladspa/metadata.xml b/media-plugins/gst-plugins-ladspa/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-ladspa/metadata.xml
+++ b/media-plugins/gst-plugins-ladspa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-lame/metadata.xml b/media-plugins/gst-plugins-lame/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-lame/metadata.xml
+++ b/media-plugins/gst-plugins-lame/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml
index d1096fb54bd8..3794041ace8a 100644
--- a/media-plugins/gst-plugins-libav/metadata.xml
+++ b/media-plugins/gst-plugins-libav/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-libde265/metadata.xml b/media-plugins/gst-plugins-libde265/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-libde265/metadata.xml
+++ b/media-plugins/gst-plugins-libde265/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-libmms/metadata.xml b/media-plugins/gst-plugins-libmms/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-libmms/metadata.xml
+++ b/media-plugins/gst-plugins-libmms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-libnice/metadata.xml b/media-plugins/gst-plugins-libnice/metadata.xml
index e9f6bc4e0483..9d3a9591faec 100644
--- a/media-plugins/gst-plugins-libnice/metadata.xml
+++ b/media-plugins/gst-plugins-libnice/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-libpng/metadata.xml b/media-plugins/gst-plugins-libpng/metadata.xml
index f42b90d2adf4..4e33158f1d92 100644
--- a/media-plugins/gst-plugins-libpng/metadata.xml
+++ b/media-plugins/gst-plugins-libpng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for the PNG format.
 
diff --git a/media-plugins/gst-plugins-libvisual/metadata.xml b/media-plugins/gst-plugins-libvisual/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-libvisual/metadata.xml
+++ b/media-plugins/gst-plugins-libvisual/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-mad/metadata.xml b/media-plugins/gst-plugins-mad/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-mad/metadata.xml
+++ b/media-plugins/gst-plugins-mad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-meta/metadata.xml b/media-plugins/gst-plugins-meta/metadata.xml
index bfe7a2c4779e..1b420af76d4b 100644
--- a/media-plugins/gst-plugins-meta/metadata.xml
+++ b/media-plugins/gst-plugins-meta/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 This package pulls in various gstreamer plugins based on USE flags.  It's
 intended to be used as a runtime-depend for apps that need various gstreamer
diff --git a/media-plugins/gst-plugins-mimic/metadata.xml b/media-plugins/gst-plugins-mimic/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-mimic/metadata.xml
+++ b/media-plugins/gst-plugins-mimic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-modplug/metadata.xml b/media-plugins/gst-plugins-modplug/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-modplug/metadata.xml
+++ b/media-plugins/gst-plugins-modplug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-mpeg2dec/metadata.xml b/media-plugins/gst-plugins-mpeg2dec/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-mpeg2dec/metadata.xml
+++ b/media-plugins/gst-plugins-mpeg2dec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-mpeg2enc/metadata.xml b/media-plugins/gst-plugins-mpeg2enc/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-mpeg2enc/metadata.xml
+++ b/media-plugins/gst-plugins-mpeg2enc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-mplex/metadata.xml b/media-plugins/gst-plugins-mplex/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-mplex/metadata.xml
+++ b/media-plugins/gst-plugins-mplex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-musepack/metadata.xml b/media-plugins/gst-plugins-musepack/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-musepack/metadata.xml
+++ b/media-plugins/gst-plugins-musepack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-neon/metadata.xml b/media-plugins/gst-plugins-neon/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-neon/metadata.xml
+++ b/media-plugins/gst-plugins-neon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-ofa/metadata.xml b/media-plugins/gst-plugins-ofa/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-ofa/metadata.xml
+++ b/media-plugins/gst-plugins-ofa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-ogg/metadata.xml b/media-plugins/gst-plugins-ogg/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-ogg/metadata.xml
+++ b/media-plugins/gst-plugins-ogg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-openh264/metadata.xml b/media-plugins/gst-plugins-openh264/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-openh264/metadata.xml
+++ b/media-plugins/gst-plugins-openh264/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-opus/metadata.xml b/media-plugins/gst-plugins-opus/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-opus/metadata.xml
+++ b/media-plugins/gst-plugins-opus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-oss/metadata.xml b/media-plugins/gst-plugins-oss/metadata.xml
index 9963cbaa1c79..bac28b8325f8 100644
--- a/media-plugins/gst-plugins-oss/metadata.xml
+++ b/media-plugins/gst-plugins-oss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for OSS (Open Sound System) support
 
diff --git a/media-plugins/gst-plugins-pango/metadata.xml b/media-plugins/gst-plugins-pango/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-pango/metadata.xml
+++ b/media-plugins/gst-plugins-pango/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-pulse/metadata.xml b/media-plugins/gst-plugins-pulse/metadata.xml
index ff5f11a5837d..b4b7d34b2c20 100644
--- a/media-plugins/gst-plugins-pulse/metadata.xml
+++ b/media-plugins/gst-plugins-pulse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for the PulseAudio sound server.
 
diff --git a/media-plugins/gst-plugins-raw1394/metadata.xml b/media-plugins/gst-plugins-raw1394/metadata.xml
index 74db661655fa..41781ab68693 100644
--- a/media-plugins/gst-plugins-raw1394/metadata.xml
+++ b/media-plugins/gst-plugins-raw1394/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for capturing video source via firewire (IEEE1394 interface).
 
diff --git a/media-plugins/gst-plugins-resindvd/metadata.xml b/media-plugins/gst-plugins-resindvd/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-resindvd/metadata.xml
+++ b/media-plugins/gst-plugins-resindvd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-rtmp/metadata.xml b/media-plugins/gst-plugins-rtmp/metadata.xml
index e0cf080599cb..23d17a082e05 100644
--- a/media-plugins/gst-plugins-rtmp/metadata.xml
+++ b/media-plugins/gst-plugins-rtmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for reading RTMP streams.
 
diff --git a/media-plugins/gst-plugins-schroedinger/metadata.xml b/media-plugins/gst-plugins-schroedinger/metadata.xml
index dec0396a21e7..beda1250457b 100644
--- a/media-plugins/gst-plugins-schroedinger/metadata.xml
+++ b/media-plugins/gst-plugins-schroedinger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gstreamer</herd>
+  <maintainer>
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-shout2/metadata.xml b/media-plugins/gst-plugins-shout2/metadata.xml
index fd4056976fa0..b1ed172a8dc2 100644
--- a/media-plugins/gst-plugins-shout2/metadata.xml
+++ b/media-plugins/gst-plugins-shout2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for sending data to an icecast server using libshout2
 
diff --git a/media-plugins/gst-plugins-sidplay/metadata.xml b/media-plugins/gst-plugins-sidplay/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-sidplay/metadata.xml
+++ b/media-plugins/gst-plugins-sidplay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-smoothstreaming/metadata.xml b/media-plugins/gst-plugins-smoothstreaming/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-smoothstreaming/metadata.xml
+++ b/media-plugins/gst-plugins-smoothstreaming/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-soundtouch/metadata.xml b/media-plugins/gst-plugins-soundtouch/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-soundtouch/metadata.xml
+++ b/media-plugins/gst-plugins-soundtouch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-soup/metadata.xml b/media-plugins/gst-plugins-soup/metadata.xml
index 61a5125250b1..6f2530bea927 100644
--- a/media-plugins/gst-plugins-soup/metadata.xml
+++ b/media-plugins/gst-plugins-soup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for HTTP client source/sink via net-libs/libsoup.
 
diff --git a/media-plugins/gst-plugins-speex/metadata.xml b/media-plugins/gst-plugins-speex/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-speex/metadata.xml
+++ b/media-plugins/gst-plugins-speex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-taglib/metadata.xml b/media-plugins/gst-plugins-taglib/metadata.xml
index 66221ace6e33..88a355a7e600 100644
--- a/media-plugins/gst-plugins-taglib/metadata.xml
+++ b/media-plugins/gst-plugins-taglib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for tag writing based on taglib
 
diff --git a/media-plugins/gst-plugins-theora/metadata.xml b/media-plugins/gst-plugins-theora/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-theora/metadata.xml
+++ b/media-plugins/gst-plugins-theora/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-twolame/metadata.xml b/media-plugins/gst-plugins-twolame/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-twolame/metadata.xml
+++ b/media-plugins/gst-plugins-twolame/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-uvch264/metadata.xml b/media-plugins/gst-plugins-uvch264/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-uvch264/metadata.xml
+++ b/media-plugins/gst-plugins-uvch264/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-v4l2/metadata.xml b/media-plugins/gst-plugins-v4l2/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-v4l2/metadata.xml
+++ b/media-plugins/gst-plugins-v4l2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index b591b2bb2851..9417409478ab 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="drm">Enable DRM renderer</flag>
 	</use>
diff --git a/media-plugins/gst-plugins-voaacenc/metadata.xml b/media-plugins/gst-plugins-voaacenc/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-voaacenc/metadata.xml
+++ b/media-plugins/gst-plugins-voaacenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-voamrwbenc/metadata.xml b/media-plugins/gst-plugins-voamrwbenc/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-voamrwbenc/metadata.xml
+++ b/media-plugins/gst-plugins-voamrwbenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-vorbis/metadata.xml b/media-plugins/gst-plugins-vorbis/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-vorbis/metadata.xml
+++ b/media-plugins/gst-plugins-vorbis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-vp8/metadata.xml b/media-plugins/gst-plugins-vp8/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-vp8/metadata.xml
+++ b/media-plugins/gst-plugins-vp8/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-vpx/metadata.xml b/media-plugins/gst-plugins-vpx/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-vpx/metadata.xml
+++ b/media-plugins/gst-plugins-vpx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-wavpack/metadata.xml b/media-plugins/gst-plugins-wavpack/metadata.xml
index 641f9a3068e7..dc748e3c3c7b 100644
--- a/media-plugins/gst-plugins-wavpack/metadata.xml
+++ b/media-plugins/gst-plugins-wavpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for Wavpack lossless/lossy audio format handling.
 
diff --git a/media-plugins/gst-plugins-x/metadata.xml b/media-plugins/gst-plugins-x/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-x/metadata.xml
+++ b/media-plugins/gst-plugins-x/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-x264/metadata.xml b/media-plugins/gst-plugins-x264/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-x264/metadata.xml
+++ b/media-plugins/gst-plugins-x264/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-x265/metadata.xml b/media-plugins/gst-plugins-x265/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-x265/metadata.xml
+++ b/media-plugins/gst-plugins-x265/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-ximagesrc/metadata.xml b/media-plugins/gst-plugins-ximagesrc/metadata.xml
index 48f1b8d00ae4..76490c44999b 100644
--- a/media-plugins/gst-plugins-ximagesrc/metadata.xml
+++ b/media-plugins/gst-plugins-ximagesrc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 <longdescription lang="en">
 	GStreamer plugin for X11 video input using standard Xlib calls.
 
diff --git a/media-plugins/gst-plugins-xvid/metadata.xml b/media-plugins/gst-plugins-xvid/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-xvid/metadata.xml
+++ b/media-plugins/gst-plugins-xvid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-xvideo/metadata.xml b/media-plugins/gst-plugins-xvideo/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-plugins/gst-plugins-xvideo/metadata.xml
+++ b/media-plugins/gst-plugins-xvideo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/hexter/metadata.xml b/media-plugins/hexter/metadata.xml
index 7453a0fa2221..f6f92e745c83 100644
--- a/media-plugins/hexter/metadata.xml
+++ b/media-plugins/hexter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> based GUI</flag>
   </use>
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index 596ac20fca99..add83e74e581 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="eet">Enable Eet image loader</flag>
 	<flag name="xcf">Enable XCF image loader</flag>
diff --git a/media-plugins/ir_lv2/metadata.xml b/media-plugins/ir_lv2/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/ir_lv2/metadata.xml
+++ b/media-plugins/ir_lv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 3f9650842856..757b516f8eed 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
 		<flag name="gpssync">Build the gpssync plugin, which requires kde-apps/libkgeomap and thereby marble</flag>
diff --git a/media-plugins/libvisual-plugins/metadata.xml b/media-plugins/libvisual-plugins/metadata.xml
index 1c16bbf70ae0..77d67e187297 100644
--- a/media-plugins/libvisual-plugins/metadata.xml
+++ b/media-plugins/libvisual-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libvisual</remote-id>
 	</upstream>
diff --git a/media-plugins/libvisual-projectm/metadata.xml b/media-plugins/libvisual-projectm/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-plugins/libvisual-projectm/metadata.xml
+++ b/media-plugins/libvisual-projectm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">projectm</remote-id>
 	</upstream>
diff --git a/media-plugins/live/metadata.xml b/media-plugins/live/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-plugins/live/metadata.xml
+++ b/media-plugins/live/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-plugins/mcp-plugins/metadata.xml b/media-plugins/mcp-plugins/metadata.xml
index 3a8ea7e02972..9d7a19de1f88 100644
--- a/media-plugins/mcp-plugins/metadata.xml
+++ b/media-plugins/mcp-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/mda-lv2/metadata.xml b/media-plugins/mda-lv2/metadata.xml
index a9d9d38c2927..b5054fc3e3fb 100644
--- a/media-plugins/mda-lv2/metadata.xml
+++ b/media-plugins/mda-lv2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	MDA-LV2 is an LV2 port of the MDA plugins by Paul Kellett. It contains 36 high-quality plugins for a variety of tasks.
 
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index c33b6b928fac..77682f691f16 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
+	<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 	<use>
 		<flag name="cdr">Allows MythMusic to burn CD-Rs</flag>
 		<flag name="exif">Allows MythGallery to read EXIF data from photos</flag>
diff --git a/media-plugins/npapi-vlc/metadata.xml b/media-plugins/npapi-vlc/metadata.xml
index 0d9b0dcb7f33..7b0b0a767d03 100644
--- a/media-plugins/npapi-vlc/metadata.xml
+++ b/media-plugins/npapi-vlc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-plugins/qmmp-plugin-pack/metadata.xml b/media-plugins/qmmp-plugin-pack/metadata.xml
index 94277f8e157e..a9d9c2e813fe 100644
--- a/media-plugins/qmmp-plugin-pack/metadata.xml
+++ b/media-plugins/qmmp-plugin-pack/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index a007fa293155..f6d05be69db6 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
 		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
diff --git a/media-plugins/rev-plugins/metadata.xml b/media-plugins/rev-plugins/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/rev-plugins/metadata.xml
+++ b/media-plugins/rev-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/swh-lv2/metadata.xml b/media-plugins/swh-lv2/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/swh-lv2/metadata.xml
+++ b/media-plugins/swh-lv2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/swh-plugins/metadata.xml b/media-plugins/swh-plugins/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/swh-plugins/metadata.xml
+++ b/media-plugins/swh-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/tap-plugins/metadata.xml b/media-plugins/tap-plugins/metadata.xml
index a4924a938c0e..d07769901682 100644
--- a/media-plugins/tap-plugins/metadata.xml
+++ b/media-plugins/tap-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<longdescription>
 TAP-plugins is short for Tom's Audio Processing plugins. It is a bunch of
 LADSPA plugins for digital audio processing, intended for use in a
diff --git a/media-plugins/vamp-aubio-plugins/metadata.xml b/media-plugins/vamp-aubio-plugins/metadata.xml
index 5179b9fb44ce..616443c1fa96 100644
--- a/media-plugins/vamp-aubio-plugins/metadata.xml
+++ b/media-plugins/vamp-aubio-plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vamp</remote-id>
 	</upstream>
diff --git a/media-plugins/vamp-libxtract-plugins/metadata.xml b/media-plugins/vamp-libxtract-plugins/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-plugins/vamp-libxtract-plugins/metadata.xml
+++ b/media-plugins/vamp-libxtract-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vco-plugins/metadata.xml b/media-plugins/vco-plugins/metadata.xml
index 3a8ea7e02972..9d7a19de1f88 100644
--- a/media-plugins/vco-plugins/metadata.xml
+++ b/media-plugins/vco-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-actuator/metadata.xml b/media-plugins/vdr-actuator/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-actuator/metadata.xml
+++ b/media-plugins/vdr-actuator/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-admin/metadata.xml b/media-plugins/vdr-admin/metadata.xml
index 73b27a4b5d01..9fb49a4ad530 100644
--- a/media-plugins/vdr-admin/metadata.xml
+++ b/media-plugins/vdr-admin/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
       <email>vdr@gentoo.org</email>
       <name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-alcd/metadata.xml b/media-plugins/vdr-alcd/metadata.xml
index 4964df77e709..c43dce7637f5 100644
--- a/media-plugins/vdr-alcd/metadata.xml
+++ b/media-plugins/vdr-alcd/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
@@ -12,6 +10,10 @@
   <name>Helmut Auer</name>
   <description>Upstream maintainer</description>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 VDR plugin: Control the LCD of the Siemens Activy 300
 </longdescription>
diff --git a/media-plugins/vdr-arghdirector/metadata.xml b/media-plugins/vdr-arghdirector/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-arghdirector/metadata.xml
+++ b/media-plugins/vdr-arghdirector/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-atscepg/metadata.xml b/media-plugins/vdr-atscepg/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-atscepg/metadata.xml
+++ b/media-plugins/vdr-atscepg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-audiorecorder/metadata.xml b/media-plugins/vdr-audiorecorder/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-audiorecorder/metadata.xml
+++ b/media-plugins/vdr-audiorecorder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-autosort/metadata.xml b/media-plugins/vdr-autosort/metadata.xml
index a993cc4be301..a691bc4532a7 100644
--- a/media-plugins/vdr-autosort/metadata.xml
+++ b/media-plugins/vdr-autosort/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-avards/metadata.xml b/media-plugins/vdr-avards/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-avards/metadata.xml
+++ b/media-plugins/vdr-avards/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-beep/metadata.xml b/media-plugins/vdr-beep/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-beep/metadata.xml
+++ b/media-plugins/vdr-beep/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-bgprocess/metadata.xml b/media-plugins/vdr-bgprocess/metadata.xml
index 6b0025393c6e..dce5a4398439 100644
--- a/media-plugins/vdr-bgprocess/metadata.xml
+++ b/media-plugins/vdr-bgprocess/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-browse/metadata.xml b/media-plugins/vdr-browse/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-browse/metadata.xml
+++ b/media-plugins/vdr-browse/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-burn-templates/metadata.xml b/media-plugins/vdr-burn-templates/metadata.xml
index 8c6d2f5bb1d7..b1e2935dced9 100644
--- a/media-plugins/vdr-burn-templates/metadata.xml
+++ b/media-plugins/vdr-burn-templates/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-	<maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 	    <name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-burn/metadata.xml b/media-plugins/vdr-burn/metadata.xml
index 0f7a5460e2b0..6187ccff299d 100644
--- a/media-plugins/vdr-burn/metadata.xml
+++ b/media-plugins/vdr-burn/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-calc/metadata.xml b/media-plugins/vdr-calc/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-calc/metadata.xml
+++ b/media-plugins/vdr-calc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-cdplayer/metadata.xml b/media-plugins/vdr-cdplayer/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-cdplayer/metadata.xml
+++ b/media-plugins/vdr-cdplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-chanman/metadata.xml b/media-plugins/vdr-chanman/metadata.xml
index cbc3523c0316..e88203689328 100644
--- a/media-plugins/vdr-chanman/metadata.xml
+++ b/media-plugins/vdr-chanman/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
-
 <maintainer>
 <email>christian.gmeiner@gmail.com</email>
 <name>Christian Gmeiner</name>
@@ -16,4 +13,8 @@
 <description>Proxying maintainer</description>
 </maintainer>
 
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-channelblocker/metadata.xml b/media-plugins/vdr-channelblocker/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-channelblocker/metadata.xml
+++ b/media-plugins/vdr-channelblocker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-cinebars/metadata.xml b/media-plugins/vdr-cinebars/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-cinebars/metadata.xml
+++ b/media-plugins/vdr-cinebars/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-clock/metadata.xml b/media-plugins/vdr-clock/metadata.xml
index c395a8b3dd40..4555f8b3099e 100644
--- a/media-plugins/vdr-clock/metadata.xml
+++ b/media-plugins/vdr-clock/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>media-tv</herd>
-        <maintainer>
+    <maintainer>
             <email>vdr@gentoo.org</email>
             <name>Gentoo VDR Project</name>
     	    <description>
diff --git a/media-plugins/vdr-console/metadata.xml b/media-plugins/vdr-console/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-console/metadata.xml
+++ b/media-plugins/vdr-console/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-coverviewer/metadata.xml b/media-plugins/vdr-coverviewer/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-coverviewer/metadata.xml
+++ b/media-plugins/vdr-coverviewer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-cpumon/metadata.xml b/media-plugins/vdr-cpumon/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-cpumon/metadata.xml
+++ b/media-plugins/vdr-cpumon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-decruft/metadata.xml b/media-plugins/vdr-decruft/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-decruft/metadata.xml
+++ b/media-plugins/vdr-decruft/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-devstatus/metadata.xml b/media-plugins/vdr-devstatus/metadata.xml
index 6b0025393c6e..dce5a4398439 100644
--- a/media-plugins/vdr-devstatus/metadata.xml
+++ b/media-plugins/vdr-devstatus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-dummydevice/metadata.xml b/media-plugins/vdr-dummydevice/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-dummydevice/metadata.xml
+++ b/media-plugins/vdr-dummydevice/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-duplicates/metadata.xml b/media-plugins/vdr-duplicates/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-duplicates/metadata.xml
+++ b/media-plugins/vdr-duplicates/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index e947c6b9b74b..e3a0aeedb5ec 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
diff --git a/media-plugins/vdr-dvbhddevice/metadata.xml b/media-plugins/vdr-dvbhddevice/metadata.xml
index 9a88eb106221..c2e094a1fce4 100644
--- a/media-plugins/vdr-dvbhddevice/metadata.xml
+++ b/media-plugins/vdr-dvbhddevice/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-dvbsddevice/metadata.xml b/media-plugins/vdr-dvbsddevice/metadata.xml
index 94d2eca26f15..18bf54be7ee8 100644
--- a/media-plugins/vdr-dvbsddevice/metadata.xml
+++ b/media-plugins/vdr-dvbsddevice/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-dvd/metadata.xml b/media-plugins/vdr-dvd/metadata.xml
index bdc2d42290e3..f726922d66e7 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-dvdswitch/metadata.xml b/media-plugins/vdr-dvdswitch/metadata.xml
index fb313c2b3c47..d458e4e7d377 100644
--- a/media-plugins/vdr-dvdswitch/metadata.xml
+++ b/media-plugins/vdr-dvdswitch/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index a5a8c517a700..7016024ba7b3 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-epgsync/metadata.xml b/media-plugins/vdr-epgsync/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/media-plugins/vdr-epgsync/metadata.xml
+++ b/media-plugins/vdr-epgsync/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-exec/metadata.xml b/media-plugins/vdr-exec/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-exec/metadata.xml
+++ b/media-plugins/vdr-exec/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-extb/metadata.xml b/media-plugins/vdr-extb/metadata.xml
index 4c7ba1e416d5..015b5bc048ca 100644
--- a/media-plugins/vdr-extb/metadata.xml
+++ b/media-plugins/vdr-extb/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-extrecmenu/metadata.xml b/media-plugins/vdr-extrecmenu/metadata.xml
index 4c7ba1e416d5..015b5bc048ca 100644
--- a/media-plugins/vdr-extrecmenu/metadata.xml
+++ b/media-plugins/vdr-extrecmenu/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-femon/metadata.xml b/media-plugins/vdr-femon/metadata.xml
index ac952716b14d..10d8a08e9c12 100644
--- a/media-plugins/vdr-femon/metadata.xml
+++ b/media-plugins/vdr-femon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-fepg/metadata.xml b/media-plugins/vdr-fepg/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-fepg/metadata.xml
+++ b/media-plugins/vdr-fepg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-ffnetdev/metadata.xml b/media-plugins/vdr-ffnetdev/metadata.xml
index 7b3fdfd9ff6a..a11e67683e8d 100644
--- a/media-plugins/vdr-ffnetdev/metadata.xml
+++ b/media-plugins/vdr-ffnetdev/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-filebrowser/metadata.xml b/media-plugins/vdr-filebrowser/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-filebrowser/metadata.xml
+++ b/media-plugins/vdr-filebrowser/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-freecell/metadata.xml b/media-plugins/vdr-freecell/metadata.xml
index 4a858b6a7d4a..acbbc3cdf032 100644
--- a/media-plugins/vdr-freecell/metadata.xml
+++ b/media-plugins/vdr-freecell/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-fritzbox/metadata.xml b/media-plugins/vdr-fritzbox/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-fritzbox/metadata.xml
+++ b/media-plugins/vdr-fritzbox/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-graphlcd/metadata.xml b/media-plugins/vdr-graphlcd/metadata.xml
index ea78167eef7c..befde0394981 100644
--- a/media-plugins/vdr-graphlcd/metadata.xml
+++ b/media-plugins/vdr-graphlcd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>media-tv</herd>
-      <maintainer>
+    <maintainer>
         <email>vdr@gentoo.org</email>
         <name>Gentoo VDR Project</name>
       </maintainer>
diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
index 3e10421fa1a0..58b7140f61b0 100644
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ b/media-plugins/vdr-graphtft/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-image/metadata.xml b/media-plugins/vdr-image/metadata.xml
index e820fe1a8995..0170c4319b48 100644
--- a/media-plugins/vdr-image/metadata.xml
+++ b/media-plugins/vdr-image/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 			<description>
diff --git a/media-plugins/vdr-imonlcd/metadata.xml b/media-plugins/vdr-imonlcd/metadata.xml
index 53d38987c8c0..097975e3adc2 100644
--- a/media-plugins/vdr-imonlcd/metadata.xml
+++ b/media-plugins/vdr-imonlcd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/media-plugins/vdr-infosatepg/metadata.xml b/media-plugins/vdr-infosatepg/metadata.xml
index 313ba359cda7..3062b3bfc5b0 100644
--- a/media-plugins/vdr-infosatepg/metadata.xml
+++ b/media-plugins/vdr-infosatepg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>media-tv</herd>
         <maintainer>
                 <email>vdr@gentoo.org</email>
                 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-iptv/metadata.xml b/media-plugins/vdr-iptv/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-iptv/metadata.xml
+++ b/media-plugins/vdr-iptv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-joystick/metadata.xml b/media-plugins/vdr-joystick/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-joystick/metadata.xml
+++ b/media-plugins/vdr-joystick/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-kvdrmon/metadata.xml b/media-plugins/vdr-kvdrmon/metadata.xml
index 375121aa42ba..4c2e7033b4c5 100644
--- a/media-plugins/vdr-kvdrmon/metadata.xml
+++ b/media-plugins/vdr-kvdrmon/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@bjusystems.de</email>
 		<name>Bernd Juraschek</name>
@@ -11,6 +9,10 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vdr-statusleds</remote-id>
 	</upstream>
diff --git a/media-plugins/vdr-launcher/metadata.xml b/media-plugins/vdr-launcher/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-launcher/metadata.xml
+++ b/media-plugins/vdr-launcher/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-lcdproc/metadata.xml b/media-plugins/vdr-lcdproc/metadata.xml
index 9528e201da64..948cb9ebf168 100644
--- a/media-plugins/vdr-lcdproc/metadata.xml
+++ b/media-plugins/vdr-lcdproc/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-lcr/metadata.xml b/media-plugins/vdr-lcr/metadata.xml
index 0c60c8206fe4..02a041c8344c 100644
--- a/media-plugins/vdr-lcr/metadata.xml
+++ b/media-plugins/vdr-lcr/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 			<description>
diff --git a/media-plugins/vdr-live/metadata.xml b/media-plugins/vdr-live/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-live/metadata.xml
+++ b/media-plugins/vdr-live/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-loadepg/metadata.xml b/media-plugins/vdr-loadepg/metadata.xml
index 4a5789f10e28..398fe838bac8 100644
--- a/media-plugins/vdr-loadepg/metadata.xml
+++ b/media-plugins/vdr-loadepg/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
   		</maintainer>
diff --git a/media-plugins/vdr-mailbox/metadata.xml b/media-plugins/vdr-mailbox/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-mailbox/metadata.xml
+++ b/media-plugins/vdr-mailbox/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-markad/metadata.xml b/media-plugins/vdr-markad/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-markad/metadata.xml
+++ b/media-plugins/vdr-markad/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-menuorg/metadata.xml b/media-plugins/vdr-menuorg/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-menuorg/metadata.xml
+++ b/media-plugins/vdr-menuorg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-mlist/metadata.xml b/media-plugins/vdr-mlist/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-mlist/metadata.xml
+++ b/media-plugins/vdr-mlist/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-mount/metadata.xml b/media-plugins/vdr-mount/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-mount/metadata.xml
+++ b/media-plugins/vdr-mount/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-mp3ng/metadata.xml b/media-plugins/vdr-mp3ng/metadata.xml
index 5c2dd67dc7ff..81fae0b77130 100644
--- a/media-plugins/vdr-mp3ng/metadata.xml
+++ b/media-plugins/vdr-mp3ng/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-mplayer/metadata.xml b/media-plugins/vdr-mplayer/metadata.xml
index 7db232940db5..84a5fcff324d 100644
--- a/media-plugins/vdr-mplayer/metadata.xml
+++ b/media-plugins/vdr-mplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
index 20dc06c0521a..11707e1b32de 100644
--- a/media-plugins/vdr-music/metadata.xml
+++ b/media-plugins/vdr-music/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-newsticker/metadata.xml b/media-plugins/vdr-newsticker/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-newsticker/metadata.xml
+++ b/media-plugins/vdr-newsticker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-noepg/metadata.xml b/media-plugins/vdr-noepg/metadata.xml
index ce006eaf85a2..1f8cb3dbe2f4 100644
--- a/media-plugins/vdr-noepg/metadata.xml
+++ b/media-plugins/vdr-noepg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-nordlichtsepg/metadata.xml b/media-plugins/vdr-nordlichtsepg/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-nordlichtsepg/metadata.xml
+++ b/media-plugins/vdr-nordlichtsepg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-osdpip/metadata.xml b/media-plugins/vdr-osdpip/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-osdpip/metadata.xml
+++ b/media-plugins/vdr-osdpip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-osdserver/metadata.xml b/media-plugins/vdr-osdserver/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-osdserver/metadata.xml
+++ b/media-plugins/vdr-osdserver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-osdteletext/metadata.xml b/media-plugins/vdr-osdteletext/metadata.xml
index fd3c9ce9ec5a..5c1d28978c7c 100644
--- a/media-plugins/vdr-osdteletext/metadata.xml
+++ b/media-plugins/vdr-osdteletext/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	  <description>Please contacts maintainer before you change something.</description>
diff --git a/media-plugins/vdr-peer/metadata.xml b/media-plugins/vdr-peer/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-peer/metadata.xml
+++ b/media-plugins/vdr-peer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-permashift/metadata.xml b/media-plugins/vdr-permashift/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-permashift/metadata.xml
+++ b/media-plugins/vdr-permashift/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-picselshow/metadata.xml b/media-plugins/vdr-picselshow/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-picselshow/metadata.xml
+++ b/media-plugins/vdr-picselshow/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-pilot/metadata.xml b/media-plugins/vdr-pilot/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-pilot/metadata.xml
+++ b/media-plugins/vdr-pilot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-pilotskin/metadata.xml b/media-plugins/vdr-pilotskin/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-pilotskin/metadata.xml
+++ b/media-plugins/vdr-pilotskin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-pin/metadata.xml b/media-plugins/vdr-pin/metadata.xml
index c07666634ae5..d59c34bb826d 100644
--- a/media-plugins/vdr-pin/metadata.xml
+++ b/media-plugins/vdr-pin/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-powermate/metadata.xml b/media-plugins/vdr-powermate/metadata.xml
index 20b21cfa6df8..897076276e61 100644
--- a/media-plugins/vdr-powermate/metadata.xml
+++ b/media-plugins/vdr-powermate/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-prefermenu/metadata.xml b/media-plugins/vdr-prefermenu/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-prefermenu/metadata.xml
+++ b/media-plugins/vdr-prefermenu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-proxy/metadata.xml b/media-plugins/vdr-proxy/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-proxy/metadata.xml
+++ b/media-plugins/vdr-proxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-pvr350/metadata.xml b/media-plugins/vdr-pvr350/metadata.xml
index b228325bbfed..5f25ff08d533 100644
--- a/media-plugins/vdr-pvr350/metadata.xml
+++ b/media-plugins/vdr-pvr350/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-pvrinput/metadata.xml b/media-plugins/vdr-pvrinput/metadata.xml
index 26edd4801fb7..c29102abfbc6 100644
--- a/media-plugins/vdr-pvrinput/metadata.xml
+++ b/media-plugins/vdr-pvrinput/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
 			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-quicktimer/metadata.xml b/media-plugins/vdr-quicktimer/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-quicktimer/metadata.xml
+++ b/media-plugins/vdr-quicktimer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-radio/metadata.xml b/media-plugins/vdr-radio/metadata.xml
index c6c589a5443d..776309c646d8 100644
--- a/media-plugins/vdr-radio/metadata.xml
+++ b/media-plugins/vdr-radio/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-radiolist/metadata.xml b/media-plugins/vdr-radiolist/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-radiolist/metadata.xml
+++ b/media-plugins/vdr-radiolist/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-rcu/metadata.xml b/media-plugins/vdr-rcu/metadata.xml
index 94d2eca26f15..18bf54be7ee8 100644
--- a/media-plugins/vdr-rcu/metadata.xml
+++ b/media-plugins/vdr-rcu/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-recsearch/metadata.xml b/media-plugins/vdr-recsearch/metadata.xml
index da5ebae71107..672c18f25b97 100644
--- a/media-plugins/vdr-recsearch/metadata.xml
+++ b/media-plugins/vdr-recsearch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-recstatus/metadata.xml b/media-plugins/vdr-recstatus/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-recstatus/metadata.xml
+++ b/media-plugins/vdr-recstatus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-remote/metadata.xml b/media-plugins/vdr-remote/metadata.xml
index 8bd006c2ea36..51e66b74746e 100644
--- a/media-plugins/vdr-remote/metadata.xml
+++ b/media-plugins/vdr-remote/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-	<maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-remoteosd/metadata.xml b/media-plugins/vdr-remoteosd/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/media-plugins/vdr-remoteosd/metadata.xml
+++ b/media-plugins/vdr-remoteosd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-remotetimers/metadata.xml b/media-plugins/vdr-remotetimers/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/media-plugins/vdr-remotetimers/metadata.xml
+++ b/media-plugins/vdr-remotetimers/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-rotor/metadata.xml b/media-plugins/vdr-rotor/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-rotor/metadata.xml
+++ b/media-plugins/vdr-rotor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-rpihddevice/metadata.xml b/media-plugins/vdr-rpihddevice/metadata.xml
index 94d2eca26f15..18bf54be7ee8 100644
--- a/media-plugins/vdr-rpihddevice/metadata.xml
+++ b/media-plugins/vdr-rpihddevice/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/media-plugins/vdr-rssreader/metadata.xml b/media-plugins/vdr-rssreader/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-rssreader/metadata.xml
+++ b/media-plugins/vdr-rssreader/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-scheduler/metadata.xml b/media-plugins/vdr-scheduler/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-scheduler/metadata.xml
+++ b/media-plugins/vdr-scheduler/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-screenshot/metadata.xml b/media-plugins/vdr-screenshot/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-screenshot/metadata.xml
+++ b/media-plugins/vdr-screenshot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-serial/metadata.xml b/media-plugins/vdr-serial/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-serial/metadata.xml
+++ b/media-plugins/vdr-serial/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-skincurses/metadata.xml b/media-plugins/vdr-skincurses/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-skincurses/metadata.xml
+++ b/media-plugins/vdr-skincurses/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-skinelchi/metadata.xml b/media-plugins/vdr-skinelchi/metadata.xml
index cb4801091e1b..42cd39a33160 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
     <email>vdr@gentoo.org</email>
     <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-skinenigmang/metadata.xml b/media-plugins/vdr-skinenigmang/metadata.xml
index 4cbd0a3e5ea4..db07426a4e30 100644
--- a/media-plugins/vdr-skinenigmang/metadata.xml
+++ b/media-plugins/vdr-skinenigmang/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-skinnopacity/metadata.xml b/media-plugins/vdr-skinnopacity/metadata.xml
index ceb45da48f62..116ba2434715 100644
--- a/media-plugins/vdr-skinnopacity/metadata.xml
+++ b/media-plugins/vdr-skinnopacity/metadata.xml
@@ -5,5 +5,4 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
-	<herd>media-tv</herd>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/media-plugins/vdr-skinsoppalusikka/metadata.xml b/media-plugins/vdr-skinsoppalusikka/metadata.xml
index 4cbd0a3e5ea4..db07426a4e30 100644
--- a/media-plugins/vdr-skinsoppalusikka/metadata.xml
+++ b/media-plugins/vdr-skinsoppalusikka/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-sleeptimer/metadata.xml b/media-plugins/vdr-sleeptimer/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-sleeptimer/metadata.xml
+++ b/media-plugins/vdr-sleeptimer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-sndctl/metadata.xml b/media-plugins/vdr-sndctl/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-sndctl/metadata.xml
+++ b/media-plugins/vdr-sndctl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-solitaire/metadata.xml b/media-plugins/vdr-solitaire/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-solitaire/metadata.xml
+++ b/media-plugins/vdr-solitaire/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-span/metadata.xml b/media-plugins/vdr-span/metadata.xml
index 04664717a4f1..42885e969281 100644
--- a/media-plugins/vdr-span/metadata.xml
+++ b/media-plugins/vdr-span/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 	<email>vdr@gentoo.org</email>
 	<name>Gentoo VDR Project</name>	
diff --git a/media-plugins/vdr-spider/metadata.xml b/media-plugins/vdr-spider/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-spider/metadata.xml
+++ b/media-plugins/vdr-spider/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml
index afdf685c26ad..48f11f300e35 100644
--- a/media-plugins/vdr-streamdev/metadata.xml
+++ b/media-plugins/vdr-streamdev/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-sudoku/metadata.xml b/media-plugins/vdr-sudoku/metadata.xml
index 4c210f4c475c..3b56bb6f5e01 100644
--- a/media-plugins/vdr-sudoku/metadata.xml
+++ b/media-plugins/vdr-sudoku/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
-	<maintainer>
+  <maintainer>
 	  <email>vdr@gentoo.org</email>
 	  <name>Gentoo VDR Project</name>
 	  <description>
diff --git a/media-plugins/vdr-suspendoutput/metadata.xml b/media-plugins/vdr-suspendoutput/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-suspendoutput/metadata.xml
+++ b/media-plugins/vdr-suspendoutput/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-svdrposd/metadata.xml b/media-plugins/vdr-svdrposd/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/media-plugins/vdr-svdrposd/metadata.xml
+++ b/media-plugins/vdr-svdrposd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-svdrpservice/metadata.xml b/media-plugins/vdr-svdrpservice/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/media-plugins/vdr-svdrpservice/metadata.xml
+++ b/media-plugins/vdr-svdrpservice/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/media-plugins/vdr-systeminfo/metadata.xml b/media-plugins/vdr-systeminfo/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-systeminfo/metadata.xml
+++ b/media-plugins/vdr-systeminfo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
index bbdf85da384b..0403c6665589 100644
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ b/media-plugins/vdr-text2skin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-ttxtsubs/metadata.xml b/media-plugins/vdr-ttxtsubs/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-ttxtsubs/metadata.xml
+++ b/media-plugins/vdr-ttxtsubs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-tvguide/metadata.xml b/media-plugins/vdr-tvguide/metadata.xml
index ceb45da48f62..116ba2434715 100644
--- a/media-plugins/vdr-tvguide/metadata.xml
+++ b/media-plugins/vdr-tvguide/metadata.xml
@@ -5,5 +5,4 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
-	<herd>media-tv</herd>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/media-plugins/vdr-undelete/metadata.xml b/media-plugins/vdr-undelete/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-plugins/vdr-undelete/metadata.xml
+++ b/media-plugins/vdr-undelete/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-vcd/metadata.xml b/media-plugins/vdr-vcd/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-vcd/metadata.xml
+++ b/media-plugins/vdr-vcd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-vdrmanager/metadata.xml b/media-plugins/vdr-vdrmanager/metadata.xml
index 957b9a18d07b..62d0bb6c5747 100644
--- a/media-plugins/vdr-vdrmanager/metadata.xml
+++ b/media-plugins/vdr-vdrmanager/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-videosystem/metadata.xml b/media-plugins/vdr-videosystem/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-videosystem/metadata.xml
+++ b/media-plugins/vdr-videosystem/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-vodcatcher/metadata.xml
+++ b/media-plugins/vdr-vodcatcher/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-vompserver/metadata.xml b/media-plugins/vdr-vompserver/metadata.xml
index 9942f60ccf48..4b8a7b59cbdc 100644
--- a/media-plugins/vdr-vompserver/metadata.xml
+++ b/media-plugins/vdr-vompserver/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
-
 <maintainer>
   <email>pfrank@gmx.de</email>
   <name>Petric Frank</name>
@@ -14,4 +11,8 @@
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-wapd/metadata.xml b/media-plugins/vdr-wapd/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-wapd/metadata.xml
+++ b/media-plugins/vdr-wapd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-weatherng/metadata.xml b/media-plugins/vdr-weatherng/metadata.xml
index 3b68ca7b4c3f..3de5f5655431 100644
--- a/media-plugins/vdr-weatherng/metadata.xml
+++ b/media-plugins/vdr-weatherng/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-	<maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
diff --git a/media-plugins/vdr-wirbelscan/metadata.xml b/media-plugins/vdr-wirbelscan/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-wirbelscan/metadata.xml
+++ b/media-plugins/vdr-wirbelscan/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
index 6c98ab766c2d..bd87c8cc2e1c 100644
--- a/media-plugins/vdr-xine/metadata.xml
+++ b/media-plugins/vdr-xine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<use>
 		<flag name="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
 	</use>
diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index cea235f85348..e3fceb3eaa6a 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
diff --git a/media-plugins/vdr-xvdr/metadata.xml b/media-plugins/vdr-xvdr/metadata.xml
index d7ad70b1cd82..af3a9b10cc3f 100644
--- a/media-plugins/vdr-xvdr/metadata.xml
+++ b/media-plugins/vdr-xvdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-zaphistory/metadata.xml b/media-plugins/vdr-zaphistory/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-plugins/vdr-zaphistory/metadata.xml
+++ b/media-plugins/vdr-zaphistory/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-zappilot/metadata.xml b/media-plugins/vdr-zappilot/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-plugins/vdr-zappilot/metadata.xml
+++ b/media-plugins/vdr-zappilot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-plugins/xbmc-addon-xvdr/metadata.xml b/media-plugins/xbmc-addon-xvdr/metadata.xml
index 33b9b3faab28..2b0d8ca5bad2 100644
--- a/media-plugins/xbmc-addon-xvdr/metadata.xml
+++ b/media-plugins/xbmc-addon-xvdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/xsynth-dssi/metadata.xml b/media-plugins/xsynth-dssi/metadata.xml
index ecc06c7ce1db..27c2236954f9 100644
--- a/media-plugins/xsynth-dssi/metadata.xml
+++ b/media-plugins/xsynth-dssi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dssi</remote-id>
 	</upstream>
diff --git a/media-radio/qsstv/metadata.xml b/media-radio/qsstv/metadata.xml
index 9887e2206b3e..4ab34a0d3cf9 100644
--- a/media-radio/qsstv/metadata.xml
+++ b/media-radio/qsstv/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
   <email>tomjbe@gentoo.org</email>
   <name>Thomas Beierlein</name>
 </maintainer>
+<maintainer>
+  <email>radio@gentoo.org</email>
+  <name>Radio</name>
+</maintainer>
 <longdescription>An amateur radio SSTV software</longdescription>
 </pkgmetadata>
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
index b5e5f691ef67..db64734dac21 100644
--- a/media-sound/SmarTagger/metadata.xml
+++ b/media-sound/SmarTagger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">smartagger</remote-id>
 	</upstream>
diff --git a/media-sound/a2jmidid/metadata.xml b/media-sound/a2jmidid/metadata.xml
index 9c64e0edad0d..1d39bfb6e3c8 100644
--- a/media-sound/a2jmidid/metadata.xml
+++ b/media-sound/a2jmidid/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
@@ -11,4 +9,12 @@
 		<email>l33tmmx@gmail.com</email>
 		<name>Jouni Rinne</name>
 	</maintainer>
+<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/aacplusenc/metadata.xml b/media-sound/aacplusenc/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/aacplusenc/metadata.xml
+++ b/media-sound/aacplusenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 02333a889508..ec5e11f539a8 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
 		<flag name="mac">Enable support for Monkey's Audio files</flag>
diff --git a/media-sound/abcm2ps/metadata.xml b/media-sound/abcm2ps/metadata.xml
index 9e9e140a45df..fa8e3da3de40 100644
--- a/media-sound/abcm2ps/metadata.xml
+++ b/media-sound/abcm2ps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="pango">Use the pango library to render fonts with non-latin characters</flag>
 	</use>
diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index b67060c7320f..b273e0ab0d8d 100644
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">abc</remote-id>
 	</upstream>
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
index 88d380c3ac81..2fed612d2400 100644
--- a/media-sound/adplay/metadata.xml
+++ b/media-sound/adplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">adplug</remote-id>
 	</upstream>
diff --git a/media-sound/aeolus/metadata.xml b/media-sound/aeolus/metadata.xml
index a2cd58b8094c..d9b39212d6dc 100644
--- a/media-sound/aeolus/metadata.xml
+++ b/media-sound/aeolus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that should
 	be good enough to make an organist enjoy playing it. It is a software
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
index 4ce038f08186..b9688ed05549 100644
--- a/media-sound/alsa-tools/metadata.xml
+++ b/media-sound/alsa-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>alsa</herd>
   <maintainer>
     <email>alsa-bugs@gentoo.org</email>
   </maintainer>
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
index 128591833ac1..2d033a67e692 100644
--- a/media-sound/alsa-utils/metadata.xml
+++ b/media-sound/alsa-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>alsa</herd>
   <maintainer>
     <email>alsa-bugs@gentoo.org</email>
   </maintainer>
diff --git a/media-sound/alsamixer-app/metadata.xml b/media-sound/alsamixer-app/metadata.xml
index 6cca9a9b2612..52cf649535db 100644
--- a/media-sound/alsamixer-app/metadata.xml
+++ b/media-sound/alsamixer-app/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
 </maintainer>
 
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+
 </pkgmetadata>
diff --git a/media-sound/alsamixergui/metadata.xml b/media-sound/alsamixergui/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/alsamixergui/metadata.xml
+++ b/media-sound/alsamixergui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
index 58f0ddd695be..e550874bef11 100644
--- a/media-sound/alsaplayer/metadata.xml
+++ b/media-sound/alsaplayer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
 	</use>
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index c964fd8c4bac..f0ba570a532e 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>sound</herd>
 <maintainer>
 	<email>jmbsvicetto@gentoo.org</email>
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 <use>
 	<flag name="embedded">Use libmysqld, MySQL embedded server library.
 		Try disabling this if you encounter -PIC related in amarok,
diff --git a/media-sound/ams/metadata.xml b/media-sound/ams/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/ams/metadata.xml
+++ b/media-sound/ams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">alsamodular</remote-id>
 	</upstream>
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 934627feac58..df0b013d136b 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
 	</use>
diff --git a/media-sound/apetag/metadata.xml b/media-sound/apetag/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/apetag/metadata.xml
+++ b/media-sound/apetag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 49f3ae2cc86b..c5dd8459b68b 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>billie@gentoo.org</email>
     <name>Daniel Pielmeier</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="ifp">Enable support for iRiver iFP portable audio players</flag>
     <flag name="lua">Enable support for programmable title formatting with
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 7a22596af972..3a5f409e2c33 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="lv2">Add support for Ladspa V2</flag>
   </use>
diff --git a/media-sound/aseqview/metadata.xml b/media-sound/aseqview/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aseqview/metadata.xml
+++ b/media-sound/aseqview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 21e8ec2ec85f..f1aed4c99646 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+	</maintainer>
 <use>
   <flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
   <flag name="opus">Support for creation of Opus files</flag>
diff --git a/media-sound/aucdtect/metadata.xml b/media-sound/aucdtect/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/aucdtect/metadata.xml
+++ b/media-sound/aucdtect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index cf82d9d8a5f2..0c78ab267420 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
 	<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index b524f7543704..1a7ce37a98f1 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
   <maintainer>
     <email>richard@audacityteam.org</email>
     <name>Richard Ash</name>
     <description>Upstream - please CC on bugs that concerns upstream</description>
   </maintainer>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="libsoxr">
diff --git a/media-sound/audex/metadata.xml b/media-sound/audex/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-sound/audex/metadata.xml
+++ b/media-sound/audex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/audiocompress/metadata.xml b/media-sound/audiocompress/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/audiocompress/metadata.xml
+++ b/media-sound/audiocompress/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/audiotag/metadata.xml b/media-sound/audiotag/metadata.xml
index c670e555e241..d339e4ba0d43 100644
--- a/media-sound/audiotag/metadata.xml
+++ b/media-sound/audiotag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">downloads/Daenyth</remote-id>
 	</upstream>
diff --git a/media-sound/aumix/metadata.xml b/media-sound/aumix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aumix/metadata.xml
+++ b/media-sound/aumix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/awesfx/metadata.xml b/media-sound/awesfx/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/awesfx/metadata.xml
+++ b/media-sound/awesfx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/aylet/metadata.xml b/media-sound/aylet/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aylet/metadata.xml
+++ b/media-sound/aylet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/banshee/metadata.xml b/media-sound/banshee/metadata.xml
index 82bea70c98b2..58b0fbc8e8c4 100644
--- a/media-sound/banshee/metadata.xml
+++ b/media-sound/banshee/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bpm">Build beats per minute detection extension</flag>
 		<flag name="cdda">Build with audio CD support</flag>
diff --git a/media-sound/bempc/metadata.xml b/media-sound/bempc/metadata.xml
index 860c306fcfde..b61cc533e391 100644
--- a/media-sound/bempc/metadata.xml
+++ b/media-sound/bempc/metadata.xml
@@ -5,5 +5,8 @@
     <email>pinkbyte@gentoo.org</email>
     <name>Sergey Popov</name>
   </maintainer>
-  <herd>qt</herd>
-</pkgmetadata>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/media-sound/bitmeter/metadata.xml b/media-sound/bitmeter/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/bitmeter/metadata.xml
+++ b/media-sound/bitmeter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/bladeenc/metadata.xml b/media-sound/bladeenc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/bladeenc/metadata.xml
+++ b/media-sound/bladeenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/bplay/metadata.xml b/media-sound/bplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/bplay/metadata.xml
+++ b/media-sound/bplay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/bpmdetect/metadata.xml b/media-sound/bpmdetect/metadata.xml
index 605408c4b7f1..f308b63e236b 100644
--- a/media-sound/bpmdetect/metadata.xml
+++ b/media-sound/bpmdetect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bpmdetect</remote-id>
 	</upstream>
diff --git a/media-sound/bristol/metadata.xml b/media-sound/bristol/metadata.xml
index bafa55c948c1..900a6ef75576 100644
--- a/media-sound/bristol/metadata.xml
+++ b/media-sound/bristol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Bristol is synth emulation package for a diverse range of vintage
 		synthesisers, electric pianos and organs. The application consists of a
diff --git a/media-sound/brutefir/metadata.xml b/media-sound/brutefir/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/brutefir/metadata.xml
+++ b/media-sound/brutefir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 312ce3f77280..62ad484aa536 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="dynamic">Enable support for dynamic playlists</flag>
 		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
diff --git a/media-sound/cd-discid/metadata.xml b/media-sound/cd-discid/metadata.xml
index 0e4409843539..1e4b20438c6c 100644
--- a/media-sound/cd-discid/metadata.xml
+++ b/media-sound/cd-discid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">taem/cd-discid</remote-id>
 	</upstream>
diff --git a/media-sound/cdcd/metadata.xml b/media-sound/cdcd/metadata.xml
index 385a5882ed42..92c77b54cad5 100644
--- a/media-sound/cdcd/metadata.xml
+++ b/media-sound/cdcd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libcdaudio</remote-id>
 	</upstream>
diff --git a/media-sound/cdparanoia/metadata.xml b/media-sound/cdparanoia/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/cdparanoia/metadata.xml
+++ b/media-sound/cdparanoia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/cdplay/metadata.xml b/media-sound/cdplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cdplay/metadata.xml
+++ b/media-sound/cdplay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/cdstatus/metadata.xml b/media-sound/cdstatus/metadata.xml
index d28761dbf1e3..da364d419dae 100644
--- a/media-sound/cdstatus/metadata.xml
+++ b/media-sound/cdstatus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cdstatus</remote-id>
 	</upstream>
diff --git a/media-sound/cdtool/metadata.xml b/media-sound/cdtool/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/cdtool/metadata.xml
+++ b/media-sound/cdtool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/chordii/metadata.xml b/media-sound/chordii/metadata.xml
index c1cc2cbeaab8..3cf6f7c59c76 100644
--- a/media-sound/chordii/metadata.xml
+++ b/media-sound/chordii/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Chordii is a fork of Chord, a program very popular several years
 		ago and most famous for its trendsetting 'ChordPro' music file format.
diff --git a/media-sound/christine/metadata.xml b/media-sound/christine/metadata.xml
index a5fef3064c61..0a7370490c23 100644
--- a/media-sound/christine/metadata.xml
+++ b/media-sound/christine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">christine</remote-id>
 	</upstream>
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 3f662b4da6d5..3820b47cdc72 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>sound</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="box">Enable Box support</flag>
 		<flag name="dropbox">Enable Dropbox support</flag>
diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
index eccafa91989c..e6ef5903f3db 100644
--- a/media-sound/cmix/metadata.xml
+++ b/media-sound/cmix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmix</remote-id>
 	</upstream>
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index 585134186f56..d38e8aca314f 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="cdio">use libcdio for CD support </flag>
     <flag name="cue">enable CUE sheet parsing</flag>
diff --git a/media-sound/cmusfm/metadata.xml b/media-sound/cmusfm/metadata.xml
index 4ee9765db591..61896389a217 100644
--- a/media-sound/cmusfm/metadata.xml
+++ b/media-sound/cmusfm/metadata.xml
@@ -5,7 +5,10 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Arkq/cmusfm</remote-id>
   </upstream>
diff --git a/media-sound/codecgraph/metadata.xml b/media-sound/codecgraph/metadata.xml
index a025c77c7636..d610f01bea87 100644
--- a/media-sound/codecgraph/metadata.xml
+++ b/media-sound/codecgraph/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/combine_wave/metadata.xml b/media-sound/combine_wave/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/combine_wave/metadata.xml
+++ b/media-sound/combine_wave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/coquillo/metadata.xml b/media-sound/coquillo/metadata.xml
index 30d1023796f6..49caddf99969 100644
--- a/media-sound/coquillo/metadata.xml
+++ b/media-sound/coquillo/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>qt</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/cplay/metadata.xml b/media-sound/cplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cplay/metadata.xml
+++ b/media-sound/cplay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 7bab04e3178c..0ccf5b131054 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<use>
 		<flag name="beats">Build the beats score frontend</flag>
 		<flag name="chua">Build the chua opcodes</flag>
diff --git a/media-sound/cvoicecontrol/metadata.xml b/media-sound/cvoicecontrol/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cvoicecontrol/metadata.xml
+++ b/media-sound/cvoicecontrol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/dagrab/metadata.xml b/media-sound/dagrab/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/dagrab/metadata.xml
+++ b/media-sound/dagrab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 73e5d357f4e0..29cc1b6ee076 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
 		<flag name="opus">Enable Opus audio codec support</flag>
diff --git a/media-sound/darksnow/metadata.xml b/media-sound/darksnow/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/darksnow/metadata.xml
+++ b/media-sound/darksnow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml
index 0840b254c78f..5c4a332900bc 100644
--- a/media-sound/daudio/metadata.xml
+++ b/media-sound/daudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">daudio</remote-id>
 	</upstream>
diff --git a/media-sound/dcaenc/metadata.xml b/media-sound/dcaenc/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/dcaenc/metadata.xml
+++ b/media-sound/dcaenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/dcd/metadata.xml b/media-sound/dcd/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/dcd/metadata.xml
+++ b/media-sound/dcd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index cb4e278a0624..b719c34b5982 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 <use>
 	<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
 	<flag name="portmidi">Enable support for the portmidi backend</flag>
diff --git a/media-sound/din/metadata.xml b/media-sound/din/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/din/metadata.xml
+++ b/media-sound/din/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml
index 892b41956295..d212df4bb7b3 100644
--- a/media-sound/dir2ogg/metadata.xml
+++ b/media-sound/dir2ogg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="mac">Add support for decoding Monkey's Audio files</flag>
     <flag name="wma">Add support for wma files through mplayer</flag>
diff --git a/media-sound/drumstick/metadata.xml b/media-sound/drumstick/metadata.xml
index 1438ab505c5b..32c34264e197 100644
--- a/media-sound/drumstick/metadata.xml
+++ b/media-sound/drumstick/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">drumstick</remote-id>
 	</upstream>
diff --git a/media-sound/dvda-author/metadata.xml b/media-sound/dvda-author/metadata.xml
index 1d76118d5daf..2ed34169aabb 100644
--- a/media-sound/dvda-author/metadata.xml
+++ b/media-sound/dvda-author/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dvd-audio</remote-id>
 	</upstream>
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 5a1b546a1d79..02b21d7f026a 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
 		<flag name="gtk2">Enable GTK+:2 support and disable default GTK+:3 support</flag>
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index c48ef0397652..43b8126f98e3 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription>
 	Ecasound is a software package designed for multitrack audio
 	processing. It can be used for simple tasks like audio playback,
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
index 096a93c11ccf..c68060c3a208 100644
--- a/media-sound/edna/metadata.xml
+++ b/media-sound/edna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>
   Edna is Greg Stein's http streaming audio server for mp3 and ogg files.
 </longdescription>
diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
index d996167872e4..6accd0e7385d 100644
--- a/media-sound/entagged-tageditor/metadata.xml
+++ b/media-sound/entagged-tageditor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/media-sound/erec/metadata.xml b/media-sound/erec/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/erec/metadata.xml
+++ b/media-sound/erec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
index 70b17978b4e1..f9c30c7c3c46 100644
--- a/media-sound/exaile/metadata.xml
+++ b/media-sound/exaile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">exaile</remote-id>
 		<remote-id type="github">exaile/exaile</remote-id>
diff --git a/media-sound/ezstream/metadata.xml b/media-sound/ezstream/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/ezstream/metadata.xml
+++ b/media-sound/ezstream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/fapg/metadata.xml b/media-sound/fapg/metadata.xml
index 72d447316a74..12ffc3c9499a 100644
--- a/media-sound/fapg/metadata.xml
+++ b/media-sound/fapg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="xspf">Enable support for saving XSPF playlists.</flag>
   </use>
diff --git a/media-sound/flac-image/metadata.xml b/media-sound/flac-image/metadata.xml
index b1cf7fe492bb..c2ac0b233351 100644
--- a/media-sound/flac-image/metadata.xml
+++ b/media-sound/flac-image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A tiny utility for stuffing image files (e.g. album cover art) into
 		metadata blocks in FLAC files. Actually you could store and retrieve
diff --git a/media-sound/flac123/metadata.xml b/media-sound/flac123/metadata.xml
index 38f02c77fdf9..afda10fb8f19 100644
--- a/media-sound/flac123/metadata.xml
+++ b/media-sound/flac123/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">flac-tools</remote-id>
 	</upstream>
diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
index 926971b47d4f..98c94141d262 100644
--- a/media-sound/flack/metadata.xml
+++ b/media-sound/flack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A menu-driven BASH script to easily tag your collection of FLAC files
 		from the command line, without the need for a GUI.
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index d35aac6619e4..1ce32018b6bd 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
@@ -15,6 +14,10 @@
 		<name>Coacher</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="mac">Add support for Monkey's Audio input files</flag>
 		<flag name="opus">Add support for Opus output files</flag>
diff --git a/media-sound/flake/metadata.xml b/media-sound/flake/metadata.xml
index 8364f22a83d2..0fee1ce101c8 100644
--- a/media-sound/flake/metadata.xml
+++ b/media-sound/flake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">flake-enc</remote-id>
 	</upstream>
diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
index 4c753d66e1f7..82d5d4eae878 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
@@ -12,6 +11,10 @@
 <name>Nikoli</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
index 5ff04da9d27e..cd9e95515d87 100644
--- a/media-sound/fluidsynth/metadata.xml
+++ b/media-sound/fluidsynth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fluidsynth</remote-id>
 	</upstream>
diff --git a/media-sound/fmdrv/metadata.xml b/media-sound/fmdrv/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/fmdrv/metadata.xml
+++ b/media-sound/fmdrv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/fmtools/metadata.xml b/media-sound/fmtools/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/fmtools/metadata.xml
+++ b/media-sound/fmtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
index d9ad7481ae97..c14f50a9fae6 100644
--- a/media-sound/freebirth/metadata.xml
+++ b/media-sound/freebirth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">8834</remote-id>
 	</upstream>
diff --git a/media-sound/freewheeling/metadata.xml b/media-sound/freewheeling/metadata.xml
index d0cb3eb7115f..346dac00411c 100644
--- a/media-sound/freewheeling/metadata.xml
+++ b/media-sound/freewheeling/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="fluidsynth">compile with support for fluidsynth</flag>
 	</use>
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index cf9a3e330f8e..d84724ac4652 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>python</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
   </use>
diff --git a/media-sound/galan/metadata.xml b/media-sound/galan/metadata.xml
index 8fc1bf513343..7ba92019f5ea 100644
--- a/media-sound/galan/metadata.xml
+++ b/media-sound/galan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">galan</remote-id>
 	</upstream>
diff --git a/media-sound/gbsplay/metadata.xml b/media-sound/gbsplay/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/gbsplay/metadata.xml
+++ b/media-sound/gbsplay/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index 850d42a5998e..203260e2504d 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-        <maintainer>
+	<maintainer>
                 <email>DuPol@gmx.de</email>
                 <name>Dustin Polke</name>
                 <description>Proxy maintainer, to be assigned bugs</description>
 	</maintainer>
+	<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 	<use>
 		<flag name="audioscrobbler">Enable track submission on last.fm</flag>
 	</use>
diff --git a/media-sound/giada/metadata.xml b/media-sound/giada/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/giada/metadata.xml
+++ b/media-sound/giada/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gigedit/metadata.xml b/media-sound/gigedit/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gigedit/metadata.xml
+++ b/media-sound/gigedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gimmix/metadata.xml b/media-sound/gimmix/metadata.xml
index 43d99907214a..0a99ce511b0e 100644
--- a/media-sound/gimmix/metadata.xml
+++ b/media-sound/gimmix/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="cover">Enable cover art fetching</flag>
 		<flag name="lyrics">Enable lyric fetching</flag>
diff --git a/media-sound/glmix/metadata.xml b/media-sound/glmix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/glmix/metadata.xml
+++ b/media-sound/glmix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/glurp/metadata.xml b/media-sound/glurp/metadata.xml
index 65f6531b04b5..f12beb449865 100644
--- a/media-sound/glurp/metadata.xml
+++ b/media-sound/glurp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">glurp</remote-id>
 	</upstream>
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
index f507623abb56..53230382fffb 100644
--- a/media-sound/gmorgan/metadata.xml
+++ b/media-sound/gmorgan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gmorgan</remote-id>
 	</upstream>
diff --git a/media-sound/gmpc/metadata.xml b/media-sound/gmpc/metadata.xml
index 969d55282588..b78def83654f 100644
--- a/media-sound/gmpc/metadata.xml
+++ b/media-sound/gmpc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
 	<email>angelos@gentoo.org</email>
 	<name>Christoph Mende</name>
 </maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 <use>
 	<flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
 	<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
diff --git a/media-sound/gmtp/metadata.xml b/media-sound/gmtp/metadata.xml
index cfe9c2c04f39..ade8ba02ceed 100644
--- a/media-sound/gmtp/metadata.xml
+++ b/media-sound/gmtp/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription lang="en">
 gMTP is a graphical frontend to libmtp. It allows to transfer files to mtp devices like mp3 players or android tablets.
 </longdescription>
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/gnac/metadata.xml b/media-sound/gnac/metadata.xml
index 4ad88e363608..ec67d3ab9cb3 100644
--- a/media-sound/gnac/metadata.xml
+++ b/media-sound/gnac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnac</remote-id>
 	</upstream>
diff --git a/media-sound/gnomad/metadata.xml b/media-sound/gnomad/metadata.xml
index 05ec0f5c79ec..381a594fe101 100644
--- a/media-sound/gnomad/metadata.xml
+++ b/media-sound/gnomad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnomad2</remote-id>
 	</upstream>
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/gnome-music/metadata.xml
+++ b/media-sound/gnome-music/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/gnome-sound-recorder/metadata.xml
+++ b/media-sound/gnome-sound-recorder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gnomoradio/metadata.xml b/media-sound/gnomoradio/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gnomoradio/metadata.xml
+++ b/media-sound/gnomoradio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gnump3d/metadata.xml b/media-sound/gnump3d/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gnump3d/metadata.xml
+++ b/media-sound/gnump3d/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gom/metadata.xml b/media-sound/gom/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gom/metadata.xml
+++ b/media-sound/gom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index bf727c453ed0..74755ee6233c 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="webkit">Enable the webkit rendering engine for HTML episode shownotes</flag>
   </use>
diff --git a/media-sound/gqmpeg/metadata.xml b/media-sound/gqmpeg/metadata.xml
index c1a71961758e..78f2713aa370 100644
--- a/media-sound/gqmpeg/metadata.xml
+++ b/media-sound/gqmpeg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gqmpeg</remote-id>
 	</upstream>
diff --git a/media-sound/gqradio/metadata.xml b/media-sound/gqradio/metadata.xml
index 2946d7c23fef..649f729de86b 100644
--- a/media-sound/gqradio/metadata.xml
+++ b/media-sound/gqradio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 		GQradio interfaces with radio cards through the video4linux API.
 		Stations can be tuned manually, set to presets, or auto seek can find
diff --git a/media-sound/gramofile/metadata.xml b/media-sound/gramofile/metadata.xml
index f6f41985a82b..efc762530ef8 100644
--- a/media-sound/gramofile/metadata.xml
+++ b/media-sound/gramofile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 <longdescription lang="en">
 GramoFile is intended primarily for transferring gramophone records to CDs, but
 has many other possible uses. It can record very long .wav files with a bargraph
diff --git a/media-sound/grip/metadata.xml b/media-sound/grip/metadata.xml
index b9d0f75b5165..1af304799bdf 100644
--- a/media-sound/grip/metadata.xml
+++ b/media-sound/grip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">grip</remote-id>
 	</upstream>
diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gsm/metadata.xml
+++ b/media-sound/gsm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gst123/metadata.xml b/media-sound/gst123/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gst123/metadata.xml
+++ b/media-sound/gst123/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gstreamripper/metadata.xml b/media-sound/gstreamripper/metadata.xml
index ceaa2f3b8c4b..2c559ecc47a2 100644
--- a/media-sound/gstreamripper/metadata.xml
+++ b/media-sound/gstreamripper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gstreamripper</remote-id>
 	</upstream>
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/gtick/metadata.xml
+++ b/media-sound/gtick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gtkguitune/metadata.xml b/media-sound/gtkguitune/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gtkguitune/metadata.xml
+++ b/media-sound/gtkguitune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
index e4e01ee02b7e..805b7e87430f 100644
--- a/media-sound/guayadeque/metadata.xml
+++ b/media-sound/guayadeque/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">guayadeque</remote-id>
   </upstream>
diff --git a/media-sound/hearnet/metadata.xml b/media-sound/hearnet/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/hearnet/metadata.xml
+++ b/media-sound/hearnet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
index a6410ec46591..c81c4621b9d1 100644
--- a/media-sound/helm/metadata.xml
+++ b/media-sound/helm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mtytel/helm</remote-id>
   </upstream>
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
index 45200fa35db8..b5961c2bb27e 100644
--- a/media-sound/herrie/metadata.xml
+++ b/media-sound/herrie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription lang="en">
 		Herrie is a minimalistic music player that uses the command
 		line. It is written to support a variety of operating systems,
diff --git a/media-sound/horgand/metadata.xml b/media-sound/horgand/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/horgand/metadata.xml
+++ b/media-sound/horgand/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index d77759037425..2a2c1d7767f7 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="archive">Use libarchive instead of libtar</flag>
   </use>
diff --git a/media-sound/icecream/metadata.xml b/media-sound/icecream/metadata.xml
index b1fb858f25be..06541fa1498c 100644
--- a/media-sound/icecream/metadata.xml
+++ b/media-sound/icecream/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">icecream</remote-id>
 	</upstream>
diff --git a/media-sound/id3/metadata.xml b/media-sound/id3/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3/metadata.xml
+++ b/media-sound/id3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/id3ed/metadata.xml b/media-sound/id3ed/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3ed/metadata.xml
+++ b/media-sound/id3ed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/id3ted/metadata.xml b/media-sound/id3ted/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/id3ted/metadata.xml
+++ b/media-sound/id3ted/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/id3tool/metadata.xml b/media-sound/id3tool/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3tool/metadata.xml
+++ b/media-sound/id3tool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/id3v2/metadata.xml b/media-sound/id3v2/metadata.xml
index 0fb660950983..a0e6d0643d2c 100644
--- a/media-sound/id3v2/metadata.xml
+++ b/media-sound/id3v2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">id3v2</remote-id>
 	</upstream>
diff --git a/media-sound/ifp-gnome/metadata.xml b/media-sound/ifp-gnome/metadata.xml
index 5ddd82b6cb49..e67992f86ba5 100644
--- a/media-sound/ifp-gnome/metadata.xml
+++ b/media-sound/ifp-gnome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ifp-gnome</remote-id>
 	</upstream>
diff --git a/media-sound/imp3sh/metadata.xml b/media-sound/imp3sh/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/imp3sh/metadata.xml
+++ b/media-sound/imp3sh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jaaa/metadata.xml b/media-sound/jaaa/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/jaaa/metadata.xml
+++ b/media-sound/jaaa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 63276d7c70ea..7cefb121360e 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
     <flag name="cpudetection">Enables runtime cpudetection</flag>
diff --git a/media-sound/jack-keyboard/metadata.xml b/media-sound/jack-keyboard/metadata.xml
index 66b06171fa91..0a5b92788825 100644
--- a/media-sound/jack-keyboard/metadata.xml
+++ b/media-sound/jack-keyboard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	jack-keyboard is a virtual MIDI keyboard - a program that allows you to send
 	JACK MIDI events (play ;-) using your PC keyboard. It's somewhat similar to
diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
index c4d8e2d1a1fd..2684b011436b 100644
--- a/media-sound/jack-rack/metadata.xml
+++ b/media-sound/jack-rack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jack-rack</remote-id>
 	</upstream>
diff --git a/media-sound/jack-smf-utils/metadata.xml b/media-sound/jack-smf-utils/metadata.xml
index bb34255979d6..3f0cd5152d72 100644
--- a/media-sound/jack-smf-utils/metadata.xml
+++ b/media-sound/jack-smf-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	Jack-smf-utils is a set of two utilities - jack-smf-player and
 	jack-smf-recorder - whose purpose is to play and record MIDI streams from/to
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/jack/metadata.xml
+++ b/media-sound/jack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jackbeat/metadata.xml b/media-sound/jackbeat/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/jackbeat/metadata.xml
+++ b/media-sound/jackbeat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
index a07c92332af9..ff009327a7a4 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 
 <longdescription lang="en">
 	Jalv is a simple but fully featured LV2 host for Jack. It runs LV2 plugins and exposes their ports as Jack ports, essentially making any LV2 plugin function as a Jack application.
diff --git a/media-sound/jamin/metadata.xml b/media-sound/jamin/metadata.xml
index f5edf9bf1515..eabb3eda28ed 100644
--- a/media-sound/jamin/metadata.xml
+++ b/media-sound/jamin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jamin</remote-id>
 	</upstream>
diff --git a/media-sound/jokosher/metadata.xml b/media-sound/jokosher/metadata.xml
index 42f09df9bad2..339b52c7d6b2 100644
--- a/media-sound/jokosher/metadata.xml
+++ b/media-sound/jokosher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">jokosher</remote-id>
 	</upstream>
diff --git a/media-sound/jtagger/metadata.xml b/media-sound/jtagger/metadata.xml
index f467e695da5e..d5c96f4b4fc1 100644
--- a/media-sound/jtagger/metadata.xml
+++ b/media-sound/jtagger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		jTagger is an powerful MP3 tag and filename editor. It can update
 		tags and filenames in different batch editing modes. Basic MP3
diff --git a/media-sound/justeport/metadata.xml b/media-sound/justeport/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/justeport/metadata.xml
+++ b/media-sound/justeport/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/k4guitune/metadata.xml b/media-sound/k4guitune/metadata.xml
index 3f15b98a4e84..1e6767b73b62 100644
--- a/media-sound/k4guitune/metadata.xml
+++ b/media-sound/k4guitune/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>kde</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml
index b060190a0f50..ab269bf7cdc8 100644
--- a/media-sound/karlyriceditor/metadata.xml
+++ b/media-sound/karlyriceditor/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>qt</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">karlyriceditor</remote-id>
 	</upstream>
diff --git a/media-sound/kaudiocreator/metadata.xml b/media-sound/kaudiocreator/metadata.xml
index ede2e3c0508d..e061ace22615 100644
--- a/media-sound/kaudiocreator/metadata.xml
+++ b/media-sound/kaudiocreator/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>sound</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/kenvy24/metadata.xml b/media-sound/kenvy24/metadata.xml
index b33fb2b8cf32..6041e54f15ec 100644
--- a/media-sound/kenvy24/metadata.xml
+++ b/media-sound/kenvy24/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kenvy24</remote-id>
 	</upstream>
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 3455b8613e31..7281065803a1 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="acoustid">Enable support for acoustic fingerprinting plugin using
       (<pkg>media-libs/chromaprint</pkg>)</flag>
diff --git a/media-sound/kmetronome/metadata.xml b/media-sound/kmetronome/metadata.xml
index 9a940c2c43f6..e610d4bc13d2 100644
--- a/media-sound/kmetronome/metadata.xml
+++ b/media-sound/kmetronome/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kmetronome</remote-id>
 	</upstream>
diff --git a/media-sound/kmid/metadata.xml b/media-sound/kmid/metadata.xml
index 3f64f0879217..3232f5773dab 100644
--- a/media-sound/kmid/metadata.xml
+++ b/media-sound/kmid/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kmid2</remote-id>
 	</upstream>
diff --git a/media-sound/kmidimon/metadata.xml b/media-sound/kmidimon/metadata.xml
index 692f59fa5841..b9e15e8ab395 100644
--- a/media-sound/kmidimon/metadata.xml
+++ b/media-sound/kmidimon/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kmidimon</remote-id>
 	</upstream>
diff --git a/media-sound/konvertible/metadata.xml b/media-sound/konvertible/metadata.xml
index e737e3a436d2..dca33e591f21 100644
--- a/media-sound/konvertible/metadata.xml
+++ b/media-sound/konvertible/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<herd>kde</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/kradio/metadata.xml b/media-sound/kradio/metadata.xml
index 2b76613721f7..1d0ae25b40c8 100644
--- a/media-sound/kradio/metadata.xml
+++ b/media-sound/kradio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kradio</remote-id>
 	</upstream>
diff --git a/media-sound/kstreamripper/metadata.xml b/media-sound/kstreamripper/metadata.xml
index 9236e6b99c1d..be634fa3b7b4 100644
--- a/media-sound/kstreamripper/metadata.xml
+++ b/media-sound/kstreamripper/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kstreamripper</remote-id>
 	</upstream>
diff --git a/media-sound/kwave/metadata.xml b/media-sound/kwave/metadata.xml
index 44d8bd70fea4..c26d7caae024 100644
--- a/media-sound/kwave/metadata.xml
+++ b/media-sound/kwave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
 	<use>
 		<flag name="opus">Enable Opus audio codec support</flag>
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
index 3b49a3fd60bf..3096488249d4 100644
--- a/media-sound/lame/metadata.xml
+++ b/media-sound/lame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="mp3rtp">Build the mp3-to-RTP streaming utility. **UNSUPPORTED**</flag>
   </use>
diff --git a/media-sound/lash/metadata.xml b/media-sound/lash/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/lash/metadata.xml
+++ b/media-sound/lash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/lastfm-desktop/metadata.xml b/media-sound/lastfm-desktop/metadata.xml
index 8ab053686c08..45ea44fd0ffe 100644
--- a/media-sound/lastfm-desktop/metadata.xml
+++ b/media-sound/lastfm-desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lastfm/lastfm-desktop</remote-id>
   </upstream>
diff --git a/media-sound/lastfmplayer/metadata.xml b/media-sound/lastfmplayer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/lastfmplayer/metadata.xml
+++ b/media-sound/lastfmplayer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index 988c0d0c5fe2..eaff3f190935 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
@@ -15,6 +13,14 @@
 		<email>karl.j.linden@gmail.com</email>
 		<name>Karl Linden</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
 	</longdescription>
diff --git a/media-sound/lingot/metadata.xml b/media-sound/lingot/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/lingot/metadata.xml
+++ b/media-sound/lingot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/listen/metadata.xml b/media-sound/listen/metadata.xml
index fbb7560bc15d..14c4125617e7 100644
--- a/media-sound/listen/metadata.xml
+++ b/media-sound/listen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>
 	Listen, a music management and playback for GNOME
 		
diff --git a/media-sound/litestream/metadata.xml b/media-sound/litestream/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/litestream/metadata.xml
+++ b/media-sound/litestream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/lltag/metadata.xml b/media-sound/lltag/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/lltag/metadata.xml
+++ b/media-sound/lltag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 076791f8a9e2..c97a8b433e87 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
@@ -21,6 +19,14 @@
     <name>Jonathan Aquilina</name>
     <description>Please assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
     <flag name="stk">Enables STK Mallet plugin.</flag>
diff --git a/media-sound/lxmusic/metadata.xml b/media-sound/lxmusic/metadata.xml
index f8f477c04966..4c90d0fde16f 100644
--- a/media-sound/lxmusic/metadata.xml
+++ b/media-sound/lxmusic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>lxde</herd>
+	<maintainer>
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 	<longdescription>LXMusic is a simple GUI XMMS2 client with minimal functionality. It can do nothing more than playing music files.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml
index 1646c2fcad92..3d0d714b99f6 100644
--- a/media-sound/lyvi/metadata.xml
+++ b/media-sound/lyvi/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>idella4@gentoo.org</email>
 	</maintainer>
@@ -11,6 +9,14 @@
 		<name>Witold Pilat</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Lyvi is a lyrics, artist info and guitar tabs
 	viewer. On supported terminals, Lyvi can also show artist photos and
 	cover images.
diff --git a/media-sound/mac/metadata.xml b/media-sound/mac/metadata.xml
index 1d564b87f116..9a9ae39ad271 100644
--- a/media-sound/mac/metadata.xml
+++ b/media-sound/mac/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>billie@gentoo.org</email>
     <name>Daniel Pielmeier</name>
   </maintainer>
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/madplay/metadata.xml b/media-sound/madplay/metadata.xml
index 315b2eb6f52e..eb6c750caeba 100644
--- a/media-sound/madplay/metadata.xml
+++ b/media-sound/madplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mad</remote-id>
 	</upstream>
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index 07e68d257297..f061e6a5677f 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <use>
     <flag name="espeak">Text to speech engine</flag>
     <flag name="g15">Logitech g15 lcd support</flag>
@@ -10,4 +9,8 @@
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/mcdp/metadata.xml b/media-sound/mcdp/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mcdp/metadata.xml
+++ b/media-sound/mcdp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/meterbridge/metadata.xml b/media-sound/meterbridge/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/meterbridge/metadata.xml
+++ b/media-sound/meterbridge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mhwaveedit/metadata.xml
+++ b/media-sound/mhwaveedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mikmod/metadata.xml b/media-sound/mikmod/metadata.xml
index b86266440788..a382cc1d7e6c 100644
--- a/media-sound/mikmod/metadata.xml
+++ b/media-sound/mikmod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mikmod</remote-id>
 	</upstream>
diff --git a/media-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/milkytracker/metadata.xml
+++ b/media-sound/milkytracker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mimd/metadata.xml b/media-sound/mimd/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mimd/metadata.xml
+++ b/media-sound/mimd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 8d08bbb05339..4db84a09a771 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
diff --git a/media-sound/mmix/metadata.xml b/media-sound/mmix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mmix/metadata.xml
+++ b/media-sound/mmix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 0ed4f43541ba..3b031ffbeb92 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -5,7 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="cache">Enable tags caching support</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
diff --git a/media-sound/modplugtools/metadata.xml b/media-sound/modplugtools/metadata.xml
index f38b8dd871f0..f0c4bfed03b7 100644
--- a/media-sound/modplugtools/metadata.xml
+++ b/media-sound/modplugtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">modplug-xmms</remote-id>
 	</upstream>
diff --git a/media-sound/moodbar/metadata.xml b/media-sound/moodbar/metadata.xml
index 3cbd34b008ee..cbb24e3b00e0 100644
--- a/media-sound/moodbar/metadata.xml
+++ b/media-sound/moodbar/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/moosic/metadata.xml b/media-sound/moosic/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/moosic/metadata.xml
+++ b/media-sound/moosic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp32ogg/metadata.xml b/media-sound/mp32ogg/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp32ogg/metadata.xml
+++ b/media-sound/mp32ogg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3_check/metadata.xml b/media-sound/mp3_check/metadata.xml
index b285f3ae22f0..471cbd214e1f 100644
--- a/media-sound/mp3_check/metadata.xml
+++ b/media-sound/mp3_check/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3check</remote-id>
 	</upstream>
diff --git a/media-sound/mp3asm/metadata.xml b/media-sound/mp3asm/metadata.xml
index 68c47aa31f4d..750e38f0c392 100644
--- a/media-sound/mp3asm/metadata.xml
+++ b/media-sound/mp3asm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3asm</remote-id>
 	</upstream>
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
index dbdb14e66904..dbbf50566e27 100644
--- a/media-sound/mp3blaster/metadata.xml
+++ b/media-sound/mp3blaster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
   </use>
diff --git a/media-sound/mp3c/metadata.xml b/media-sound/mp3c/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3c/metadata.xml
+++ b/media-sound/mp3c/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3cat/metadata.xml b/media-sound/mp3cat/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3cat/metadata.xml
+++ b/media-sound/mp3cat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3check/metadata.xml b/media-sound/mp3check/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3check/metadata.xml
+++ b/media-sound/mp3check/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 32a4a36c9c56..43ff5e9615e4 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3diags</remote-id>
 	</upstream>
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
index ea3b89738a14..04950321cc92 100644
--- a/media-sound/mp3gain/metadata.xml
+++ b/media-sound/mp3gain/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mp3gain</remote-id>
   </upstream>
diff --git a/media-sound/mp3info/metadata.xml b/media-sound/mp3info/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3info/metadata.xml
+++ b/media-sound/mp3info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3report/metadata.xml b/media-sound/mp3report/metadata.xml
index ef0d54f2d511..c86d5150dd3b 100644
--- a/media-sound/mp3report/metadata.xml
+++ b/media-sound/mp3report/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3report</remote-id>
 	</upstream>
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index 1f6ffde17d63..1990ed42d526 100644
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="audacious">Include <pkg>media-sound/audacious</pkg> support</flag>
 		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
diff --git a/media-sound/mp3splt/metadata.xml b/media-sound/mp3splt/metadata.xml
index 33770ad622d0..7155422f134e 100644
--- a/media-sound/mp3splt/metadata.xml
+++ b/media-sound/mp3splt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3splt</remote-id>
 	</upstream>
diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
index d620a24b2746..7ea86839e3fb 100644
--- a/media-sound/mp3unicode/metadata.xml
+++ b/media-sound/mp3unicode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">alonbl/mp3unicode</remote-id>
 		<remote-id type="sourceforge">mp3unicode</remote-id>
diff --git a/media-sound/mp3wrap/metadata.xml b/media-sound/mp3wrap/metadata.xml
index 63c81edecdb3..9d8f5ba63195 100644
--- a/media-sound/mp3wrap/metadata.xml
+++ b/media-sound/mp3wrap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mp3wrap</remote-id>
 	</upstream>
diff --git a/media-sound/mpc/metadata.xml b/media-sound/mpc/metadata.xml
index f939777e6a35..2fa6e9be702f 100644
--- a/media-sound/mpc/metadata.xml
+++ b/media-sound/mpc/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
index a025c77c7636..d610f01bea87 100644
--- a/media-sound/mpck/metadata.xml
+++ b/media-sound/mpck/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index bd5d3c419b34..dc3bff13f6e9 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
 	<email>angelos@gentoo.org</email>
 	<name>Christoph Mende</name>
@@ -10,6 +9,10 @@
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+  	<email>sound@gentoo.org</email>
+  	<name>Gentoo Sound project</name>
+  </maintainer>
   <use>
 	<flag name="adplug">Enable the AdPlug decoder plugin</flag>
 	<flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
index 159a30662957..4e34420f9448 100644
--- a/media-sound/mpdas/metadata.xml
+++ b/media-sound/mpdas/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
   	<email>angelos@gentoo.org</email>
 	<name>Christoph Mende</name>
   </maintainer>
+<maintainer>
+  	<email>sound@gentoo.org</email>
+  	<name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/mpdscribble/metadata.xml b/media-sound/mpdscribble/metadata.xml
index 5789d68fda54..0b03994b1f8a 100644
--- a/media-sound/mpdscribble/metadata.xml
+++ b/media-sound/mpdscribble/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A client for the Music Player Daemon that sends information to
 		Audioscrobbler -- a website (www.last.fm) displaying what various people
diff --git a/media-sound/mpfc/metadata.xml b/media-sound/mpfc/metadata.xml
index 2227ff7a1ff4..6538db374809 100644
--- a/media-sound/mpfc/metadata.xml
+++ b/media-sound/mpfc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="wav">Enable wav audio codec support</flag>
   </use>
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
index 0ddbd9e20b42..039258391218 100644
--- a/media-sound/mpg123/metadata.xml
+++ b/media-sound/mpg123/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>thomas-forum@orgis.org</email>
diff --git a/media-sound/mpg321/metadata.xml b/media-sound/mpg321/metadata.xml
index e16c7f691b28..2e5864c49a3c 100644
--- a/media-sound/mpg321/metadata.xml
+++ b/media-sound/mpg321/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mpg321</remote-id>
 	</upstream>
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
index d70777d3bcb5..a8cce87015c4 100644
--- a/media-sound/mplay/metadata.xml
+++ b/media-sound/mplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mplay</remote-id>
 	</upstream>
diff --git a/media-sound/mserv/metadata.xml b/media-sound/mserv/metadata.xml
index 40df0e99544a..3087bb9043dc 100644
--- a/media-sound/mserv/metadata.xml
+++ b/media-sound/mserv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mserv</remote-id>
 	</upstream>
diff --git a/media-sound/mt-daapd/metadata.xml b/media-sound/mt-daapd/metadata.xml
index ca0aef2e58a7..3123ea00e8d7 100644
--- a/media-sound/mt-daapd/metadata.xml
+++ b/media-sound/mt-daapd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mt-daapd</remote-id>
 	</upstream>
diff --git a/media-sound/muine/metadata.xml b/media-sound/muine/metadata.xml
index 42d1ea6516db..30256e4f2faa 100644
--- a/media-sound/muine/metadata.xml
+++ b/media-sound/muine/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
+<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/multimux/metadata.xml b/media-sound/multimux/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/multimux/metadata.xml
+++ b/media-sound/multimux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mup/metadata.xml b/media-sound/mup/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mup/metadata.xml
+++ b/media-sound/mup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/muse/metadata.xml b/media-sound/muse/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/muse/metadata.xml
+++ b/media-sound/muse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/musepack-tools/metadata.xml b/media-sound/musepack-tools/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/musepack-tools/metadata.xml
+++ b/media-sound/musepack-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index d6612ec42ab0..40a68b5f23f9 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mscore</remote-id>
 		<remote-id type="github">musescore/MuseScore</remote-id>
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 33213f752747..7f54a1cf6bd1 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="artist-screen">Enable artist screen</flag>
 		<flag name="chat-screen">Enable the chat screen</flag>
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 26ee4d9a205a..7f919ed14846 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 	</maintainer>
@@ -9,6 +8,10 @@
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
 		<flag name="outputs">Enable outputs screen</flag>
diff --git a/media-sound/neutrino/metadata.xml b/media-sound/neutrino/metadata.xml
index 86c665161c18..d703f5e6fef8 100644
--- a/media-sound/neutrino/metadata.xml
+++ b/media-sound/neutrino/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">neutrino</remote-id>
   </upstream>
diff --git a/media-sound/normalize/metadata.xml b/media-sound/normalize/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/normalize/metadata.xml
+++ b/media-sound/normalize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index c1af6c114e5b..fbfbece0c8e8 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
@@ -11,6 +9,14 @@
     <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <changelog>http://www.gitorious.org/ogg2mp3/ogg2mp3/commits/master</changelog>
     <doc>http://www.gitorious.org/ogg2mp3/pages/Home</doc>
diff --git a/media-sound/oggtst/metadata.xml b/media-sound/oggtst/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/oggtst/metadata.xml
+++ b/media-sound/oggtst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ogmtools/metadata.xml b/media-sound/ogmtools/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/ogmtools/metadata.xml
+++ b/media-sound/ogmtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/opus-tools/metadata.xml b/media-sound/opus-tools/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/opus-tools/metadata.xml
+++ b/media-sound/opus-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/orpheus/metadata.xml b/media-sound/orpheus/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/orpheus/metadata.xml
+++ b/media-sound/orpheus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/paprefs/metadata.xml b/media-sound/paprefs/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/paprefs/metadata.xml
+++ b/media-sound/paprefs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index fe4fdc23e030..2a91428e0e02 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
         	<email>lmiphay@gmail.com</email>
 	        <name>Paul Healy</name>
 	        <description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+        	<email>sound@gentoo.org</email>
+        	<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+        	<email>proxy-maint@gentoo.org</email>
+        	<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">christophgysin/pasystray</remote-id>
 	</upstream>
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 2f46d3c78999..47128f39a008 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
     <flag name="session">Include experimental Jack session management
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pavucontrol/metadata.xml
+++ b/media-sound/pavucontrol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pavumeter/metadata.xml b/media-sound/pavumeter/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pavumeter/metadata.xml
+++ b/media-sound/pavumeter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/peercast/metadata.xml b/media-sound/peercast/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/peercast/metadata.xml
+++ b/media-sound/peercast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/phasex/metadata.xml b/media-sound/phasex/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/phasex/metadata.xml
+++ b/media-sound/phasex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pianobooster/metadata.xml b/media-sound/pianobooster/metadata.xml
index 3f6f2798fdcb..3719b10ada09 100644
--- a/media-sound/pianobooster/metadata.xml
+++ b/media-sound/pianobooster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
 	</use>
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 3e7045f9a689..f923d02aed27 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>MusicBrainz Picard is a cross-platform MusicBrainz tag editor
   written in Python. Picard Tagger is intended to be the next generation of
   tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
diff --git a/media-sound/picoxine/metadata.xml b/media-sound/picoxine/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/picoxine/metadata.xml
+++ b/media-sound/picoxine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pitchtune/metadata.xml b/media-sound/pitchtune/metadata.xml
index ce1975285068..95206245c04d 100644
--- a/media-sound/pitchtune/metadata.xml
+++ b/media-sound/pitchtune/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pitchtune</remote-id>
   </upstream>
diff --git a/media-sound/playmidi/metadata.xml b/media-sound/playmidi/metadata.xml
index 5084ba319789..48a626b579bc 100644
--- a/media-sound/playmidi/metadata.xml
+++ b/media-sound/playmidi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">playmidi</remote-id>
 	</upstream>
diff --git a/media-sound/poc/metadata.xml b/media-sound/poc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/poc/metadata.xml
+++ b/media-sound/poc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index c7e80b89344d..e3666375744a 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription lang="en">
   </longdescription>
   <use>
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index 1cae8b0fa16a..72600e510b99 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>kitcat490@gmail.com</email>
 		<name>Michael Niehoff</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">podget</remote-id>
 	</upstream>
diff --git a/media-sound/positron/metadata.xml b/media-sound/positron/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/positron/metadata.xml
+++ b/media-sound/positron/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
index ac6c4aa59c7f..54be525ca87b 100644
--- a/media-sound/potamus/metadata.xml
+++ b/media-sound/potamus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 <use>
 	<flag name="opus">Adds support for the Opus codec.</flag>
 </use>
diff --git a/media-sound/projectm-jack/metadata.xml b/media-sound/projectm-jack/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-sound/projectm-jack/metadata.xml
+++ b/media-sound/projectm-jack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">projectm</remote-id>
 	</upstream>
diff --git a/media-sound/projectm-pulseaudio/metadata.xml b/media-sound/projectm-pulseaudio/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-sound/projectm-pulseaudio/metadata.xml
+++ b/media-sound/projectm-pulseaudio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">projectm</remote-id>
 	</upstream>
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
index f5ceb6749c2d..0949ed8a775e 100644
--- a/media-sound/protux/metadata.xml
+++ b/media-sound/protux/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
-  <herd>java</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">protux</remote-id>
   </upstream>
diff --git a/media-sound/ptabtools/metadata.xml b/media-sound/ptabtools/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/ptabtools/metadata.xml
+++ b/media-sound/ptabtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 11ddd79c4996..33fbae98214d 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>sound</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="X">
       Build the X11 publish module to export PulseAudio information
diff --git a/media-sound/pwavecat/metadata.xml b/media-sound/pwavecat/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pwavecat/metadata.xml
+++ b/media-sound/pwavecat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/pympd/metadata.xml b/media-sound/pympd/metadata.xml
index c1c8b1075dc8..9c72fc854ed2 100644
--- a/media-sound/pympd/metadata.xml
+++ b/media-sound/pympd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>
     pympd is a GTK+ front end client for the music playing daemon MPD
   </longdescription>
diff --git a/media-sound/qarecord/metadata.xml b/media-sound/qarecord/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/qarecord/metadata.xml
+++ b/media-sound/qarecord/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">alsamodular</remote-id>
 	</upstream>
diff --git a/media-sound/qastools/metadata.xml b/media-sound/qastools/metadata.xml
index 6a60bbd94825..79a7e1901f0c 100644
--- a/media-sound/qastools/metadata.xml
+++ b/media-sound/qastools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qastools</remote-id>
 	</upstream>
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
index a82e3bf98ee3..5846e77640c3 100644
--- a/media-sound/qjackctl/metadata.xml
+++ b/media-sound/qjackctl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qjackctl</remote-id>
 	</upstream>
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
index a612400d0ddf..37b0d202c748 100644
--- a/media-sound/qmidiarp/metadata.xml
+++ b/media-sound/qmidiarp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qmidiarp</remote-id>
 	</upstream>
diff --git a/media-sound/qmidiroute/metadata.xml b/media-sound/qmidiroute/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/qmidiroute/metadata.xml
+++ b/media-sound/qmidiroute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">alsamodular</remote-id>
 	</upstream>
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 2bef1e643661..e1d5dc6a042d 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
 	</maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="analyzer">Enable visual analyzer</flag>
     <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
diff --git a/media-sound/qmpdclient/metadata.xml b/media-sound/qmpdclient/metadata.xml
index 4e2154e07e54..59af5a19e45d 100644
--- a/media-sound/qmpdclient/metadata.xml
+++ b/media-sound/qmpdclient/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		QMPDClient is an easy to use Qt4 client for MPD
 	</longdescription>
diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
index 84d667565f36..73a64b271252 100644
--- a/media-sound/qpitch/metadata.xml
+++ b/media-sound/qpitch/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>sound</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
index fcd34008ac32..c816e36019b0 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="libgig">Enable libgig support for loading Gigasampler files and
       DLS (Downloadable Sounds) Level 1/2 files</flag>
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
index 7047d1231fd4..baca8975bbfd 100644
--- a/media-sound/qsynth/metadata.xml
+++ b/media-sound/qsynth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 QSynth is a fluidsynth GUI front-end application written in C++ around the
 Qt3 toolkit using Qt Designer. Eventually it may evolve into a softsynth
diff --git a/media-sound/qtagconvert/metadata.xml b/media-sound/qtagconvert/metadata.xml
index 263a40f9ba45..b0a3c058c846 100644
--- a/media-sound/qtagconvert/metadata.xml
+++ b/media-sound/qtagconvert/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qtagconvert</remote-id>
 	</upstream>
diff --git a/media-sound/qtagger/metadata.xml b/media-sound/qtagger/metadata.xml
index d3a41ffbcc64..3db5ea04703f 100644
--- a/media-sound/qtagger/metadata.xml
+++ b/media-sound/qtagger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/media-sound/qtgain/metadata.xml b/media-sound/qtgain/metadata.xml
index 30d1023796f6..49caddf99969 100644
--- a/media-sound/qtgain/metadata.xml
+++ b/media-sound/qtgain/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <herd>qt</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-sound/qtmpc/metadata.xml
+++ b/media-sound/qtmpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
index 2ff56672fdc9..d6dc735dd109 100644
--- a/media-sound/qtractor/metadata.xml
+++ b/media-sound/qtractor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
     <flag name="rubberband">Enable support for in-place audio clip pitch-shifting through the rubberband library</flag>
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index dd2281bd0c8a..0bbb96dba18c 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="cli">Build commandline client</flag>
   </use>
diff --git a/media-sound/quark/metadata.xml b/media-sound/quark/metadata.xml
index 55d06d8daede..ce44a3c6fe68 100644
--- a/media-sound/quark/metadata.xml
+++ b/media-sound/quark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="gnome">Provides tray-icon and enables gconf support</flag>
 	</use>
diff --git a/media-sound/quimup/metadata.xml b/media-sound/quimup/metadata.xml
index 00412319d72b..050a27d6cf86 100644
--- a/media-sound/quimup/metadata.xml
+++ b/media-sound/quimup/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">quimup</remote-id>
   </upstream>
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 6b9595c1ae51..cc2b2332e1fd 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>Quod Libet is a GTK+-based audio player written in Python. It's 
     designed around the idea that you know better than we do how to 
     organize your music. It lets you make playlists based on regular 
diff --git a/media-sound/rawrec/metadata.xml b/media-sound/rawrec/metadata.xml
index 1421a55ad46b..ddd0a32fd2ba 100644
--- a/media-sound/rawrec/metadata.xml
+++ b/media-sound/rawrec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rawrec</remote-id>
 	</upstream>
diff --git a/media-sound/rcenter/metadata.xml b/media-sound/rcenter/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/rcenter/metadata.xml
+++ b/media-sound/rcenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/redoflacs/metadata.xml b/media-sound/redoflacs/metadata.xml
index 83782c22fa7c..c9dc5a6cee04 100644
--- a/media-sound/redoflacs/metadata.xml
+++ b/media-sound/redoflacs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sirjaren/redoflacs</remote-id>
   </upstream>
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/retrovol/metadata.xml
+++ b/media-sound/retrovol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/rexima/metadata.xml b/media-sound/rexima/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/rexima/metadata.xml
+++ b/media-sound/rexima/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/rezound/metadata.xml b/media-sound/rezound/metadata.xml
index 5200ae4c725e..b268de27c68e 100644
--- a/media-sound/rezound/metadata.xml
+++ b/media-sound/rezound/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="16bittmp">Use 16bit temporary files (default 32bit float), useful for slower computers</flag>
     <flag name="soundtouch">compile with support for soundtouch</flag>
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index bb30c380f030..cd0cb49b7ad0 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>gstreamer</herd>
+  <maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+  <email>gstreamer@gentoo.org</email>
+  <name>GStreamer package maintainers</name>
+  </maintainer>
   <use>
 	<flag name="daap">Build the local network music sharing plugin which uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
 	<flag name="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and displaying HTML podcast episode descriptions.</flag>
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
index 93a666f25047..4b42cef271c9 100644
--- a/media-sound/rip/metadata.xml
+++ b/media-sound/rip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rip</remote-id>
 	</upstream>
diff --git a/media-sound/ripperx/metadata.xml b/media-sound/ripperx/metadata.xml
index 29910c778d39..d62377eaea6a 100644
--- a/media-sound/ripperx/metadata.xml
+++ b/media-sound/ripperx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">ripperx</remote-id>
   </upstream>
diff --git a/media-sound/rosegarden/metadata.xml b/media-sound/rosegarden/metadata.xml
index b1d330caed72..40f44d1705d4 100644
--- a/media-sound/rosegarden/metadata.xml
+++ b/media-sound/rosegarden/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">rosegarden</remote-id>
   </upstream>
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
index 4acb13994e2f..c78682cd2d3c 100644
--- a/media-sound/rplay/metadata.xml
+++ b/media-sound/rplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
  		rplay is a flexible network audio system that allows sounds to be played
 		to and from local and remote Unix systems. Sounds can be played with or
diff --git a/media-sound/saydate/metadata.xml b/media-sound/saydate/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/saydate/metadata.xml
+++ b/media-sound/saydate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/schismtracker/metadata.xml
+++ b/media-sound/schismtracker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/seq24/metadata.xml b/media-sound/seq24/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/seq24/metadata.xml
+++ b/media-sound/seq24/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/setmixer/metadata.xml b/media-sound/setmixer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/setmixer/metadata.xml
+++ b/media-sound/setmixer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sexypsf/metadata.xml
+++ b/media-sound/sexypsf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sfc/metadata.xml
+++ b/media-sound/sfc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/shell-fm/metadata.xml b/media-sound/shell-fm/metadata.xml
index 8868a09811d7..290bab4f0a7b 100644
--- a/media-sound/shell-fm/metadata.xml
+++ b/media-sound/shell-fm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Shell.FM is a lightweight console based player for Last.FM radio
 		streams. It's written mainly for Linux, but should be able to run on any
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
index 640e5338ce75..33420c4b1694 100644
--- a/media-sound/shntool/metadata.xml
+++ b/media-sound/shntool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="mac">Add support for Monkey's Audio files</flag>
     <flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
diff --git a/media-sound/shorten/metadata.xml b/media-sound/shorten/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shorten/metadata.xml
+++ b/media-sound/shorten/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
index 3239b7ba12bd..f7f25e1bbc05 100644
--- a/media-sound/shoutcast-search/metadata.xml
+++ b/media-sound/shoutcast-search/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">halhen/shoutcast-search</remote-id>
 	</upstream>
diff --git a/media-sound/shoutcast-server-bin/metadata.xml b/media-sound/shoutcast-server-bin/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shoutcast-server-bin/metadata.xml
+++ b/media-sound/shoutcast-server-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/shoutcast-trans-bin/metadata.xml b/media-sound/shoutcast-trans-bin/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shoutcast-trans-bin/metadata.xml
+++ b/media-sound/shoutcast-trans-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sidplay/metadata.xml b/media-sound/sidplay/metadata.xml
index f13b23f890ed..dfcab150551c 100644
--- a/media-sound/sidplay/metadata.xml
+++ b/media-sound/sidplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sidplay2</remote-id>
 	</upstream>
diff --git a/media-sound/sidplayfp/metadata.xml b/media-sound/sidplayfp/metadata.xml
index 8c08b7258eec..90aa617a4a63 100644
--- a/media-sound/sidplayfp/metadata.xml
+++ b/media-sound/sidplayfp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sidplay-residfp</remote-id>
 	</upstream>
diff --git a/media-sound/smixer/metadata.xml b/media-sound/smixer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/smixer/metadata.xml
+++ b/media-sound/smixer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
index 54673e45ae1f..7e9194309543 100644
--- a/media-sound/snd/metadata.xml
+++ b/media-sound/snd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 <use>
   <flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
 </use>
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
index a2af0b606f0e..4c9c9f2d25f5 100644
--- a/media-sound/sndfile-tools/metadata.xml
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Sndfile-tools is a small collection of programs that use libsndfile and
 		other libraries to do useful things. The collection currently includes
diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
index 0aef688d14e5..b1b7ec81de1c 100644
--- a/media-sound/sndpeek/metadata.xml
+++ b/media-sound/sndpeek/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 		real-time audio visualization
 	</longdescription>
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
index cc9b6dc7e0d3..4ff75b5201ef 100644
--- a/media-sound/solfege/metadata.xml
+++ b/media-sound/solfege/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">solfege</remote-id>
 	</upstream>
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
index 77f49ada89be..3fa78a3b0bed 100644
--- a/media-sound/sonata/metadata.xml
+++ b/media-sound/sonata/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
   <maintainer>
     <email>angelos@gentoo.org</email>
     <name>Christoph Mende</name>
   </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription>
     Sonata is a lightweight GTK+ music client for the Music Player Daemon
     (MPD). It aims to be efficient (no toolbar, main menu, or statusbar),
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
index 44897b8eb8c0..da1b2604ebeb 100644
--- a/media-sound/sonic-visualiser/metadata.xml
+++ b/media-sound/sonic-visualiser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
   </use>
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sooperlooper/metadata.xml
+++ b/media-sound/sooperlooper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 091f59ec4098..df70e6b56322 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="opus">Enable Opus audio codec support</flag>
 	</use>
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
index 3cbd34b008ee..cbb24e3b00e0 100644
--- a/media-sound/soundkonverter/metadata.xml
+++ b/media-sound/soundkonverter/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index b3cb9b5d9c38..b23cd0e999af 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
diff --git a/media-sound/specimen/metadata.xml b/media-sound/specimen/metadata.xml
index ea3e2d913f8b..a14c596b64fb 100644
--- a/media-sound/specimen/metadata.xml
+++ b/media-sound/specimen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription>
 		Specimen is a midi controlled audio sampler for GNU/Linux systems. It
 		allows you to create music using various sound files, or "samples", in
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
index a60a87642cef..70549a63919e 100644
--- a/media-sound/splay/metadata.xml
+++ b/media-sound/splay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">splay</remote-id>
 	</upstream>
diff --git a/media-sound/split2flac/metadata.xml b/media-sound/split2flac/metadata.xml
index 5fc663412224..f00d7d0fcb48 100644
--- a/media-sound/split2flac/metadata.xml
+++ b/media-sound/split2flac/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
@@ -10,7 +9,14 @@
     <email>maksbotan@gentoo.org</email>
     <name>Maxim Koltsov</name>
   </maintainer>
-  <herd>sound</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <longdescription lang="en">
     Split2flac splits one big APE/FLAC/WV/WAV audio image (or a collection of
     such files, recursively) with CUE sheet into FLAC/M4A/MP3/OGG_VORBIS/WAV
diff --git a/media-sound/streamripper/metadata.xml b/media-sound/streamripper/metadata.xml
index f22b3e40ffce..a9337885cbc8 100644
--- a/media-sound/streamripper/metadata.xml
+++ b/media-sound/streamripper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">streamripper</remote-id>
   </upstream>
diff --git a/media-sound/streamtranscoder/metadata.xml b/media-sound/streamtranscoder/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/streamtranscoder/metadata.xml
+++ b/media-sound/streamtranscoder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/substract_wave/metadata.xml b/media-sound/substract_wave/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/substract_wave/metadata.xml
+++ b/media-sound/substract_wave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sweep/metadata.xml b/media-sound/sweep/metadata.xml
index c78de3906349..525e83ea1a7f 100644
--- a/media-sound/sweep/metadata.xml
+++ b/media-sound/sweep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sweep</remote-id>
 	</upstream>
diff --git a/media-sound/synaesthesia/metadata.xml b/media-sound/synaesthesia/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/synaesthesia/metadata.xml
+++ b/media-sound/synaesthesia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
index 9b13f666fe41..bda9b95ea21e 100644
--- a/media-sound/taginfo/metadata.xml
+++ b/media-sound/taginfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">taginfo</remote-id>
 	</upstream>
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
index 03cfae90382d..4871a9ad3f64 100644
--- a/media-sound/tagtool/metadata.xml
+++ b/media-sound/tagtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tagtool</remote-id>
 	</upstream>
diff --git a/media-sound/takcd/metadata.xml b/media-sound/takcd/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/takcd/metadata.xml
+++ b/media-sound/takcd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/tap-reverbed/metadata.xml b/media-sound/tap-reverbed/metadata.xml
index 41e894deb351..394e48a96406 100644
--- a/media-sound/tap-reverbed/metadata.xml
+++ b/media-sound/tap-reverbed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tap-plugins</remote-id>
 	</upstream>
diff --git a/media-sound/tapiir/metadata.xml b/media-sound/tapiir/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/tapiir/metadata.xml
+++ b/media-sound/tapiir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index 4a48abc1f4d1..97d20e321dae 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>gentoo@karolherbst.de</email>
     <name>Karol Herbst</name>
@@ -12,5 +11,9 @@
     <name>Sami Loone</name>
     <description>Proxy-Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 10b549928c5b..534be945cdec 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ck+gentoobugzilla@bl4ckb0x.de</email>
 		<name>Conrad Kostecki</name>
 		<description>Proxy maintaine, assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
 	<use>
 		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
diff --git a/media-sound/tempest_for_eliza/metadata.xml b/media-sound/tempest_for_eliza/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/tempest_for_eliza/metadata.xml
+++ b/media-sound/tempest_for_eliza/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/terminatorx/metadata.xml b/media-sound/terminatorx/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/terminatorx/metadata.xml
+++ b/media-sound/terminatorx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/timemachine/metadata.xml b/media-sound/timemachine/metadata.xml
index d4dd2647026b..9b6b28ab6950 100644
--- a/media-sound/timemachine/metadata.xml
+++ b/media-sound/timemachine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<longdescription>
 		Timemachine is a simple jack client record button remembering the last
 		ten seconds of audio when pressed.
diff --git a/media-sound/timidity++/metadata.xml b/media-sound/timidity++/metadata.xml
index 3c8a06a44add..9b738783d72f 100644
--- a/media-sound/timidity++/metadata.xml
+++ b/media-sound/timidity++/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">timidity</remote-id>
 	</upstream>
diff --git a/media-sound/timidity-eawpatches/metadata.xml b/media-sound/timidity-eawpatches/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/timidity-eawpatches/metadata.xml
+++ b/media-sound/timidity-eawpatches/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/timidity-freepats/metadata.xml b/media-sound/timidity-freepats/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/timidity-freepats/metadata.xml
+++ b/media-sound/timidity-freepats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/tk707/metadata.xml b/media-sound/tk707/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/tk707/metadata.xml
+++ b/media-sound/tk707/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index bec753f04b2f..7d72736cdf4b 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
 	<maintainer>
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
diff --git a/media-sound/toolame/metadata.xml b/media-sound/toolame/metadata.xml
index 606e35ac166d..fd46f058d418 100644
--- a/media-sound/toolame/metadata.xml
+++ b/media-sound/toolame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">toolame</remote-id>
 	</upstream>
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
index 4bb017c09afe..e33100bfe3b3 100644
--- a/media-sound/traverso/metadata.xml
+++ b/media-sound/traverso/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Traverso is a multitrack audio recording and editing program for GNU/Linux with
 		special emphasis to create an easy to use program with a clean and
diff --git a/media-sound/trommler/metadata.xml b/media-sound/trommler/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/trommler/metadata.xml
+++ b/media-sound/trommler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ttaenc/metadata.xml b/media-sound/ttaenc/metadata.xml
index af7bf4d5d068..3389dbe2524c 100644
--- a/media-sound/ttaenc/metadata.xml
+++ b/media-sound/ttaenc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tta</remote-id>
 	</upstream>
diff --git a/media-sound/tudor-volumed/metadata.xml b/media-sound/tudor-volumed/metadata.xml
index 8e4208ba6486..c18a3715b07a 100644
--- a/media-sound/tudor-volumed/metadata.xml
+++ b/media-sound/tudor-volumed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">darvid/tudor-volumed</remote-id>
 	</upstream>
diff --git a/media-sound/tunapie/metadata.xml b/media-sound/tunapie/metadata.xml
index 47dc2fb9efa8..c1f8fd44d5c7 100644
--- a/media-sound/tunapie/metadata.xml
+++ b/media-sound/tunapie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tunapie</remote-id>
 	</upstream>
diff --git a/media-sound/twolame/metadata.xml b/media-sound/twolame/metadata.xml
index 9d29a9e027ca..f5382dbb0756 100644
--- a/media-sound/twolame/metadata.xml
+++ b/media-sound/twolame/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">twolame</remote-id>
 	</upstream>
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
index 2bfbe00af0a5..9eba7e8fca83 100644
--- a/media-sound/umix/metadata.xml
+++ b/media-sound/umix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">umix</remote-id>
 	</upstream>
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 3506df7afe67..8244e7b01a83 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
@@ -11,6 +10,10 @@
 		<name>Alex Xu</name>
 		<description>Co maintainer, CC bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		uMurmur is a minimalistic Mumble server primarily targeted to
 		run on routers with an open OS like OpenWRT. The server part
diff --git a/media-sound/vb2rip/metadata.xml b/media-sound/vb2rip/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vb2rip/metadata.xml
+++ b/media-sound/vb2rip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vdramgw/metadata.xml b/media-sound/vdramgw/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-sound/vdramgw/metadata.xml
+++ b/media-sound/vdramgw/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-sound/ventrilo-server-bin/metadata.xml b/media-sound/ventrilo-server-bin/metadata.xml
index 8afc3cbfa0c6..364b9983d4a6 100644
--- a/media-sound/ventrilo-server-bin/metadata.xml
+++ b/media-sound/ventrilo-server-bin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
+<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vimpc/metadata.xml b/media-sound/vimpc/metadata.xml
index 9021b40430a1..1ea278ff34cb 100644
--- a/media-sound/vimpc/metadata.xml
+++ b/media-sound/vimpc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="boost">Use boost instead of C++11 libraries</flag>
 	</use>
diff --git a/media-sound/vitunes/metadata.xml b/media-sound/vitunes/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vitunes/metadata.xml
+++ b/media-sound/vitunes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vkeybd/metadata.xml b/media-sound/vkeybd/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/vkeybd/metadata.xml
+++ b/media-sound/vkeybd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vlevel/metadata.xml b/media-sound/vlevel/metadata.xml
index c599f7d93efd..7c9262a36f6e 100644
--- a/media-sound/vlevel/metadata.xml
+++ b/media-sound/vlevel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vlevel</remote-id>
 	</upstream>
diff --git a/media-sound/vlorb/metadata.xml b/media-sound/vlorb/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vlorb/metadata.xml
+++ b/media-sound/vlorb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vmpk/metadata.xml b/media-sound/vmpk/metadata.xml
index d2bcdcb7858b..4aa80d627ebc 100644
--- a/media-sound/vmpk/metadata.xml
+++ b/media-sound/vmpk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	Virtual MIDI Piano Keyboard is a MIDI event generator and receiver. It
 	doesn't produce any sound by itself, but can be used to drive a MIDI
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
index be06d1013244..64fe62fb2431 100644
--- a/media-sound/volti/metadata.xml
+++ b/media-sound/volti/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">volti</remote-id>
 		<remote-id type="github">gen2brain/volti</remote-id>
diff --git a/media-sound/volumeicon/metadata.xml b/media-sound/volumeicon/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/volumeicon/metadata.xml
+++ b/media-sound/volumeicon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/volwheel/metadata.xml b/media-sound/volwheel/metadata.xml
index b49e5b281a6f..dbe953da9d09 100644
--- a/media-sound/volwheel/metadata.xml
+++ b/media-sound/volwheel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">olwtools</remote-id>
 	</upstream>
diff --git a/media-sound/vorbis-tools/metadata.xml b/media-sound/vorbis-tools/metadata.xml
index 3763d957eade..10239ad23364 100644
--- a/media-sound/vorbis-tools/metadata.xml
+++ b/media-sound/vorbis-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
     <flag name="ogg123">Build ogg123 player, needs libao and curl</flag>
diff --git a/media-sound/vorbisgain/metadata.xml b/media-sound/vorbisgain/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vorbisgain/metadata.xml
+++ b/media-sound/vorbisgain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/vsound/metadata.xml b/media-sound/vsound/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vsound/metadata.xml
+++ b/media-sound/vsound/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/waheela/metadata.xml b/media-sound/waheela/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-sound/waheela/metadata.xml
+++ b/media-sound/waheela/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/wavbreaker/metadata.xml b/media-sound/wavbreaker/metadata.xml
index be77b558ac12..61c5ea71004a 100644
--- a/media-sound/wavbreaker/metadata.xml
+++ b/media-sound/wavbreaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wavbreaker</remote-id>
 	</upstream>
diff --git a/media-sound/wavegain/metadata.xml b/media-sound/wavegain/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/wavegain/metadata.xml
+++ b/media-sound/wavegain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/wavpack/metadata.xml
+++ b/media-sound/wavpack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/wavplay/metadata.xml b/media-sound/wavplay/metadata.xml
index f57d1923288b..a95f4f009dd6 100644
--- a/media-sound/wavplay/metadata.xml
+++ b/media-sound/wavplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wavplay</remote-id>
 	</upstream>
diff --git a/media-sound/wavsplit/metadata.xml b/media-sound/wavsplit/metadata.xml
index e7e1a15d4e50..63a2d945b131 100644
--- a/media-sound/wavsplit/metadata.xml
+++ b/media-sound/wavsplit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wavsplit</remote-id>
 	</upstream>
diff --git a/media-sound/wmsound-data/metadata.xml b/media-sound/wmsound-data/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/wmsound-data/metadata.xml
+++ b/media-sound/wmsound-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/xineadump/metadata.xml b/media-sound/xineadump/metadata.xml
index b7522fc56f9f..f82a54530815 100644
--- a/media-sound/xineadump/metadata.xml
+++ b/media-sound/xineadump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">transkode</remote-id>
   </upstream>
diff --git a/media-sound/xmp/metadata.xml b/media-sound/xmp/metadata.xml
index 1157eb8fbc38..cea0a9301f60 100644
--- a/media-sound/xmp/metadata.xml
+++ b/media-sound/xmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="audacious">Enable audacious support</flag>
   </use>
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
index b3e227faae4b..7632b795c1c8 100644
--- a/media-sound/xnoise/metadata.xml
+++ b/media-sound/xnoise/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="lastfm">Enable support for lastfm cover art fetching and scrobbling</flag>
 		<flag name="lyrics">Enable support for lyrics fetching</flag>
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index 545a18ab147c..32048bad080c 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="alsa">Adds support for ALSA audio input/output.</flag>
 		<flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index 9b0639b50aaf..033c97f3dcaa 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="lv2">Add support for Ladspa V2</flag>
 	</use>
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index b8228fecd796..6f2582f7b4f1 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zynaddsubfx</remote-id>
 	</upstream>
diff --git a/media-tv/channeleditor/metadata.xml b/media-tv/channeleditor/metadata.xml
index 9a66f97c7923..9f5304387031 100644
--- a/media-tv/channeleditor/metadata.xml
+++ b/media-tv/channeleditor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
diff --git a/media-tv/dvbstream/metadata.xml b/media-tv/dvbstream/metadata.xml
index d95d55ae0fab..4a0e6697c96b 100644
--- a/media-tv/dvbstream/metadata.xml
+++ b/media-tv/dvbstream/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbtools</remote-id>
 	</upstream>
diff --git a/media-tv/dvbstreamer/metadata.xml b/media-tv/dvbstreamer/metadata.xml
index 0a94620f9cce..62f2db1f7025 100644
--- a/media-tv/dvbstreamer/metadata.xml
+++ b/media-tv/dvbstreamer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbstreamer</remote-id>
 	</upstream>
diff --git a/media-tv/dvbtune/metadata.xml b/media-tv/dvbtune/metadata.xml
index d95d55ae0fab..4a0e6697c96b 100644
--- a/media-tv/dvbtune/metadata.xml
+++ b/media-tv/dvbtune/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbtools</remote-id>
 	</upstream>
diff --git a/media-tv/freevo/metadata.xml b/media-tv/freevo/metadata.xml
index 33f7fbe95a66..33e56cabe146 100644
--- a/media-tv/freevo/metadata.xml
+++ b/media-tv/freevo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <longdescription>Freevo is an open-source home theatre PC platform based
 		on Linux and a number of open-source audio/video tools. MPlayer
 		and/or Xine can be used to play audio and video files in most
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index ecc47f16b873..5724fb25c0fc 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml
index 91724ddf6152..5854c2c6b09e 100644
--- a/media-tv/gtk-v4l/metadata.xml
+++ b/media-tv/gtk-v4l/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml
index 1d7f067588e9..64d5c6c6a117 100644
--- a/media-tv/ivtv-utils/metadata.xml
+++ b/media-tv/ivtv-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>cardoe@gentoo.org</email>
     <name>Doug Goldstein</name>
diff --git a/media-tv/ivtvplayer/metadata.xml b/media-tv/ivtvplayer/metadata.xml
index eba6f2829624..f701cb1cf1c1 100644
--- a/media-tv/ivtvplayer/metadata.xml
+++ b/media-tv/ivtvplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">ivtvplayer</remote-id>
 	</upstream>
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index a05dcb6b1142..2d6007cab9d1 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xbox</herd>
-<herd>video</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
 <use>
  <flag name="airplay">enable AirPlay support</flag>
  <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-tv/linuxtv-dvb-apps/metadata.xml b/media-tv/linuxtv-dvb-apps/metadata.xml
index cd4366c20fb3..dd3c4d3a4217 100644
--- a/media-tv/linuxtv-dvb-apps/metadata.xml
+++ b/media-tv/linuxtv-dvb-apps/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <use>
 	<flag name="alevt">Build videotext decoder</flag>
 </use>
diff --git a/media-tv/linuxtv-dvb-firmware/metadata.xml b/media-tv/linuxtv-dvb-firmware/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-tv/linuxtv-dvb-firmware/metadata.xml
+++ b/media-tv/linuxtv-dvb-firmware/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
index 07a130c0c9a5..08736a452df6 100644
--- a/media-tv/me-tv/metadata.xml
+++ b/media-tv/me-tv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <maintainer>
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
diff --git a/media-tv/mythtv-status/metadata.xml b/media-tv/mythtv-status/metadata.xml
index be191b9f54b3..f2dbe1fc3eae 100644
--- a/media-tv/mythtv-status/metadata.xml
+++ b/media-tv/mythtv-status/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>mythtv</herd>
+  <maintainer>
+    <email>mythtv@gentoo.org</email>
+    <name>MythTV</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index a1e2ee6a6769..4953bd19d298 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
+	<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 	<use>
 		<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
 		this is needed if you are using ALSA dmix or SPDIF. Note, you will have
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
index 2e8d3be4630d..ef3dbdc0e9bd 100644
--- a/media-tv/nvtv/metadata.xml
+++ b/media-tv/nvtv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>media-tv@gentoo.org</email>
 		<name>media-tv</name>
diff --git a/media-tv/shoutcast2vdr/metadata.xml b/media-tv/shoutcast2vdr/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-tv/shoutcast2vdr/metadata.xml
+++ b/media-tv/shoutcast2vdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-tv/tvbrowser/metadata.xml b/media-tv/tvbrowser/metadata.xml
index a4609f401178..c00c67604d7b 100644
--- a/media-tv/tvbrowser/metadata.xml
+++ b/media-tv/tvbrowser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="themes">Install extra theme packs</flag>
   </use>
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index dc0fc18e7239..2daca85bdd69 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintaner, to be assugned to bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
 		<flag name="constcw">Enable support for the constcw protocol</flag>
diff --git a/media-tv/tvmovie2vdr/metadata.xml b/media-tv/tvmovie2vdr/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-tv/tvmovie2vdr/metadata.xml
+++ b/media-tv/tvmovie2vdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
index 8bbb40ee4126..699c028dadb1 100644
--- a/media-tv/v4l-dvb-saa716x/metadata.xml
+++ b/media-tv/v4l-dvb-saa716x/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
@@ -13,6 +11,10 @@
 		<name>Joerg Bornkessel</name>
 		<description>Proxying maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="firmware">Install firmware</flag>
 	</use>
diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml
index 39e45a6e4062..21ba9b5773cc 100644
--- a/media-tv/v4l-utils/metadata.xml
+++ b/media-tv/v4l-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
index 636266bdd0b2..ae81f64ffc7f 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/media-tv/w_scan/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>hd_brummy@gentoo.org</email>
 	</maintainer>
diff --git a/media-tv/wis-go7007/metadata.xml b/media-tv/wis-go7007/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-tv/wis-go7007/metadata.xml
+++ b/media-tv/wis-go7007/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/media-tv/xawtv/metadata.xml b/media-tv/xawtv/metadata.xml
index 277f360d0e90..8c450e10da82 100644
--- a/media-tv/xawtv/metadata.xml
+++ b/media-tv/xawtv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <use>
     <flag name="xext">Enable use of XFree extensions (DGA,VidMode,DPMS)</flag>
     <flag name="zvbi">Enable VBI Decoding Library for Zapping</flag>
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 6cbfa2dc8655..8ef2e763cd92 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xbox</herd>
-<herd>video</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
 <use>
  <flag name="airplay">enable AirPlay support</flag>
  <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 49b400605ee8..722fc9ef8605 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-tv</herd>
   <use>
     <flag name="ar">Argentina tv listing grabber</flag>
     <flag name="ch">Switzerland bluewin tv listing grabber</flag>
diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-video/2mandvd/metadata.xml
+++ b/media-video/2mandvd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
index 413d6414f00a..45296f1c8c56 100644
--- a/media-video/aacskeys/metadata.xml
+++ b/media-video/aacskeys/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/abby/metadata.xml b/media-video/abby/metadata.xml
index b179b885161c..e6150062dd76 100644
--- a/media-video/abby/metadata.xml
+++ b/media-video/abby/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/acidrip/metadata.xml b/media-video/acidrip/metadata.xml
index ad983ca71dc9..0565bc0dc0b4 100644
--- a/media-video/acidrip/metadata.xml
+++ b/media-video/acidrip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index dc3909a1a958..d2da8a3b3aaf 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
@@ -14,6 +13,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Aegisub/Aegisub</remote-id>
 	</upstream>
diff --git a/media-video/alevt/metadata.xml b/media-video/alevt/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-video/alevt/metadata.xml
+++ b/media-video/alevt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 </pkgmetadata>
diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml
index 2c3064327a35..2b509d9860ef 100644
--- a/media-video/aravis/metadata.xml
+++ b/media-video/aravis/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>lu_zero@gentoo.org</email>
   </maintainer>
 
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+
   <use>
     <flag name="X">
       Build the GTK+-based video viewer for aravis. This requires
diff --git a/media-video/asfrecorder/metadata.xml b/media-video/asfrecorder/metadata.xml
index ef1903383336..b5634b9aa5b5 100644
--- a/media-video/asfrecorder/metadata.xml
+++ b/media-video/asfrecorder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
index fba78be2a12c..65652c2d76ec 100644
--- a/media-video/atomicparsley-wez/metadata.xml
+++ b/media-video/atomicparsley-wez/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/atomicparsley/metadata.xml b/media-video/atomicparsley/metadata.xml
index 78fe4c411e54..3c428cbee0a1 100644
--- a/media-video/atomicparsley/metadata.xml
+++ b/media-video/atomicparsley/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 3f82cb4412c7..3e49b161e70d 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
diff --git a/media-video/avinfo/metadata.xml b/media-video/avinfo/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/avinfo/metadata.xml
+++ b/media-video/avinfo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index a19b49626ecc..d91c9257f02a 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <herd>video</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">u8sand/Baka-MPlayer</remote-id>
   </upstream>
diff --git a/media-video/bbtools/metadata.xml b/media-video/bbtools/metadata.xml
index f26a52cf120c..3dfca5fe8b0a 100644
--- a/media-video/bbtools/metadata.xml
+++ b/media-video/bbtools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
index 93f8bf687fd8..9a013515d9d6 100644
--- a/media-video/bdsup2sub/metadata.xml
+++ b/media-video/bdsup2sub/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		BDSup2Sub - A tool to convert and tweak bitmap based subtitle streams.
 	</longdescription>
diff --git a/media-video/binkplayer/metadata.xml b/media-video/binkplayer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/media-video/binkplayer/metadata.xml
+++ b/media-video/binkplayer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/bino/metadata.xml b/media-video/bino/metadata.xml
index 2b9b03c8c6d0..83de9f390b9f 100644
--- a/media-video/bino/metadata.xml
+++ b/media-video/bino/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>cuchac@email.cz</email>
 		<name>Jožka Kejzlar (cuchac)</name>
@@ -11,4 +10,8 @@
 		<email>robbat2@gentoo.org</email>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/blinkensim/metadata.xml b/media-video/blinkensim/metadata.xml
index 284559a05f2f..380b8e459135 100644
--- a/media-video/blinkensim/metadata.xml
+++ b/media-video/blinkensim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/blinkenthemes/metadata.xml b/media-video/blinkenthemes/metadata.xml
index 950e903bf988..0c3e9a0a58ee 100644
--- a/media-video/blinkenthemes/metadata.xml
+++ b/media-video/blinkenthemes/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/blinkentools/metadata.xml b/media-video/blinkentools/metadata.xml
index ac44c06197cd..e1608d53f541 100644
--- a/media-video/blinkentools/metadata.xml
+++ b/media-video/blinkentools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
index 2c5e04917119..f45f1becab42 100644
--- a/media-video/camorama/metadata.xml
+++ b/media-video/camorama/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/ccextractor/metadata.xml b/media-video/ccextractor/metadata.xml
index 76d8e402b9f1..171cf3d8b677 100644
--- a/media-video/ccextractor/metadata.xml
+++ b/media-video/ccextractor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 A tool that analyzes video files and produces independent subtitle files from the closed captions data.  Exports to SRT subtitle format.
 </longdescription>
diff --git a/media-video/cclive/metadata.xml b/media-video/cclive/metadata.xml
index 318029858c42..82847f3c7506 100644
--- a/media-video/cclive/metadata.xml
+++ b/media-video/cclive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Command line tool for extracting videos from Youtube, Google Video,
 		Dailymotion, Guba (free) and Stage6  websites
diff --git a/media-video/chaplin/metadata.xml b/media-video/chaplin/metadata.xml
index 6cd197348689..1eded3a234a9 100644
--- a/media-video/chaplin/metadata.xml
+++ b/media-video/chaplin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
index 4b9fd4dc592b..b5d41d57598e 100644
--- a/media-video/cheese/metadata.xml
+++ b/media-video/cheese/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cheese uses your webcam to take photos and videos, applies fancy special
 		effects, and lets you share the fun with others.
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
index 92e4dbc04f50..15695fd40e4a 100644
--- a/media-video/cinelerra/metadata.xml
+++ b/media-video/cinelerra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
index 3af39e89a618..0b89a49abd9d 100644
--- a/media-video/clive/metadata.xml
+++ b/media-video/clive/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/coherence/metadata.xml b/media-video/coherence/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/coherence/metadata.xml
+++ b/media-video/coherence/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/cpdvd/metadata.xml b/media-video/cpdvd/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/cpdvd/metadata.xml
+++ b/media-video/cpdvd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/cpvts/metadata.xml b/media-video/cpvts/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/cpvts/metadata.xml
+++ b/media-video/cpvts/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/cxfe/metadata.xml b/media-video/cxfe/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/cxfe/metadata.xml
+++ b/media-video/cxfe/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/devede/metadata.xml b/media-video/devede/metadata.xml
index d893518b9d6b..f15eac38c07a 100644
--- a/media-video/devede/metadata.xml
+++ b/media-video/devede/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/dfbsee/metadata.xml b/media-video/dfbsee/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/dfbsee/metadata.xml
+++ b/media-video/dfbsee/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/dirac/metadata.xml b/media-video/dirac/metadata.xml
index 0627acf562a8..39c659cd7a91 100644
--- a/media-video/dirac/metadata.xml
+++ b/media-video/dirac/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/dv2sub/metadata.xml b/media-video/dv2sub/metadata.xml
index b24d9c82485d..5bcf18c20aad 100644
--- a/media-video/dv2sub/metadata.xml
+++ b/media-video/dv2sub/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <longdescription lang="en">
 		Utility dv2sub reads raw DV stream from file argument dv-file or
 		standard input if absent. It can generate a parameter log about
diff --git a/media-video/dvbackup/metadata.xml b/media-video/dvbackup/metadata.xml
index fd6948928d80..313456dd826c 100644
--- a/media-video/dvbackup/metadata.xml
+++ b/media-video/dvbackup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/dvbsnoop/metadata.xml b/media-video/dvbsnoop/metadata.xml
index 70732c4e54bf..bf8a654c4ca6 100644
--- a/media-video/dvbsnoop/metadata.xml
+++ b/media-video/dvbsnoop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbsnoop</remote-id>
 	</upstream>
diff --git a/media-video/dvd-slideshow/metadata.xml b/media-video/dvd-slideshow/metadata.xml
index 1b05378ec9bd..265699fdb68d 100644
--- a/media-video/dvd-slideshow/metadata.xml
+++ b/media-video/dvd-slideshow/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/dvd9to5/metadata.xml b/media-video/dvd9to5/metadata.xml
index 4f753aa0528d..c8ca70b255db 100644
--- a/media-video/dvd9to5/metadata.xml
+++ b/media-video/dvd9to5/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/dvdauthor/metadata.xml b/media-video/dvdauthor/metadata.xml
index 07aa9c9d8ea8..315fd9364cc8 100644
--- a/media-video/dvdauthor/metadata.xml
+++ b/media-video/dvdauthor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/dvdbackup/metadata.xml b/media-video/dvdbackup/metadata.xml
index 8b06e13576fb..a75d15681509 100644
--- a/media-video/dvdbackup/metadata.xml
+++ b/media-video/dvdbackup/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/dvdimagecmp/metadata.xml b/media-video/dvdimagecmp/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/dvdimagecmp/metadata.xml
+++ b/media-video/dvdimagecmp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
index 4fd94f12f704..bc6667910e0b 100644
--- a/media-video/dvdrip/metadata.xml
+++ b/media-video/dvdrip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/dvdstyler/metadata.xml b/media-video/dvdstyler/metadata.xml
index aeb24d12ca57..f01cb9d8c21a 100644
--- a/media-video/dvdstyler/metadata.xml
+++ b/media-video/dvdstyler/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/dvgrab/metadata.xml b/media-video/dvgrab/metadata.xml
index 0cc79757a8c6..1b7140f0d773 100644
--- a/media-video/dvgrab/metadata.xml
+++ b/media-video/dvgrab/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/emovix/metadata.xml b/media-video/emovix/metadata.xml
index 689143030330..66023c618a45 100644
--- a/media-video/emovix/metadata.xml
+++ b/media-video/emovix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/episoder/metadata.xml b/media-video/episoder/metadata.xml
index 3a490c20ddc8..7a85b193752c 100644
--- a/media-video/episoder/metadata.xml
+++ b/media-video/episoder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/ffcast/metadata.xml b/media-video/ffcast/metadata.xml
index f5798318d75a..0a8371f6da24 100644
--- a/media-video/ffcast/metadata.xml
+++ b/media-video/ffcast/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>zx2c4@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">lolilolicon/ffcast</remote-id>
   </upstream>
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 93804e123880..5958cae8418f 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
 		<name>Olivier Laurantin</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
         <changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
         <doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index c39cb9715f75..cf9ac9a0ce8e 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml
index 6c1f70ed2108..9a56b8b6c23b 100644
--- a/media-video/ffmpeg2theora/metadata.xml
+++ b/media-video/ffmpeg2theora/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/ffmpegthumbnailer/metadata.xml b/media-video/ffmpegthumbnailer/metadata.xml
index 3d5799472796..8eed44809f99 100644
--- a/media-video/ffmpegthumbnailer/metadata.xml
+++ b/media-video/ffmpegthumbnailer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/flumotion/metadata.xml b/media-video/flumotion/metadata.xml
index dec0396a21e7..beda1250457b 100644
--- a/media-video/flumotion/metadata.xml
+++ b/media-video/flumotion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gstreamer</herd>
+  <maintainer>
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-video/flvstreamer/metadata.xml b/media-video/flvstreamer/metadata.xml
index 662c2b16ab57..fa961e8cf773 100644
--- a/media-video/flvstreamer/metadata.xml
+++ b/media-video/flvstreamer/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>sound</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+<maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+<maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-video/frameworks/metadata.xml b/media-video/frameworks/metadata.xml
index 8f10bed21b5a..fd805b9a2e45 100644
--- a/media-video/frameworks/metadata.xml
+++ b/media-video/frameworks/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/gaupol/metadata.xml b/media-video/gaupol/metadata.xml
index 862cfbc4e837..d4e54f619ffa 100644
--- a/media-video/gaupol/metadata.xml
+++ b/media-video/gaupol/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/gnome-mplayer/metadata.xml b/media-video/gnome-mplayer/metadata.xml
index 6c6f1e6b6275..a757aa07ddd0 100644
--- a/media-video/gnome-mplayer/metadata.xml
+++ b/media-video/gnome-mplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/gnome-subtitles/metadata.xml b/media-video/gnome-subtitles/metadata.xml
index 82a9dd81ffbf..8995c2e2d7b3 100644
--- a/media-video/gnome-subtitles/metadata.xml
+++ b/media-video/gnome-subtitles/metadata.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>proxy-maintainers</herd>
-	<herd>dotnet</herd>
 	<maintainer>
 		<email>mail@pedrocastro.org</email>
 		<name>Pedro Castro</name>
 		<description>Upstream</description>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnome-subtitles</remote-id>
 	</upstream>
diff --git a/media-video/gnome-video-effects/metadata.xml b/media-video/gnome-video-effects/metadata.xml
index 6788bc4c7246..dba755c1efb6 100644
--- a/media-video/gnome-video-effects/metadata.xml
+++ b/media-video/gnome-video-effects/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>video</herd>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
index 1d4bb6fd9529..1bc4383343d3 100644
--- a/media-video/google2srt/metadata.xml
+++ b/media-video/google2srt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Google2SRT allows you to convert subtitles from Google Video and YouTube
 		to SubRip (.srt) format, which is recognized by most video players. You
diff --git a/media-video/gpac/metadata.xml b/media-video/gpac/metadata.xml
index 012c2b432c0b..5095fd94ea20 100644
--- a/media-video/gpac/metadata.xml
+++ b/media-video/gpac/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/griffith/metadata.xml b/media-video/griffith/metadata.xml
index 8553c721b731..794759343fbb 100644
--- a/media-video/griffith/metadata.xml
+++ b/media-video/griffith/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">griffith</remote-id>
   </upstream>
diff --git a/media-video/gtk-recordmydesktop/metadata.xml b/media-video/gtk-recordmydesktop/metadata.xml
index 7856fb20cfe0..4d73f31a212d 100644
--- a/media-video/gtk-recordmydesktop/metadata.xml
+++ b/media-video/gtk-recordmydesktop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index 5739a5c57b50..19f2b7933e32 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
index 1eba2fb5514f..6eb45a499dcc 100644
--- a/media-video/gxine/metadata.xml
+++ b/media-video/gxine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/h264enc/metadata.xml b/media-video/h264enc/metadata.xml
index a8cedca7a02f..e8e98af82282 100644
--- a/media-video/h264enc/metadata.xml
+++ b/media-video/h264enc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
index a4f3bfb3c10b..868a7c569ff0 100644
--- a/media-video/harvid/metadata.xml
+++ b/media-video/harvid/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/hasciicam/metadata.xml b/media-video/hasciicam/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/hasciicam/metadata.xml
+++ b/media-video/hasciicam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/hwdecode-demos/metadata.xml b/media-video/hwdecode-demos/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/hwdecode-demos/metadata.xml
+++ b/media-video/hwdecode-demos/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/istanbul/metadata.xml b/media-video/istanbul/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-video/istanbul/metadata.xml
+++ b/media-video/istanbul/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
+<maintainer>
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/jubler/metadata.xml b/media-video/jubler/metadata.xml
index b6ef6ca43386..6452de575ba0 100644
--- a/media-video/jubler/metadata.xml
+++ b/media-video/jubler/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 62c56c83007a..9b6ec4b2a500 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kaffeine</remote-id>
 	</upstream>
diff --git a/media-video/kamerka/metadata.xml b/media-video/kamerka/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/kamerka/metadata.xml
+++ b/media-video/kamerka/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/kamoso/metadata.xml b/media-video/kamoso/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/kamoso/metadata.xml
+++ b/media-video/kamoso/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/kffmpegthumbnailer/metadata.xml b/media-video/kffmpegthumbnailer/metadata.xml
index 6e5a6249ce5f..e95d758106ef 100644
--- a/media-video/kffmpegthumbnailer/metadata.xml
+++ b/media-video/kffmpegthumbnailer/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ffmpegthumbnailer</remote-id>
 		<remote-id type="github">dirkvdb/ffmpegthumbnailer</remote-id>
diff --git a/media-video/kino/metadata.xml b/media-video/kino/metadata.xml
index 576101d0b53d..558c325642e7 100644
--- a/media-video/kino/metadata.xml
+++ b/media-video/kino/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="gpac">Enable GPAC support when exporting to 3GPP format</flag>
   </use>
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
index 3c7839b53efe..31c3afd0fe74 100644
--- a/media-video/kmplayer/metadata.xml
+++ b/media-video/kmplayer/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<use>
 		<flag name="npp">Compile the npp backend that plays xembed style browser plugins.</flag>
 	</use>
diff --git a/media-video/kplayer/metadata.xml b/media-video/kplayer/metadata.xml
index 276e593205a6..c36831d22303 100644
--- a/media-video/kplayer/metadata.xml
+++ b/media-video/kplayer/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index a9f4504e0231..2d3e89f255b8 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/lives/metadata.xml b/media-video/lives/metadata.xml
index 6c02db49f2ff..a08c922c1bfa 100644
--- a/media-video/lives/metadata.xml
+++ b/media-video/lives/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>lu_zero@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="libvisual">Enable libvisual support</flag>
   </use>
diff --git a/media-video/loopy/metadata.xml b/media-video/loopy/metadata.xml
index 914f6144a6d5..eae85dd40f09 100644
--- a/media-video/loopy/metadata.xml
+++ b/media-video/loopy/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-video/lsdvd/metadata.xml b/media-video/lsdvd/metadata.xml
index 657b63f08556..76ddc5a65229 100644
--- a/media-video/lsdvd/metadata.xml
+++ b/media-video/lsdvd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/luvcview/metadata.xml b/media-video/luvcview/metadata.xml
index 92e4dbc04f50..15695fd40e4a 100644
--- a/media-video/luvcview/metadata.xml
+++ b/media-video/luvcview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/lxdvdrip/metadata.xml b/media-video/lxdvdrip/metadata.xml
index 26d1bcd90abc..bcbbb642e728 100644
--- a/media-video/lxdvdrip/metadata.xml
+++ b/media-video/lxdvdrip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/m2vrequantizer/metadata.xml b/media-video/m2vrequantizer/metadata.xml
index 40d504a77773..16f63322c62d 100644
--- a/media-video/m2vrequantizer/metadata.xml
+++ b/media-video/m2vrequantizer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
 </maintainer>
+<maintainer>
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/matroxset/metadata.xml b/media-video/matroxset/metadata.xml
index d4279a059acd..7e59bfdff184 100644
--- a/media-video/matroxset/metadata.xml
+++ b/media-video/matroxset/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>media-tv</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-video/maven-poke/metadata.xml b/media-video/maven-poke/metadata.xml
index d4279a059acd..7e59bfdff184 100644
--- a/media-video/maven-poke/metadata.xml
+++ b/media-video/maven-poke/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>media-tv</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-video/mediainfo/metadata.xml b/media-video/mediainfo/metadata.xml
index 7cc6e853becc..0557507d5f04 100644
--- a/media-video/mediainfo/metadata.xml
+++ b/media-video/mediainfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mediainfo</remote-id>
 	</upstream>
diff --git a/media-video/minitube/metadata.xml b/media-video/minitube/metadata.xml
index 8bb01305ca16..9dbe77f1189a 100644
--- a/media-video/minitube/metadata.xml
+++ b/media-video/minitube/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<use>
 		<flag name="download">Enable support for downloading YouTube videos</flag>
 	</use>
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index 15e084cb227d..23c61306e66d 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<use>
 		<flag name="sdlgfx">Enables y4mhist to display a graphical histogram</flag>
 	</use>
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index bdf42c9478fc..16e1eadb0bd5 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andrzej.pauli@gmail.com</email>
 		<name>Andrzej Pauli</name>
@@ -12,6 +11,10 @@
 		<name>Amadeusz Żołnowski</name>
 		<description>Proxy maintainer.  CC him on bugs.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or
 		other input plugins and streams them as M-JPEG via HTTP to webbrowsers,
diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
index b41d036b3bd4..3c9bffa23293 100644
--- a/media-video/mkclean/metadata.xml
+++ b/media-video/mkclean/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
 	</longdescription>
diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index 65315e976b6e..9758adbc9404 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
 	</longdescription>
diff --git a/media-video/mkvtoolnix/metadata.xml b/media-video/mkvtoolnix/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/mkvtoolnix/metadata.xml
+++ b/media-video/mkvtoolnix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index e47a59dd51e8..d2ae59a07904 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/motiontrack/metadata.xml b/media-video/motiontrack/metadata.xml
index f793f53e201a..b7d13d86c715 100644
--- a/media-video/motiontrack/metadata.xml
+++ b/media-video/motiontrack/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/mpeg-tools/metadata.xml b/media-video/mpeg-tools/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/mpeg-tools/metadata.xml
+++ b/media-video/mpeg-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpeg2vidcodec/metadata.xml b/media-video/mpeg2vidcodec/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/mpeg2vidcodec/metadata.xml
+++ b/media-video/mpeg2vidcodec/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpglen/metadata.xml b/media-video/mpglen/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/mpglen/metadata.xml
+++ b/media-video/mpglen/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpgtx/metadata.xml b/media-video/mpgtx/metadata.xml
index 9d7e585c63e9..5d8dd798a878 100644
--- a/media-video/mpgtx/metadata.xml
+++ b/media-video/mpgtx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/mplay-sh/metadata.xml b/media-video/mplay-sh/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-video/mplay-sh/metadata.xml
+++ b/media-video/mplay-sh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-video/mplayer-resume/metadata.xml b/media-video/mplayer-resume/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/mplayer-resume/metadata.xml
+++ b/media-video/mplayer-resume/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/mplayer-sh/metadata.xml
index e346761c018b..73d77312986a 100644
--- a/media-video/mplayer-sh/metadata.xml
+++ b/media-video/mplayer-sh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 0e3701050a08..d98c218a7da1 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index d4ea40d4d1d7..001f1a7c95c3 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -16,8 +16,14 @@
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 	</maintainer>
-	<herd>video</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
 		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
index 5c64a44cf7c5..789e5b206e32 100644
--- a/media-video/noad/metadata.xml
+++ b/media-video/noad/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<use>
 		<flag name="libmpeg2">Support for libmpeg2 library</flag>
 	</use>
diff --git a/media-video/nvidia_video_sdk/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml
index bb54234cd05d..e84ea43cdc91 100644
--- a/media-video/nvidia_video_sdk/metadata.xml
+++ b/media-video/nvidia_video_sdk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/ogmrip/metadata.xml b/media-video/ogmrip/metadata.xml
index 8ec700d9cc50..8d2429e793df 100644
--- a/media-video/ogmrip/metadata.xml
+++ b/media-video/ogmrip/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>billl@users.sf.net</email>
     <name>Olivier Rolland</name>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <use>
diff --git a/media-video/oxine/metadata.xml b/media-video/oxine/metadata.xml
index 3df2181b12a2..75c4533dda33 100644
--- a/media-video/oxine/metadata.xml
+++ b/media-video/oxine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/pgmfindclip/metadata.xml b/media-video/pgmfindclip/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/pgmfindclip/metadata.xml
+++ b/media-video/pgmfindclip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/photofilmstrip/metadata.xml b/media-video/photofilmstrip/metadata.xml
index 9f19064500ee..c03945d42915 100644
--- a/media-video/photofilmstrip/metadata.xml
+++ b/media-video/photofilmstrip/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>phobosk@fastmail.fm</email>
 		<name>PhobosK</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 PhotoFilmStrip creates movies out of your pictures in just three steps.
 There are several output possibilities for VCD, SVCD, DVD up to FULL-HD.
diff --git a/media-video/pitivi/metadata.xml b/media-video/pitivi/metadata.xml
index 8444afb93dd2..816259cb43aa 100644
--- a/media-video/pitivi/metadata.xml
+++ b/media-video/pitivi/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/plasma-mediacenter/metadata.xml b/media-video/plasma-mediacenter/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/plasma-mediacenter/metadata.xml
+++ b/media-video/plasma-mediacenter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/projectx/metadata.xml b/media-video/projectx/metadata.xml
index 5301530dabca..e6b760f29943 100644
--- a/media-video/projectx/metadata.xml
+++ b/media-video/projectx/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		European digital radio &amp; television uses the DVB standard to broadcast
 		its data. Project X gives you a look behind the transmissions and tries
diff --git a/media-video/pymp/metadata.xml b/media-video/pymp/metadata.xml
index 0d9b0dcb7f33..7b0b0a767d03 100644
--- a/media-video/pymp/metadata.xml
+++ b/media-video/pymp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 7f6973555f3f..ae5ee63548cc 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -6,7 +6,10 @@
 		<name>Andrzej Pauli</name>
 		<description>Maintainer.  Assign bugs to him.</description>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		QGifer is a tool for extracting part of a video to an animated GIF file.
 	</longdescription>
diff --git a/media-video/qt-recordmydesktop/metadata.xml b/media-video/qt-recordmydesktop/metadata.xml
index 2f0746fb146b..3025af177713 100644
--- a/media-video/qt-recordmydesktop/metadata.xml
+++ b/media-video/qt-recordmydesktop/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>qt</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">recordmydesktop</remote-id>
 	</upstream>
diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-video/qx11grab/metadata.xml
+++ b/media-video/qx11grab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/recmpeg/metadata.xml b/media-video/recmpeg/metadata.xml
index 2fbced3903fb..63aa8a10f213 100644
--- a/media-video/recmpeg/metadata.xml
+++ b/media-video/recmpeg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/recordmydesktop/metadata.xml b/media-video/recordmydesktop/metadata.xml
index 7856fb20cfe0..4d73f31a212d 100644
--- a/media-video/recordmydesktop/metadata.xml
+++ b/media-video/recordmydesktop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/replex/metadata.xml b/media-video/replex/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/replex/metadata.xml
+++ b/media-video/replex/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/rovclock/metadata.xml b/media-video/rovclock/metadata.xml
index 303b5a066944..5146d7b553f6 100644
--- a/media-video/rovclock/metadata.xml
+++ b/media-video/rovclock/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>se.witt@gmx.net</email>
   <name>Sebastian Witt</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/setpwc/metadata.xml b/media-video/setpwc/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/setpwc/metadata.xml
+++ b/media-video/setpwc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/shrip/metadata.xml b/media-video/shrip/metadata.xml
index cfdc18af1791..5bd09f9f2ac8 100644
--- a/media-video/shrip/metadata.xml
+++ b/media-video/shrip/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>billl@users.sf.net</email>
 		<name>Olivier Rolland</name>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
index 567479d306a7..b29e50b61e6d 100644
--- a/media-video/smplayer/metadata.xml
+++ b/media-video/smplayer/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <herd>video</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="autoshutdown">
       Enable the option to shutdown your computer after finishing the playlist.
diff --git a/media-video/snappy/metadata.xml b/media-video/snappy/metadata.xml
index 8343b79cd5dc..fced74c6df1e 100644
--- a/media-video/snappy/metadata.xml
+++ b/media-video/snappy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Snappy is a gstreamer + clutter media player with powerful features in mind
 	</longdescription>
diff --git a/media-video/sonic-snap/metadata.xml b/media-video/sonic-snap/metadata.xml
index 7747d838bc0b..77c050c2661d 100644
--- a/media-video/sonic-snap/metadata.xml
+++ b/media-video/sonic-snap/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 <longdescription>Minimal webcam app for sn9c10x based camera controllers (mostly USB), with optional MPEG4 support.</longdescription>
 </pkgmetadata>
diff --git a/media-video/sswf/metadata.xml b/media-video/sswf/metadata.xml
index 0c1c744d9343..ee9f6aebf63e 100644
--- a/media-video/sswf/metadata.xml
+++ b/media-video/sswf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/streamdvd/metadata.xml b/media-video/streamdvd/metadata.xml
index 338a4e316169..0a304b764218 100644
--- a/media-video/streamdvd/metadata.xml
+++ b/media-video/streamdvd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/sub2srt/metadata.xml b/media-video/sub2srt/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/sub2srt/metadata.xml
+++ b/media-video/sub2srt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/subcheck/metadata.xml b/media-video/subcheck/metadata.xml
index da7d01380bc1..4ce9798193bb 100644
--- a/media-video/subcheck/metadata.xml
+++ b/media-video/subcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Subcheck is a perl script which checks srt (SubRip) subtitle files for
 		errors. Such as overlapping, negative duration, to short displaytime,
diff --git a/media-video/subdl/metadata.xml b/media-video/subdl/metadata.xml
index e87744a17fe7..0e4e1ae25aa3 100644
--- a/media-video/subdl/metadata.xml
+++ b/media-video/subdl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/subdownloader/metadata.xml b/media-video/subdownloader/metadata.xml
index 23b382ba9296..1756fb11ff58 100644
--- a/media-video/subdownloader/metadata.xml
+++ b/media-video/subdownloader/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ThyArmageddon+Gentoo@Gmail.com</email>
 		<name>Elijah El Lazkani</name>
@@ -10,6 +9,10 @@
 		<email>tampakrap@gentoo.org</email>
 		<name>Theo Chatzimichos</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		SubDownloader is a program for automatic download/upload subtitles for
 		videofiles (DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing
diff --git a/media-video/subliminal/metadata.xml b/media-video/subliminal/metadata.xml
index edcbae0dde7c..faea18f4ee7a 100644
--- a/media-video/subliminal/metadata.xml
+++ b/media-video/subliminal/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">subliminal</remote-id>
     <remote-id type="github">Diaoul/subliminal</remote-id>
diff --git a/media-video/submux-dvd/metadata.xml b/media-video/submux-dvd/metadata.xml
index 8b5ccd61088e..1e611238d54c 100644
--- a/media-video/submux-dvd/metadata.xml
+++ b/media-video/submux-dvd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>lordvan@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/subsync/metadata.xml b/media-video/subsync/metadata.xml
index bdf23f1b60aa..69f8f8dbb64a 100644
--- a/media-video/subsync/metadata.xml
+++ b/media-video/subsync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Subtitle Synchronizer is a easy command-line utility that synchronizes
 		subrip(srt) subtitles that use time format to given timings.
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index d76e08856ffd..a884b9730994 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">maxrd2/subtitlecomposer</remote-id>
 	</upstream>
diff --git a/media-video/subtitleeditor/metadata.xml b/media-video/subtitleeditor/metadata.xml
index 1d70fc9df22c..bdc0ea118138 100644
--- a/media-video/subtitleeditor/metadata.xml
+++ b/media-video/subtitleeditor/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
 	<email>eva@gentoo.org</email>
 	<name>Gilles Dartiguelongue</name>
 </maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices.
 </longdescription>
diff --git a/media-video/subtitler-yuv/metadata.xml b/media-video/subtitler-yuv/metadata.xml
index 8b5ccd61088e..1e611238d54c 100644
--- a/media-video/subtitler-yuv/metadata.xml
+++ b/media-video/subtitler-yuv/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>lordvan@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/subtitleripper/metadata.xml b/media-video/subtitleripper/metadata.xml
index 8eeb88921a30..9ee987262629 100644
--- a/media-video/subtitleripper/metadata.xml
+++ b/media-video/subtitleripper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">subtitleripper</remote-id>
 	</upstream>
diff --git a/media-video/super_demux/metadata.xml b/media-video/super_demux/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/super_demux/metadata.xml
+++ b/media-video/super_demux/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/tcmplex-panteltje/metadata.xml b/media-video/tcmplex-panteltje/metadata.xml
index 9f6437db2546..502353db4d52 100644
--- a/media-video/tcmplex-panteltje/metadata.xml
+++ b/media-video/tcmplex-panteltje/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>lordvan@gentoo.org</email>
 </maintainer>
@@ -9,4 +8,8 @@
   <email>hd_brummy@gentoo.org</email>
   <name>Joerg Bornkessel</name>
 </maintainer>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/tivodecode/metadata.xml b/media-video/tivodecode/metadata.xml
index a31d9764569d..9bfe07ee6ee1 100644
--- a/media-video/tivodecode/metadata.xml
+++ b/media-video/tivodecode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index c12849eff439..f3040f0048b3 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>video</herd>
-	<herd>gstreamer</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 	<longdescription>
 Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
 	</longdescription>
diff --git a/media-video/tovid/metadata.xml b/media-video/tovid/metadata.xml
index 9955bf09d26e..12d228dfdedf 100644
--- a/media-video/tovid/metadata.xml
+++ b/media-video/tovid/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">tovid</remote-id>
 		<remote-id type="github">tovid-suite/tovid</remote-id>
diff --git a/media-video/transcode/metadata.xml b/media-video/transcode/metadata.xml
index 3f38fbefc8f7..b60ad732e1f6 100644
--- a/media-video/transcode/metadata.xml
+++ b/media-video/transcode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/tsmuxer/metadata.xml b/media-video/tsmuxer/metadata.xml
index 37f3133f90e2..c51957e54f90 100644
--- a/media-video/tsmuxer/metadata.xml
+++ b/media-video/tsmuxer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		SmartLabs tsMuxeR - the software utility to create TS and M2TS files for
 		IP broadcasting as well as for viewing at hardware video players (i.e.,
diff --git a/media-video/ttcut/metadata.xml b/media-video/ttcut/metadata.xml
index c050f53a91d0..bb6393d8482a 100644
--- a/media-video/ttcut/metadata.xml
+++ b/media-video/ttcut/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription><pkg>media-video/ttcut</pkg> is a tool designed to remove commercials from
 	DVB (European standard for digital radio and television broadcast)
 	recordings. It only accepts the elementary video and audio streams. This is
diff --git a/media-video/vamps/metadata.xml b/media-video/vamps/metadata.xml
index d769aab5e32c..139293da3ac3 100644
--- a/media-video/vamps/metadata.xml
+++ b/media-video/vamps/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/vcdgear/metadata.xml
+++ b/media-video/vcdgear/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
index 0d9b0dcb7f33..7b0b0a767d03 100644
--- a/media-video/vcdimager/metadata.xml
+++ b/media-video/vcdimager/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 9ffa7fd2d058..31b0327bd347 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-video/vdr2jpeg/metadata.xml b/media-video/vdr2jpeg/metadata.xml
index b3e2a5f7a5f0..cb2d756f2fa6 100644
--- a/media-video/vdr2jpeg/metadata.xml
+++ b/media-video/vdr2jpeg/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-		<maintainer>
+	<maintainer>
 			<email>hd_brummy@gentoo.org</email>
 			<name>Joerg Bornkessel</name>
 		</maintainer>
+		<maintainer>
+			<email>media-video@gentoo.org</email>
+			<name>Gentoo Video project</name>
+		</maintainer>
 		<longdescription lang="en">
 			Addon needed for XXV - WWW Admin for the Video Disk Recorder
 			Creating jpeg pics from *.vdr files			
diff --git a/media-video/vdrsync/metadata.xml b/media-video/vdrsync/metadata.xml
index 40d504a77773..16f63322c62d 100644
--- a/media-video/vdrsync/metadata.xml
+++ b/media-video/vdrsync/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
 </maintainer>
+<maintainer>
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/vdrtools-genindex/metadata.xml b/media-video/vdrtools-genindex/metadata.xml
index 3c9ab19af68c..95f2997fba08 100644
--- a/media-video/vdrtools-genindex/metadata.xml
+++ b/media-video/vdrtools-genindex/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
 </maintainer>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
 <longdescription>
 </longdescription>
 </pkgmetadata>
diff --git a/media-video/videocut/metadata.xml b/media-video/videocut/metadata.xml
index 3ab9197e8603..f3b77b973a29 100644
--- a/media-video/videocut/metadata.xml
+++ b/media-video/videocut/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">videocut</remote-id>
 	</upstream>
diff --git a/media-video/videotrans/metadata.xml b/media-video/videotrans/metadata.xml
index 7460eda6954f..bf74fcec8657 100644
--- a/media-video/videotrans/metadata.xml
+++ b/media-video/videotrans/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Videotrans is a set of scripts that convert a movie file in any format
 		that mplayer understands to a DVD-compatible VOB file, doing all the
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 458ad8e56083..00fb934bb313 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>sdnick484@gmail.com</email>
 		<name>Nick Andrade</name>
 		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
 		<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
diff --git a/media-video/vobcopy/metadata.xml b/media-video/vobcopy/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/vobcopy/metadata.xml
+++ b/media-video/vobcopy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<maintainer>
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/vstrip/metadata.xml b/media-video/vstrip/metadata.xml
index 51e7075f13dd..0a68bb06d120 100644
--- a/media-video/vstrip/metadata.xml
+++ b/media-video/vstrip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/winki/metadata.xml b/media-video/winki/metadata.xml
index 8de312f6db3f..b29d91dc22f2 100644
--- a/media-video/winki/metadata.xml
+++ b/media-video/winki/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index 83ba4ce14f4d..cdc409276ab2 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/xanim-export/metadata.xml b/media-video/xanim-export/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xanim-export/metadata.xml
+++ b/media-video/xanim-export/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xanim/metadata.xml b/media-video/xanim/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xanim/metadata.xml
+++ b/media-video/xanim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xine-ui/metadata.xml b/media-video/xine-ui/metadata.xml
index 4f92b9f020b8..2cc6e535609e 100644
--- a/media-video/xine-ui/metadata.xml
+++ b/media-video/xine-ui/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/xvattr/metadata.xml b/media-video/xvattr/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/xvattr/metadata.xml
+++ b/media-video/xvattr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xvid4conf/metadata.xml b/media-video/xvid4conf/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xvid4conf/metadata.xml
+++ b/media-video/xvid4conf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xvideoservicethief/metadata.xml b/media-video/xvideoservicethief/metadata.xml
index ab398e0b55c2..4236bf654321 100644
--- a/media-video/xvideoservicethief/metadata.xml
+++ b/media-video/xvideoservicethief/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <herd>qt</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">xviservicethief</remote-id>
   </upstream>
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
index b17448781b40..6ecac3c88f25 100644
--- a/net-analyzer/aimsniff/metadata.xml
+++ b/net-analyzer/aimsniff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>aimsniff is a utility used for retrieving and storing AIM messages across a network.</longdescription>
 	<use>
 		<flag name="http">Install the WAS (Web AIM Sniff) frontend</flag>
diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/alive/metadata.xml
+++ b/net-analyzer/alive/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/amap/metadata.xml
+++ b/net-analyzer/amap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
index 7c9939792b85..4d52271d50b5 100644
--- a/net-analyzer/angst/metadata.xml
+++ b/net-analyzer/angst/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">angst</remote-id>
diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml
index 37a3ce04f3bd..bc5a7dacba37 100644
--- a/net-analyzer/apinger/metadata.xml
+++ b/net-analyzer/apinger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Jajcus/apinger</remote-id>
 	</upstream>
diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml
index ca640803f2e3..6930324adf23 100644
--- a/net-analyzer/argus-clients/metadata.xml
+++ b/net-analyzer/argus-clients/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use><flag name="ft">Enable support for flow packets through
 <pkg>net-analyzer/flow-tools</pkg></flag></use>
 </pkgmetadata>
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index a688da311250..85e6454fc986 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>network Audit Record Generation and Utilization System</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/arp-sk/metadata.xml
+++ b/net-analyzer/arp-sk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/arping/metadata.xml
+++ b/net-analyzer/arping/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml
index 0ed24829a4e7..9267a85dbe7a 100644
--- a/net-analyzer/arpoison/metadata.xml
+++ b/net-analyzer/arpoison/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arpoison</remote-id>
 	</upstream>
diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml
index 02380372391a..1e385042d0b3 100644
--- a/net-analyzer/arptools/metadata.xml
+++ b/net-analyzer/arptools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index 4fc697499bf6..a01564b4c124 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		The arpwatch package contains arpwatch and arpsnmp. Arpwatch and arpsnmp
 		are both network monitoring tools. Both utilities monitor Ethernet or
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index c2407e4f2026..f0304f765f70 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Fast output system for Snort</longdescription>
 	<use>
 		<flag name="sguil">Enable sguil (The Analyst Console for Network Security
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index 4c392ce30487..0d74a83e5887 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
     <maintainer>
         <email>patrick@gentoo.org</email>
         <name>Patrick Lauer</name>
@@ -13,6 +11,14 @@
         <name>Jason Wallace</name>
         <description>Proxy maintainer. CC him on bugs</description>
     </maintainer>
+    <maintainer>
+        <email>netmon@gentoo.org</email>
+        <name>Gentoo network monitoring and analysis project</name>
+    </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <longdescription>
 		Barnyard2 is a fork of the original barnyard project (which is no longer under development).
 		Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/bigeye/metadata.xml
+++ b/net-analyzer/bigeye/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
index 690ee39c881b..7f1160f2b592 100644
--- a/net-analyzer/bmon/metadata.xml
+++ b/net-analyzer/bmon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tgraf/bmon</remote-id>
 	</upstream>
diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/braa/metadata.xml
+++ b/net-analyzer/braa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/net-analyzer/bsnmp/metadata.xml
+++ b/net-analyzer/bsnmp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/bwbar/metadata.xml
+++ b/net-analyzer/bwbar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml
index 27806ec6db3f..55d84dd75c51 100644
--- a/net-analyzer/bwmon/metadata.xml
+++ b/net-analyzer/bwmon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Simple ncurses bandwidth monitor</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bwmon</remote-id>
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index 905c8f0a5329..fc60ad92bd82 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>oleg.derevenetz@gmail.com</email>
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index 10fe1e4fab54..a98a420d5e4a 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Spine (formerly known as Cactid) is a poller for Cacti that primarily
 		strives to be as fast as possible. For this reason it is written in
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index e678dff1c40b..a5a3ebe1556c 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cacti is a complete network graphing solution designed to harness the
 		power of RRDTool's data storage and graphing functionality. Cacti
diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml
index e0a1efa4d101..674a277af9fc 100644
--- a/net-analyzer/calamaris/metadata.xml
+++ b/net-analyzer/calamaris/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
index adf1f1463dfe..dd5e51579c6f 100644
--- a/net-analyzer/carl/metadata.xml
+++ b/net-analyzer/carl/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
 <maintainer>
   <email>klausman@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml
index 7b47a3a9c4a9..89ce46a93452 100644
--- a/net-analyzer/cbm/metadata.xml
+++ b/net-analyzer/cbm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 98ec2543b2c9..1977731933a4 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>rainbow@irh.it</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chaosreader</remote-id>
 	</upstream>
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
index 459b3c542463..43b0003a1440 100644
--- a/net-analyzer/check_mk/metadata.xml
+++ b/net-analyzer/check_mk/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>morlix@morlix.de</email>
 		<name>Timo Eissler</name>
 		<description>maintainer, assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		General purpose Nagios/Icinga plugin for retrieving data.
 		Check_MK is a collection of extensions for the IT-Monitoring-Kernel of Nagios/Icinga
diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/cnet/metadata.xml
+++ b/net-analyzer/cnet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml
index 5313eaf94f37..7b106ad12556 100644
--- a/net-analyzer/cryptcat/metadata.xml
+++ b/net-analyzer/cryptcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cryptcat</remote-id>
 	</upstream>
diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/cutter/metadata.xml
+++ b/net-analyzer/cutter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index ef4d76a6dd9b..5dbeab2f5504 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		darkstat is a network statistics gatherer. It's a packet sniffer that
 		runs as a background process on a cable/DSL router, gathers all sorts of
diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
index bfc69c95fdfb..7be50d0888b2 100644
--- a/net-analyzer/dhcp_probe/metadata.xml
+++ b/net-analyzer/dhcp_probe/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 	dchp_probe attempts to discover DHCP and BootP servers on a
 	directly-attached Ethernet network
diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml
index 6eaa764e301a..d7239c52456b 100644
--- a/net-analyzer/dhcpdump/metadata.xml
+++ b/net-analyzer/dhcpdump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 This command parses the output of tcpdump to display the
 dhcp-packets for easier checking and debugging.
diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/dnstracer/metadata.xml
+++ b/net-analyzer/dnstracer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/dosdetector/metadata.xml
+++ b/net-analyzer/dosdetector/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml
index 6c3eac426b2c..4d5ec8627f36 100644
--- a/net-analyzer/driftnet/metadata.xml
+++ b/net-analyzer/driftnet/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>A program which listens to network traffic and picks out images from TCP streams it observes</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
index 813da7f880a2..436d0d226847 100644
--- a/net-analyzer/dsniff/metadata.xml
+++ b/net-analyzer/dsniff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 dsniff is a collection of tools for network auditing and penetration testing.
 dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml
index 59f505d0a953..142ab5a31443 100644
--- a/net-analyzer/echoping/metadata.xml
+++ b/net-analyzer/echoping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="http">enable support for http protocol.</flag>
 		<flag name="icp">enable support for ICP (used to monitor proxies).</flag>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
index b54ba29ed2df..95b9242ab020 100644
--- a/net-analyzer/egressor/metadata.xml
+++ b/net-analyzer/egressor/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>tool for checking router configuration</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml
index ff3468df5817..b9d123db53d6 100644
--- a/net-analyzer/etherape/metadata.xml
+++ b/net-analyzer/etherape/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		EtherApe is a graphical network monitor for Unix modeled after etherman.
 		Featuring link layer, ip and TCP modes, it displays network activity
diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml
index 3f03418f6fe4..2dc4fcb10221 100644
--- a/net-analyzer/ethloop/metadata.xml
+++ b/net-analyzer/ethloop/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Local simulator for testing Linux QoS disciplines</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
index 6b2a946bb7f6..af192ee45b2c 100644
--- a/net-analyzer/ettercap/metadata.xml
+++ b/net-analyzer/ettercap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
@@ -10,6 +9,10 @@
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="plugins">Install ettercap plugins (et_*.so)</flag>
 	</use>
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index c978e6a21a47..6f5ffffeae11 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">fail2ban/fail2ban</remote-id>
   </upstream>
diff --git a/net-analyzer/fe3d/metadata.xml b/net-analyzer/fe3d/metadata.xml
index 5fd4d3b42253..7c1660250320 100644
--- a/net-analyzer/fe3d/metadata.xml
+++ b/net-analyzer/fe3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fe3d</remote-id>
 	</upstream>
diff --git a/net-analyzer/ffp/metadata.xml b/net-analyzer/ffp/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/ffp/metadata.xml
+++ b/net-analyzer/ffp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/firewalk/metadata.xml
+++ b/net-analyzer/firewalk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml
index 2ba3ac52530b..4f0bbb1755b7 100644
--- a/net-analyzer/flow-tools/metadata.xml
+++ b/net-analyzer/flow-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">Flow-tools is library and a collection of programs used to collect,
 		send, process, and generate reports from NetFlow data. The tools can be
 		used together on a single server or distributed to multiple servers for
diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml
index a26ecbdd77ec..15e6b5939ff5 100644
--- a/net-analyzer/flowgrind/metadata.xml
+++ b/net-analyzer/flowgrind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="pcap">Enable packet capturing support using <pkg>net-libs/libpcap</pkg></flag>
 	</use>
diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
index c95444344230..3ca54aca4996 100644
--- a/net-analyzer/fping/metadata.xml
+++ b/net-analyzer/fping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>A utility to ping multiple hosts at once</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">fping</remote-id>
diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml
index 8cbeac76773d..5f056ee61ba2 100644
--- a/net-analyzer/fprobe/metadata.xml
+++ b/net-analyzer/fprobe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="messages">enable console messages</flag>
 	</use>
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
index 9c9de543b91c..1cc1b5529e77 100644
--- a/net-analyzer/fragroute/metadata.xml
+++ b/net-analyzer/fragroute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">stsi/fragroute-ipv6</remote-id>
 	</upstream>
diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml
index e88d7a7ee81d..85aeafd79899 100644
--- a/net-analyzer/ftester/metadata.xml
+++ b/net-analyzer/ftester/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 		Ftester - Firewall and Intrusion Detection System testing tool
 	</longdescription>
diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/fwlogwatch/metadata.xml
+++ b/net-analyzer/fwlogwatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/gensink/metadata.xml
+++ b/net-analyzer/gensink/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-analyzer/gnome-nettool/metadata.xml
+++ b/net-analyzer/gnome-nettool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
index 6c3bd911c6ba..e02b1b613be7 100644
--- a/net-analyzer/gnu-netcat/metadata.xml
+++ b/net-analyzer/gnu-netcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>the GNU network swiss army knife</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">netcat</remote-id>
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index d11be925d378..093bbebf262b 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>GoAccess is an open source real-time web log analyzer and 
 interactive viewer that runs in a terminal in *nix systems. It provides fast and valuable
 HTTP statistics for system administrators that require a visual server report on the fly.
diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
index f72d3dc7553d..0495a2375539 100644
--- a/net-analyzer/gr-fosphor/metadata.xml
+++ b/net-analyzer/gr-fosphor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="glfw">enable GLFW based interface</flag>
 	</use>
diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-analyzer/gsm-receiver/metadata.xml
+++ b/net-analyzer/gsm-receiver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/hping/metadata.xml
+++ b/net-analyzer/hping/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index 286e8d9dbc8a..360668e9079e 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="tfo">Enable support for TCP Fast Open</flag>
 </use>
diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/hunt/metadata.xml
+++ b/net-analyzer/hunt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 022063110f44..05d2ef7b7025 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Advanced parallized login hacker</longdescription>
 <use><flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag></use>
 </pkgmetadata>
diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml
index 516ff1ada98a..96bd348166ec 100644
--- a/net-analyzer/ibmonitor/metadata.xml
+++ b/net-analyzer/ibmonitor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ibmonitor</remote-id>
 	</upstream>
diff --git a/net-analyzer/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/ifmetric/metadata.xml
+++ b/net-analyzer/ifmetric/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index 73fc3f8a1863..259f96bc0d8a 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 		ifstat is a utility to monitor network interface bandwidth usage, with
 		vmstat look and feel.
diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml
index 0bda9893d463..804011732b21 100644
--- a/net-analyzer/ifstatus/metadata.xml
+++ b/net-analyzer/ifstatus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ifstatus</remote-id>
 	</upstream>
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
index 43ff75467369..fcdeee5abccf 100644
--- a/net-analyzer/iftop/metadata.xml
+++ b/net-analyzer/iftop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/ike-scan/metadata.xml
+++ b/net-analyzer/ike-scan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
index 99a09197b3d7..7bb54236ceeb 100644
--- a/net-analyzer/ipband/metadata.xml
+++ b/net-analyzer/ipband/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ipband</remote-id>
 	</upstream>
diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml
index a40109394b5d..7be0944d537c 100644
--- a/net-analyzer/ipcad/metadata.xml
+++ b/net-analyzer/ipcad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>IP Cisco Accounting Daemon</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ipcad</remote-id>
diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml
index 3357a1796441..a03488061bf4 100644
--- a/net-analyzer/ipgen/metadata.xml
+++ b/net-analyzer/ipgen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">royhills/ipgen</remote-id>
 	</upstream>
diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/ipguard/metadata.xml
+++ b/net-analyzer/ipguard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
index 29e17cd93056..b020e0c8d258 100644
--- a/net-analyzer/iplog/metadata.xml
+++ b/net-analyzer/iplog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>iplog is a TCP/IP traffic logger</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ojnk</remote-id>
diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/ippl/metadata.xml
+++ b/net-analyzer/ippl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml
index 1599ce69cc6f..d59ac170f96b 100644
--- a/net-analyzer/iptraf-ng/metadata.xml
+++ b/net-analyzer/iptraf-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 	Interactive Colorful IP LAN Monitor, an active fork of iptraf
 </longdescription>
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index facd2fdc2084..462ab8ac514b 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>IP Tables State displays states being kept by iptables in a top-like format</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">iptstate</remote-id>
diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml
index 78637d83fee4..60d26bacb0ee 100644
--- a/net-analyzer/isic/metadata.xml
+++ b/net-analyzer/isic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">isic</remote-id>
 	</upstream>
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
index c174f0301efe..0566ec8912eb 100644
--- a/net-analyzer/jffnms/metadata.xml
+++ b/net-analyzer/jffnms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jffnms</remote-id>
 	</upstream>
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
index d0e3162ce1e6..bf91f7be8ceb 100644
--- a/net-analyzer/jmx2munin/metadata.xml
+++ b/net-analyzer/jmx2munin/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">gentoo/jmx2munin</remote-id>
   </upstream>
diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml
index 07768d7e05b1..2992f52eac57 100644
--- a/net-analyzer/jnettop/metadata.xml
+++ b/net-analyzer/jnettop/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>A top like console network traffic visualiser</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
index 566c8ae56e64..e0c71ce6d03d 100644
--- a/net-analyzer/knocker/metadata.xml
+++ b/net-analyzer/knocker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">knocker</remote-id>
 	</upstream>
diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml
index ac7bafe98b68..bc943cd801f3 100644
--- a/net-analyzer/labrea/metadata.xml
+++ b/net-analyzer/labrea/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>'Sticky' Honeypot and IDS</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">labrea</remote-id>
diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml
index b7434eafd0ba..d5c9b7dddc63 100644
--- a/net-analyzer/lft/metadata.xml
+++ b/net-analyzer/lft/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Layer Four Traceroute: an advanced traceroute implementation</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/libnasl/metadata.xml
+++ b/net-analyzer/libnasl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/lilac/metadata.xml
+++ b/net-analyzer/lilac/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml
index 62d945e496a8..406b0f026d38 100644
--- a/net-analyzer/macchanger/metadata.xml
+++ b/net-analyzer/macchanger/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">alobbs/macchanger</remote-id>
 	</upstream>
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
index dad8fc699840..1878a65edef5 100644
--- a/net-analyzer/masscan/metadata.xml
+++ b/net-analyzer/masscan/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription lang="en">
  This is the fastest Internet port scanner. It can scan the
  entire Internet in under 6 minutes, transmitting 10 million
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
index fcdaefc0d9b6..416ec0faae8d 100644
--- a/net-analyzer/mate-netspeed/metadata.xml
+++ b/net-analyzer/mate-netspeed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-netspeed</remote-id>
     </upstream>
diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml
index 4541d09b4867..0c2684221431 100644
--- a/net-analyzer/mbrowse/metadata.xml
+++ b/net-analyzer/mbrowse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mbrowse</remote-id>
 	</upstream>
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 7ea1123efd9f..4a222db9733a 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
       <email>hydrapolic@gmail.com</email>
       <name>Tomas Mozes</name>
@@ -12,6 +11,10 @@
       <name>Michael Orlitzky</name>
       <description>Secondary maintainer. Please CC on bugs.</description>
   </maintainer>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="dns">
       Install <pkg>net-dns/bind-tools</pkg> required for monitoring
diff --git a/net-analyzer/mping/metadata.xml b/net-analyzer/mping/metadata.xml
index 075e21f113b0..4f14f22533bb 100644
--- a/net-analyzer/mping/metadata.xml
+++ b/net-analyzer/mping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 UNINETTs delay statistics for IPv6 is now up and 
 running as a test project. The main goal with this 
diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/mrtg-ping-probe/metadata.xml
+++ b/net-analyzer/mrtg-ping-probe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/mrtg/metadata.xml
+++ b/net-analyzer/mrtg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml
index 1bd4de7592ac..9970c04f8711 100644
--- a/net-analyzer/multimon-ng/metadata.xml
+++ b/net-analyzer/multimon-ng/metadata.xml
@@ -5,7 +5,10 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 503344e28a4a..4b98ad6cec2e 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription lang="en">
     Munin the tool surveys all your computers and remembers what it saw. It
     presents all the information in in graphs through a web interface. Its
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
index f54283e06f33..2856194152b8 100644
--- a/net-analyzer/nagios-check_dnssec/metadata.xml
+++ b/net-analyzer/nagios-check_dnssec/metadata.xml
@@ -11,6 +11,12 @@
       <name>Chris Reffett</name>
       <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
-</pkgmetadata>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml
index 87a73df9a44f..c0104668059a 100644
--- a/net-analyzer/nagios-check_fail2ban/metadata.xml
+++ b/net-analyzer/nagios-check_fail2ban/metadata.xml
@@ -11,7 +11,10 @@
     <name>Samuel Damashek</name>
     <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hollow/check_fail2ban</remote-id>
   </upstream>
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
index 0475fa3cf108..98186e5c7599 100644
--- a/net-analyzer/nagios-check_glsa2/metadata.xml
+++ b/net-analyzer/nagios-check_glsa2/metadata.xml
@@ -11,8 +11,14 @@
     <name>Chris Reffett</name>
     <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">craig/check_glsa2</remote-id>
   </upstream>
diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
index 6a909e30ad17..a445fad78e74 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
+++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
@@ -10,6 +10,12 @@
 		<name>Werner Fischer</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
-	<herd>sysadmin</herd>
-	<herd>proxy-maintainers</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index bd3ce7ca0b69..45bc981e1bfb 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -16,6 +16,12 @@
 		<name>Nicholas Vinson</name>
 		<description>Proxy maintainer to be assigned bugs</description>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
-	<herd>sysadmin</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml
index b38d16492bd3..d2001e3508ce 100644
--- a/net-analyzer/nagios-check_mysql_health/metadata.xml
+++ b/net-analyzer/nagios-check_mysql_health/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-
   <maintainer>
       <email>andrew@ahamilto.net</email>
       <name>Andrew Hamilton</name>
@@ -20,4 +18,8 @@
       <name>Samuel Damashek</name>
       <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
+<maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml
index c162eb10843a..8e21b3f7427c 100644
--- a/net-analyzer/nagios-check_pidfile/metadata.xml
+++ b/net-analyzer/nagios-check_pidfile/metadata.xml
@@ -11,7 +11,10 @@
     <name>Samuel Damashek</name>
     <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">hollow/check_pidfile</remote-id>
   </upstream>
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index 02495dc6cb8c..f6b42d8b99ef 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -15,6 +15,12 @@
       <name>Chris Reffett</name>
       <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
-</pkgmetadata>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index 78b30f7c65e8..c0d10a676a9b 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -15,8 +15,14 @@
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription>
     Nagios is a host and service monitor designed to inform you of
     network problems before your clients, end-users or managers do. It
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
index 6baa383f5130..5783557264cf 100644
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <use>
     <flag name="smart">
       Install <pkg>sys-apps/smartmontools</pkg> required for
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index f54283e06f33..2856194152b8 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -11,6 +11,12 @@
       <name>Chris Reffett</name>
       <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
-</pkgmetadata>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 2eba13de7b11..9eddfd3c6bfa 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -16,8 +16,14 @@
       <name>Michael Orlitzky</name>
       <description>Maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <use>
     <flag name="nagios-dns">
       Install <pkg>net-dns/bind-tools</pkg> required for monitoring
diff --git a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
index bee3b9073f9f..7aa22c806416 100644
--- a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
+++ b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
@@ -11,8 +11,14 @@
     <name>Chris Reffett</name>
     <description>Proxy maintainer. CC him on bugs.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">nagios-sap-ccms</remote-id>
   </upstream>
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
index 1e6f4b5c1fca..87d52f0ff0c7 100644
--- a/net-analyzer/nagios/metadata.xml
+++ b/net-analyzer/nagios/metadata.xml
@@ -15,8 +15,14 @@
       <email>mjo@gentoo.org</email>
       <name>Michael Orlitzky</name>
   </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+  <maintainer>
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer>
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription>
     Nagios is a host and service monitor designed to inform you
     of network problems before your clients, end-users or
diff --git a/net-analyzer/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml
index d7649f4b8eb2..e4a40fb82a93 100644
--- a/net-analyzer/nagircbot/metadata.xml
+++ b/net-analyzer/nagircbot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml
index 7c3610882035..05be79d00cf9 100644
--- a/net-analyzer/nagstamon/metadata.xml
+++ b/net-analyzer/nagstamon/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
   <maintainer>
     <email>idl0r@gentoo.org</email>
     <name>Christian Ruppert</name>
   </maintainer>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">nagstamon</remote-id>
     <remote-id type="github">HenriWahl/nagstamon</remote-id>
diff --git a/net-analyzer/namebench/metadata.xml b/net-analyzer/namebench/metadata.xml
index bdfeb7adc6e5..fdee50885e83 100644
--- a/net-analyzer/namebench/metadata.xml
+++ b/net-analyzer/namebench/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">namebench</remote-id>
 	</upstream>
diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml
index 5587ee404f30..8088de48dd32 100644
--- a/net-analyzer/nast/metadata.xml
+++ b/net-analyzer/nast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nast.berlios</remote-id>
 	</upstream>
diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nbtscan/metadata.xml
+++ b/net-analyzer/nbtscan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml
index 851dce2b7fab..d96f61e501ff 100644
--- a/net-analyzer/nbwmon/metadata.xml
+++ b/net-analyzer/nbwmon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">causes-/nbwmon</remote-id>
 	</upstream>
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
index c8b1c872b132..4c6e8086dbc7 100644
--- a/net-analyzer/ndoutils/metadata.xml
+++ b/net-analyzer/ndoutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nagios</remote-id>
 	</upstream>
diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml
index 251ca58e234d..4c1e333f80cb 100644
--- a/net-analyzer/ndsad/metadata.xml
+++ b/net-analyzer/ndsad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		The NetUP ndsad (NetUp Data Stream Accounting Daemon) utility captures
 		IP-traffic from network interfaces and export NetFlow v.5. Data is
diff --git a/net-analyzer/nepenthes/metadata.xml b/net-analyzer/nepenthes/metadata.xml
index bab70ebde71d..af9c9fc7611c 100644
--- a/net-analyzer/nepenthes/metadata.xml
+++ b/net-analyzer/nepenthes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Nepenthes is a low interaction honeypot that captures worms by emulating
 		known vulnerabilities.
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nessus-bin/metadata.xml
+++ b/net-analyzer/nessus-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nessus-client/metadata.xml
+++ b/net-analyzer/nessus-client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
index b4c5e4abe562..28617c0ee359 100644
--- a/net-analyzer/nessus-core/metadata.xml
+++ b/net-analyzer/nessus-core/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>A remote security scanner for Linux (nessus-core)</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
index 6f2576670f1f..9c61f0b2f47b 100644
--- a/net-analyzer/nessus-libraries/metadata.xml
+++ b/net-analyzer/nessus-libraries/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>A remote security scanner for Linux (nessus-libraries)</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
index 59050fce4a92..68500b4bf01d 100644
--- a/net-analyzer/nessus-plugins/metadata.xml
+++ b/net-analyzer/nessus-plugins/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>A remote security scanner for Linux (nessus-plugins)</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nessus/metadata.xml
+++ b/net-analyzer/nessus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index f80008f94162..bdef877fc332 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="elf">Enable the use of elf utils to check uptime on some systems</flag>
 <flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 82bb1b15a784..72fe9c903077 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>the network swiss army knife</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nc110</remote-id>
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
index c10568fa29b9..9d35c4410984 100644
--- a/net-analyzer/netcat6/metadata.xml
+++ b/net-analyzer/netcat6/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">netcat6</remote-id>
 	</upstream>
diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/netdiscover/metadata.xml
+++ b/net-analyzer/netdiscover/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 312bf770c96d..9445b182c483 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 NetHogs is a small 'net top' tool. Instead of breaking the traffic down
  per protocol or per subnet, like most tools do, it groups bandwidth by 
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
index fce9bd0bf3c6..3aebb7e5c9ce 100644
--- a/net-analyzer/neti/metadata.xml
+++ b/net-analyzer/neti/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">neti</remote-id>
 	</upstream>
diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/netio/metadata.xml
+++ b/net-analyzer/netio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index a1ef8d5871d8..9f6fe3720a31 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="demo">Emit interim results during the run. May affect results</flag>
 <flag name="sctp">Include tests to measure SCTP performance</flag>
diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/netselect/metadata.xml
+++ b/net-analyzer/netselect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nettop/metadata.xml
+++ b/net-analyzer/nettop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml
index 296a5fe08647..5027a72edb98 100644
--- a/net-analyzer/netwag/metadata.xml
+++ b/net-analyzer/netwag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Toolbox of 222 utilities for testing Ethernet/IP networks</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ntwag</remote-id>
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index 9eaa421b5d23..12602f4ec983 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
index 3f4f876e43fc..7b2e7d1a9974 100644
--- a/net-analyzer/netwox/metadata.xml
+++ b/net-analyzer/netwox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ntwox</remote-id>
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index d7261b287da6..b2c7b0b920da 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <use>
     <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
     <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index 1c87217ecd40..f54d1f424556 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jpr5+gentoo@darkridge.com</email>
 		<name>Jordan Ritter</name>
 		<description>Program author who would like to be notified of bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ngrep</remote-id>
 	</upstream>
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index 43ff75467369..fcdeee5abccf 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 97a75ac8cff9..23bb98edf8df 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 		<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml
index c60e84a8334f..14547b17ac6a 100644
--- a/net-analyzer/nmapsi/metadata.xml
+++ b/net-analyzer/nmapsi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">nmapsi4</remote-id>
 		<remote-id type="sourceforge">nmapsi</remote-id>
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
index d646f58f7bdc..50722ae019b7 100644
--- a/net-analyzer/nodebrain/metadata.xml
+++ b/net-analyzer/nodebrain/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nodebrain</remote-id>
 	</upstream>
diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
index 144670b5c304..b97877f841bd 100644
--- a/net-analyzer/nrpe/metadata.xml
+++ b/net-analyzer/nrpe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription>
     A daemon for allowing Nagios to connect directly to servers and
     execute commands defined in a centralized configuration file.
diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml
index e98921b44b4f..50205b2e8c10 100644
--- a/net-analyzer/nsat/metadata.xml
+++ b/net-analyzer/nsat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Network Security Analysis Tool, an application-level network security scanner</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nsat</remote-id>
diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml
index 6d4d98e4d903..5bac87cea856 100644
--- a/net-analyzer/nsca/metadata.xml
+++ b/net-analyzer/nsca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <longdescription lang="en">
     This program is designed to accept passive service check results
     from clients that use the send_nsca utility (which is included in
diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/nstats/metadata.xml
+++ b/net-analyzer/nstats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
index bea1d84c9d50..bb3e6f6bad1e 100644
--- a/net-analyzer/ntop/metadata.xml
+++ b/net-analyzer/ntop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>ntop is a network traffic probe that shows the network usage,
   similar to what the popular top Unix command does. ntop is based on libpcap
   and it has been written in a portable way in order to virtually run on every
diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml
index 5051377f5abc..f7ee654536a1 100644
--- a/net-analyzer/nttcp/metadata.xml
+++ b/net-analyzer/nttcp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>tool to test TCP and UDP throughput</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
index 52ec285119d8..57ccbcb5b9d9 100644
--- a/net-analyzer/odhcploc/metadata.xml
+++ b/net-analyzer/odhcploc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml
index caf45de8548f..cc7064aa854e 100644
--- a/net-analyzer/oinkmaster/metadata.xml
+++ b/net-analyzer/oinkmaster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">oinkmaster</remote-id>
 	</upstream>
diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml
index 44b3cbf45583..beb8daaee09d 100644
--- a/net-analyzer/p0f/metadata.xml
+++ b/net-analyzer/p0f/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>p0f performs passive OS detection based on SYN packets.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/packit/metadata.xml
+++ b/net-analyzer/packit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/pathload/metadata.xml
+++ b/net-analyzer/pathload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml
index b19dcc35034e..539b5487f6cf 100644
--- a/net-analyzer/pbnj/metadata.xml
+++ b/net-analyzer/pbnj/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>jabra@ccs.neu.edu</email>
   </maintainer>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pbnj</remote-id>
   </upstream>
diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
index 5eb21ecd6bfd..99bc8105a58b 100644
--- a/net-analyzer/pinger/metadata.xml
+++ b/net-analyzer/pinger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="gtk2">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:2</pkg></flag>
 <flag name="gtk3">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:3</pkg></flag>
diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/pktstat/metadata.xml
+++ b/net-analyzer/pktstat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index e7682c9dd62d..49d7e86b41af 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 <flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 36a72c70d317..29377207a88e 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pnp4nagios</remote-id>
   </upstream>
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/portmon/metadata.xml
+++ b/net-analyzer/portmon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml
index cedb9f45ac48..c9568be5721a 100644
--- a/net-analyzer/portsentry/metadata.xml
+++ b/net-analyzer/portsentry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sentrytools</remote-id>
 	</upstream>
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-analyzer/postal/metadata.xml
+++ b/net-analyzer/postal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml
index 5c2b33cc7476..20afb1848538 100644
--- a/net-analyzer/pypacker/metadata.xml
+++ b/net-analyzer/pypacker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mike01/pypacker</remote-id>
 		<maintainer>
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
index 8452310f8b70..c83b3351067a 100644
--- a/net-analyzer/quidscor/metadata.xml
+++ b/net-analyzer/quidscor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">quidscor</remote-id>
 	</upstream>
diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/rain/metadata.xml
+++ b/net-analyzer/rain/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index 0bfa612138f2..a463cfc257c4 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@danielquinn.org</email>
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ripe.atlas.tools</remote-id>
 	</upstream>
diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml
index 477804ead86d..95cff0eceb5b 100644
--- a/net-analyzer/rrdcollect/metadata.xml
+++ b/net-analyzer/rrdcollect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="exec">Enable exec:/// support</flag>
 		<flag name="librrd">Use the librrd library from <pkg>net-analyzer/rrdtool</pkg></flag>
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index b184b8ed4be9..fca655c1dba5 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="graph">Enable support for graphing functions</flag>
 <flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index c6bd53688f03..e452a4d4e2d9 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
 	</use>
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index b3c471b62d0c..7ea602b12384 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
  you to view "where" your users are going to on the Internet. Sarg provides many
  informations about Squid users activities: times, bytes, sites, etc...
diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml
index 6b3d934caee5..bb8533126ba4 100644
--- a/net-analyzer/sbd/metadata.xml
+++ b/net-analyzer/sbd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 sbd is a Netcat-clone, designed to be portable and offer strong encryption. It
 features AES-CBC-128 + HMAC-SHA1 encryption (by Christophe Devine), program
diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml
index d65c0f39012a..4fdf0b9ee629 100644
--- a/net-analyzer/scanlogd/metadata.xml
+++ b/net-analyzer/scanlogd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="nids">Use <pkg>net-libs/libnids</pkg> for packet capturing</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml
index 4a05ae080d13..753c1bfa8a47 100644
--- a/net-analyzer/scanssh/metadata.xml
+++ b/net-analyzer/scanssh/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Scanssh protocol scanner - scans a list of addresses an networks for running SSH protocol servers and their version numbers.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 47c0b3f30029..1edffb1631da 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 Scapy is a powerful interactive packet manipulation program.
 </longdescription>
diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/scli/metadata.xml
+++ b/net-analyzer/scli/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index b32074cc7f89..3a36d21f869e 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simple-evcorr</remote-id>
 	</upstream>
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index 43ff75467369..fcdeee5abccf 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
index 32d7038bdbde..d08e3b8a76c8 100644
--- a/net-analyzer/sguil-client/metadata.xml
+++ b/net-analyzer/sguil-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
     <remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
index 32d7038bdbde..d08e3b8a76c8 100644
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ b/net-analyzer/sguil-sensor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
     <remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
index 32d7038bdbde..d08e3b8a76c8 100644
--- a/net-analyzer/sguil-server/metadata.xml
+++ b/net-analyzer/sguil-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
     <remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/sinfo/metadata.xml
+++ b/net-analyzer/sinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index 28e51faef9ee..be50b1d16856 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
 <flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/sniffit/metadata.xml
+++ b/net-analyzer/sniffit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml
index f01e891b3e80..56fcb6916ab1 100644
--- a/net-analyzer/snmptt/metadata.xml
+++ b/net-analyzer/snmptt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>SNMP Trap Translator</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">snmptt</remote-id>
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index a4a3e5c199d8..f1264ba75beb 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
@@ -13,6 +11,14 @@
 		<name>Jason Wallace</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Snort is an open source network intrusion prevention and detection
 		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/snortalog/metadata.xml
+++ b/net-analyzer/snortalog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
index 43ff75467369..fcdeee5abccf 100644
--- a/net-analyzer/snortsam/metadata.xml
+++ b/net-analyzer/snortsam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml
index bf548f3b7c78..377b96b6c6ac 100644
--- a/net-analyzer/softflowd/metadata.xml
+++ b/net-analyzer/softflowd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <upstream>
 <remote-id type="google-code">softflowd</remote-id>
 </upstream>
diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml
index 0206b2411dee..5d16ffe240b8 100644
--- a/net-analyzer/sqlninja/metadata.xml
+++ b/net-analyzer/sqlninja/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sqlninja</remote-id>
 	</upstream>
diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml
index 0fad16e7dba1..bdc41c6ac38e 100644
--- a/net-analyzer/squid-graph/metadata.xml
+++ b/net-analyzer/squid-graph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Squid logfile analyzer and traffic grapher</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">squid-graph</remote-id>
diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/squidsites/metadata.xml
+++ b/net-analyzer/squidsites/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml
index b5353e0b229e..dbe54ab223e5 100644
--- a/net-analyzer/ssmping/metadata.xml
+++ b/net-analyzer/ssmping/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>venaas@uninett.no</email>
 		<name>Stig Venaas (upstream)</name>
 	</maintainer>
+<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml
index 3e0971b990e0..107c91ffef22 100644
--- a/net-analyzer/symon/metadata.xml
+++ b/net-analyzer/symon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="perl">Enables a generic perl symux client</flag>
 		<flag name="symon">Enables the system monitor. Offers no functionality
diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-analyzer/syweb/metadata.xml
+++ b/net-analyzer/syweb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 9ec6ed4d3892..1dba729c5ef3 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 	<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
 	<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml
index ff0e9e7f0eda..2bb80e938078 100644
--- a/net-analyzer/tcpflow/metadata.xml
+++ b/net-analyzer/tcpflow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
 	</use>
diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/tcpreen/metadata.xml
+++ b/net-analyzer/tcpreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index d098016ba67d..43ac8de13f5d 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>
   Tcpreplay is a suite of utilities for UNIX systems for editing and replaying
   network traffic which was previously captured by tools like tcpdump and
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
index 1926505a3d61..68fdf83cb8b4 100644
--- a/net-analyzer/tcpslice/metadata.xml
+++ b/net-analyzer/tcpslice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">the-tcpdump-group/tcpslice</remote-id>
 	</upstream>
diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/tcpstat/metadata.xml
+++ b/net-analyzer/tcpstat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/tcptrace/metadata.xml
+++ b/net-analyzer/tcptrace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml
index 61d0b3e9889e..a15be3b227b9 100644
--- a/net-analyzer/tcptraceroute/metadata.xml
+++ b/net-analyzer/tcptraceroute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mct/tcptraceroute</remote-id>
 	</upstream>
diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/tcptrack/metadata.xml
+++ b/net-analyzer/tcptrack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/thcrut/metadata.xml
+++ b/net-analyzer/thcrut/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/tleds/metadata.xml
+++ b/net-analyzer/tleds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml
index 496929f4d0d2..b07ac726d9ea 100644
--- a/net-analyzer/tptest/metadata.xml
+++ b/net-analyzer/tptest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tptest</remote-id>
 	</upstream>
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
index 18403fc4878c..ea873d674628 100644
--- a/net-analyzer/tracebox/metadata.xml
+++ b/net-analyzer/tracebox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tracebox/tracebox</remote-id>
 	</upstream>
diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
index da78704d1fba..9ca1b5e93d37 100644
--- a/net-analyzer/traceproto/metadata.xml
+++ b/net-analyzer/traceproto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">traceproto</remote-id>
 	</upstream>
diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/traceroute-nanog/metadata.xml
+++ b/net-analyzer/traceroute-nanog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml
index dc8a43461a3c..2286f198e7fc 100644
--- a/net-analyzer/traceroute/metadata.xml
+++ b/net-analyzer/traceroute/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Utility to trace the route of IP packets</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">traceroute</remote-id>
diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/trafshow/metadata.xml
+++ b/net-analyzer/trafshow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/ttcp/metadata.xml
+++ b/net-analyzer/ttcp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml
index c059e1ca5cd7..70dc193a83e6 100644
--- a/net-analyzer/upnpscan/metadata.xml
+++ b/net-analyzer/upnpscan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 A tool that scans the LAN or a given address range for UPnP capable
 devices. This is done by sending M-SEARCH discovery packets to either
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index ff2cafb5d05e..ec83004f63dd 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 <longdescription>
   vnStat is a network traffic monitor for Linux that keeps a log of daily
   network traffic for the selected interface(s). vnStat isn't a packet sniffer.
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index 7095e0e64b8f..740d57b7b5b8 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>clabbe.montjoie@gmail.com</email>
 		<name>LABBE Corentin (Montjoie)</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/webfuzzer/metadata.xml
+++ b/net-analyzer/webfuzzer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index b80d8aa88139..ae047c6f0334 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 	Wireshark is the world's foremost network protocol analyzer, and is the de
 	facto (and often de jure) standard across many industries and educational
diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/xnetload/metadata.xml
+++ b/net-analyzer/xnetload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml
index b17f052c15e8..fef0bbe355de 100644
--- a/net-analyzer/xprobe/metadata.xml
+++ b/net-analyzer/xprobe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to
 xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting.
diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml
index cc554b32314f..1ac8c08887fd 100644
--- a/net-analyzer/yersinia/metadata.xml
+++ b/net-analyzer/yersinia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 Yersinia is a network tool designed to take advantage of some weakeness
 in different network protocols. It intends to be a solid framework for
diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-analyzer/zniper/metadata.xml
+++ b/net-analyzer/zniper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 3b02d59255ab..d76a5add977b 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
diff --git a/net-dialup/capi4k-utils/metadata.xml b/net-dialup/capi4k-utils/metadata.xml
index 3ba465ebbbb5..90e058c4cd71 100644
--- a/net-dialup/capi4k-utils/metadata.xml
+++ b/net-dialup/capi4k-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		This package contains the CAPI 2.0 library, which is needed for all
 		CAPI applications. It also contains programs to show information about
diff --git a/net-dialup/capidivert/metadata.xml b/net-dialup/capidivert/metadata.xml
index b61d2af8a9f9..b2117327ab91 100644
--- a/net-dialup/capidivert/metadata.xml
+++ b/net-dialup/capidivert/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		CAPI based utility to control ISDN diversion facilities.
 	</longdescription>
diff --git a/net-dialup/capifwd/metadata.xml b/net-dialup/capifwd/metadata.xml
index dac0bf21fe8b..99f7a0315399 100644
--- a/net-dialup/capifwd/metadata.xml
+++ b/net-dialup/capifwd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>A daemon forwarding CAPI messages to capi20proxy clients</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">capi20proxy</remote-id>
diff --git a/net-dialup/capisuite/metadata.xml b/net-dialup/capisuite/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/capisuite/metadata.xml
+++ b/net-dialup/capisuite/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/cistronradius/metadata.xml b/net-dialup/cistronradius/metadata.xml
index 1930bc3c4e14..a6f04503b543 100644
--- a/net-dialup/cistronradius/metadata.xml
+++ b/net-dialup/cistronradius/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>
 An authentication and accounting server for terminal servers that speak the RADIUS protocol.
 </longdescription>
diff --git a/net-dialup/cutecom/metadata.xml b/net-dialup/cutecom/metadata.xml
index e386f7f66dea..932b0241145a 100644
--- a/net-dialup/cutecom/metadata.xml
+++ b/net-dialup/cutecom/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <longdescription>CuteCom is a graphical serial terminal, like minicom. It is aimed mainly at hardware 
 developers or other people who need a terminal to talk to their devices.</longdescription>
   <upstream>
diff --git a/net-dialup/dial/metadata.xml b/net-dialup/dial/metadata.xml
index deda48640109..1a95b1b7f224 100644
--- a/net-dialup/dial/metadata.xml
+++ b/net-dialup/dial/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<upstream>
 		<remote-id type="sourceforge">dwun</remote-id>
 	</upstream>
diff --git a/net-dialup/diald/metadata.xml b/net-dialup/diald/metadata.xml
index 8569d812c705..8c857f73cfe0 100644
--- a/net-dialup/diald/metadata.xml
+++ b/net-dialup/diald/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>Diald is an intelligent link management tool originally named 
 for its ability to control dial-on-demand network connections</longdescription>
 	<upstream>
diff --git a/net-dialup/drdsl/metadata.xml b/net-dialup/drdsl/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/drdsl/metadata.xml
+++ b/net-dialup/drdsl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/dtrace/metadata.xml b/net-dialup/dtrace/metadata.xml
index 3017626ca0de..1bd2a86dd0e9 100644
--- a/net-dialup/dtrace/metadata.xml
+++ b/net-dialup/dtrace/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<maintainer>
 		<email>sbriesen@gentoo.org</email>
 		<name>Stefan Briesenick</name>
diff --git a/net-dialup/dwun/metadata.xml b/net-dialup/dwun/metadata.xml
index deda48640109..1a95b1b7f224 100644
--- a/net-dialup/dwun/metadata.xml
+++ b/net-dialup/dwun/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<upstream>
 		<remote-id type="sourceforge">dwun</remote-id>
 	</upstream>
diff --git a/net-dialup/fbgetty/metadata.xml b/net-dialup/fbgetty/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/fbgetty/metadata.xml
+++ b/net-dialup/fbgetty/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/fcpci/metadata.xml b/net-dialup/fcpci/metadata.xml
index 756ddd4a6227..097975e3adc2 100644
--- a/net-dialup/fcpci/metadata.xml
+++ b/net-dialup/fcpci/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml
index 946cd15bd2fb..3a6e115cf7d4 100644
--- a/net-dialup/freeradius-client/metadata.xml
+++ b/net-dialup/freeradius-client/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>FreeRADIUS Client is a framework and library for writing
 RADIUS Clients which additionally includes radlogin, a flexible RADIUS
 aware login replacement, a command line program to send RADIUS accounting
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 74768f5bba42..2023991859a8 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <use>
     <flag name="pcap">
       Build the RADIUS sniffer which requires <pkg>net-libs/libpcap</pkg>.
diff --git a/net-dialup/globespan-adsl/metadata.xml b/net-dialup/globespan-adsl/metadata.xml
index 58a624c08f76..136ea918c73d 100644
--- a/net-dialup/globespan-adsl/metadata.xml
+++ b/net-dialup/globespan-adsl/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>ADSL modem driver for Globespan/ECI chipsets.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/gnuradius/metadata.xml b/net-dialup/gnuradius/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/gnuradius/metadata.xml
+++ b/net-dialup/gnuradius/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/gtkterm/metadata.xml b/net-dialup/gtkterm/metadata.xml
index cd1e3d75e802..035775ca661f 100644
--- a/net-dialup/gtkterm/metadata.xml
+++ b/net-dialup/gtkterm/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>A simplified "clone" of the famous Hyperterminal, without support for X/Y/ZMODEM protocols.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/hcfpcimodem/metadata.xml b/net-dialup/hcfpcimodem/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/hcfpcimodem/metadata.xml
+++ b/net-dialup/hcfpcimodem/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/isdn-firmware/metadata.xml b/net-dialup/isdn-firmware/metadata.xml
index e86609b3d54e..39c1074e573a 100644
--- a/net-dialup/isdn-firmware/metadata.xml
+++ b/net-dialup/isdn-firmware/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		ISDN firmware for active ISDN cards (AVM, Eicon, etc.)
 	</longdescription>
diff --git a/net-dialup/itund/metadata.xml b/net-dialup/itund/metadata.xml
index 80845ef05e9b..de784432d731 100644
--- a/net-dialup/itund/metadata.xml
+++ b/net-dialup/itund/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		ItunD (ISDN tunnel Daemon) provides a network tunnel over ISDN lines
 		using the CAPI interface. The ISDN4Linux isdn-net (rawIP) devices are
diff --git a/net-dialup/kpnadsl4linux/metadata.xml b/net-dialup/kpnadsl4linux/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/kpnadsl4linux/metadata.xml
+++ b/net-dialup/kpnadsl4linux/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/linux-atm/metadata.xml b/net-dialup/linux-atm/metadata.xml
index cf1b28ef7a1c..34c656785725 100644
--- a/net-dialup/linux-atm/metadata.xml
+++ b/net-dialup/linux-atm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <longdescription>Tools for ATM.</longdescription>
   <upstream>
     <remote-id type="sourceforge">linux-atm</remote-id>
diff --git a/net-dialup/lrzsz/metadata.xml b/net-dialup/lrzsz/metadata.xml
index f7407264c3ae..ed062eb346c5 100644
--- a/net-dialup/lrzsz/metadata.xml
+++ b/net-dialup/lrzsz/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 <longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/martian-modem/metadata.xml b/net-dialup/martian-modem/metadata.xml
index bb68c349bea5..8d04438f1c20 100644
--- a/net-dialup/martian-modem/metadata.xml
+++ b/net-dialup/martian-modem/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>rogerx.oss@gmail.com</email>
 	<name>Roger</name>
@@ -11,4 +10,8 @@
 	<email>pacho@gentoo.org</email>
 	<description>proxy-maintainer, please CC on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-dialup/mgetty/metadata.xml b/net-dialup/mgetty/metadata.xml
index a8ca9754ea94..f60bc07b2f7d 100644
--- a/net-dialup/mgetty/metadata.xml
+++ b/net-dialup/mgetty/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>Suite of programs that allows you to take full advantage of your voice/fax modem.
 mgetty is capable of handling data, fax and voice calls without interfering with outgoing calls.</longdescription>
 <use>
diff --git a/net-dialup/mingetty/metadata.xml b/net-dialup/mingetty/metadata.xml
index 3141de561c6b..1277c957c719 100644
--- a/net-dialup/mingetty/metadata.xml
+++ b/net-dialup/mingetty/metadata.xml
@@ -5,7 +5,10 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription>The mingetty program is a lightweight, minimalist getty program for
 use only on virtual consoles.  Mingetty is not suitable for serial
 lines (you should use the mgetty program in that case).</longdescription>
diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index a27512af0be1..7f7b481c9b23 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>embedded</herd>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <longdescription lang="en">
     Minicom is a menu driven communications program. It emulates ANSI and VT102
     terminals. It has a dialing directory and auto zmodem download.
diff --git a/net-dialup/moserial/metadata.xml b/net-dialup/moserial/metadata.xml
index 8b49a280b79f..a704edd765e3 100644
--- a/net-dialup/moserial/metadata.xml
+++ b/net-dialup/moserial/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
 	<email>steev@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 	moserial is a clean, friendly gtk-based serial terminal for the gnome desktop.
 </longdescription>
diff --git a/net-dialup/mwavem/metadata.xml b/net-dialup/mwavem/metadata.xml
index acee6b7963aa..d4bfd701fc57 100644
--- a/net-dialup/mwavem/metadata.xml
+++ b/net-dialup/mwavem/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>User level application for IBM Mwave modem.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/picocom/metadata.xml b/net-dialup/picocom/metadata.xml
index 26e742e2c906..3ea253d988b8 100644
--- a/net-dialup/picocom/metadata.xml
+++ b/net-dialup/picocom/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">picocom</remote-id>
 		<remote-id type="github">npat-efault/picocom</remote-id>
diff --git a/net-dialup/ppp-scripts/metadata.xml b/net-dialup/ppp-scripts/metadata.xml
index 756ddd4a6227..097975e3adc2 100644
--- a/net-dialup/ppp-scripts/metadata.xml
+++ b/net-dialup/ppp-scripts/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index f7d263a32a14..8ba686495209 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -5,7 +5,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>ppp (Paul's PPP Package) is an open source package which
   implements the Point-to-Point Protocol</longdescription>
   <use>
diff --git a/net-dialup/pppconfig/metadata.xml b/net-dialup/pppconfig/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/pppconfig/metadata.xml
+++ b/net-dialup/pppconfig/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/pptpclient/metadata.xml b/net-dialup/pptpclient/metadata.xml
index 65fb9b5c3f7d..572fbcb6d5bc 100644
--- a/net-dialup/pptpclient/metadata.xml
+++ b/net-dialup/pptpclient/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <longdescription>PPTP Client is a client for the proprietary Microsoft Point-to-Point Tunneling Protocol.</longdescription>
   <upstream>
     <remote-id type="sourceforge">pptpclient</remote-id>
diff --git a/net-dialup/pptpd/metadata.xml b/net-dialup/pptpd/metadata.xml
index c068ca384f2c..02edb56766da 100644
--- a/net-dialup/pptpd/metadata.xml
+++ b/net-dialup/pptpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<use>
 		<flag name="gre-extreme-debug">Log all GRE accepted packages when in debug
 		mode (required if you want upstream support)</flag>
diff --git a/net-dialup/qtwvdialer/metadata.xml b/net-dialup/qtwvdialer/metadata.xml
index 9bd11a373d66..df0ab6316378 100644
--- a/net-dialup/qtwvdialer/metadata.xml
+++ b/net-dialup/qtwvdialer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<upstream>
 		<remote-id type="github">schuay/qt4wvdialer</remote-id>
 	</upstream>
diff --git a/net-dialup/radiusclient-ng/metadata.xml b/net-dialup/radiusclient-ng/metadata.xml
index fe3761bbc565..372d3853f95c 100644
--- a/net-dialup/radiusclient-ng/metadata.xml
+++ b/net-dialup/radiusclient-ng/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>Purpose of this project is to build portable, easy-to-use and standard compliant library suitable for 
 developing free and commercial software that need support for a RADIUS protocol (RFCs 2128 and 2139).</longdescription>
 	<upstream>
diff --git a/net-dialup/radiusclient/metadata.xml b/net-dialup/radiusclient/metadata.xml
index 3f6ad1322e7d..ca9494d88a6e 100644
--- a/net-dialup/radiusclient/metadata.xml
+++ b/net-dialup/radiusclient/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>A library for writing RADIUS clients accompanied with several client utilities</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">radiusclient</remote-id>
diff --git a/net-dialup/rp-l2tp/metadata.xml b/net-dialup/rp-l2tp/metadata.xml
index 72249d8a629e..3e7845d0f20c 100644
--- a/net-dialup/rp-l2tp/metadata.xml
+++ b/net-dialup/rp-l2tp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<upstream>
 		<remote-id type="sourceforge">rp-l2tp</remote-id>
 	</upstream>
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml
index a1edcfe784b9..b49e34221998 100644
--- a/net-dialup/rp-pppoe/metadata.xml
+++ b/net-dialup/rp-pppoe/metadata.xml
@@ -5,5 +5,8 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<herd>base-system</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-dialup/sendpage/metadata.xml b/net-dialup/sendpage/metadata.xml
index f444241a55dc..adbc3bfdc4aa 100644
--- a/net-dialup/sendpage/metadata.xml
+++ b/net-dialup/sendpage/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>To send alphanumeric pages to a pager, if an email gateway is unavailable or undesirable, 
 software is needed to control a modem which will dial a "Paging Central", and deliver the pages using 
 an ASCII delivery system known as "TAP".
diff --git a/net-dialup/sercd/metadata.xml b/net-dialup/sercd/metadata.xml
index 7a12fc3fa390..3825da4b6642 100644
--- a/net-dialup/sercd/metadata.xml
+++ b/net-dialup/sercd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>sercd is an RFC 2217-compliant serial port redirector.
 It lets you share a serial port through network.</longdescription>
 	<upstream>
diff --git a/net-dialup/speedtouch-usb/metadata.xml b/net-dialup/speedtouch-usb/metadata.xml
index ad9105084891..576f7d890bf3 100644
--- a/net-dialup/speedtouch-usb/metadata.xml
+++ b/net-dialup/speedtouch-usb/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>Firmware and configuration instructions for the kernel-space driver for Alcatel SpeedTouch USB modems.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/tkvoice/metadata.xml b/net-dialup/tkvoice/metadata.xml
index 539a4f382a29..52a22256d53e 100644
--- a/net-dialup/tkvoice/metadata.xml
+++ b/net-dialup/tkvoice/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <longdescription>Tk-Voice is a Telephone Answering Machine frontend for vgetty
 and also a Facsimile Answering Machine frontend for mgetty.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/ueagle-atm/metadata.xml b/net-dialup/ueagle-atm/metadata.xml
index 14b1904fbd1b..a0b90a1a5bd6 100644
--- a/net-dialup/ueagle-atm/metadata.xml
+++ b/net-dialup/ueagle-atm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver
 available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/ueagle4-atm/metadata.xml b/net-dialup/ueagle4-atm/metadata.xml
index 917ca85d66e6..2e36d3cedb0a 100644
--- a/net-dialup/ueagle4-atm/metadata.xml
+++ b/net-dialup/ueagle4-atm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>Firmware and configuration instructions for Eagle USB E4 ADSL Modem driver
 available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/wvdial/metadata.xml b/net-dialup/wvdial/metadata.xml
index ed5cc4c7268c..59099d9e51d8 100644
--- a/net-dialup/wvdial/metadata.xml
+++ b/net-dialup/wvdial/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<upstream>
 		<remote-id type="google-code">wvstreams</remote-id>
 	</upstream>
diff --git a/net-dialup/xc/metadata.xml b/net-dialup/xc/metadata.xml
index c9337563bbfb..4aee52939942 100644
--- a/net-dialup/xc/metadata.xml
+++ b/net-dialup/xc/metadata.xml
@@ -5,5 +5,8 @@
 		<email>kumba@gentoo.org</email>
 		<name>Joshua Kinard</name>
 	</maintainer>
-	<herd>embedded</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 0c7e5f5bfb42..8dff0042d1ad 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
diff --git a/net-dns/cagibi/metadata.xml b/net-dns/cagibi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-dns/cagibi/metadata.xml
+++ b/net-dns/cagibi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-dns/dnrd/metadata.xml b/net-dns/dnrd/metadata.xml
index 0e1cbf4d4486..29720a21c68f 100644
--- a/net-dns/dnrd/metadata.xml
+++ b/net-dns/dnrd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>natanael.copa@gmail.com</email>
 		<name>Natanael Copa</name>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>armin76@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations.
 </longdescription>
diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml
index 14b05fb0dd81..2e5d57f7725f 100644
--- a/net-dns/dnstop/metadata.xml
+++ b/net-dns/dnstop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>hendrik@consetetur.de</email>
   <name>Hendrik v. Raven</name>
@@ -10,6 +9,10 @@
   <email>xmw@gentoo.org</email>
   <name>Michael Weber</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
   <changelog>http://dns.measurement-factory.com/tools/dnstop/src/CHANGES</changelog>
   <doc>http://dns.measurement-factory.com/tools/dnstop/dnstop.8.html</doc>
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 29256af3d08f..31e7cef563d4 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ondrej@sury.org</email>
 		<name>Ondřej Surý</name>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>scarabeus@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+	        <email>proxy-maint@gentoo.org</email>
+	        <name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="dnstap">Include support for the dnstap
 		binary log format (http://dnstap.info/).
diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml
index 94476e896b19..a074b5250949 100644
--- a/net-dns/noip-updater/metadata.xml
+++ b/net-dns/noip-updater/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>boothfsec@gmail.com</email>
 		<name>Francis Booth</name>
 		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		no-ip.com dynamic DNS updater
 	</longdescription>
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index 50e414a3472e..224194b89f0a 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tom@whyscream.net</email>
 		<name>Tom Hendrikx</name>
@@ -12,6 +11,10 @@
 		<name>Wolfram Schlich</name>
 		<description>proxy-maintainer, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag>
 		<flag name="libevent">Use libevent or libev, useful when zone
diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index 9996eab0bb17..e2d756c746a6 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
-    <maintainer>
+  <maintainer>
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
     </maintainer>
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 3c419c0c2375..7d68ec18b53e 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
@@ -11,6 +10,10 @@
     <description>Proxied developer. Please CC on bugs.</description>
     <name>TANABE Ken-ichi</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   Unbound is a validating, recursive, and caching DNS resolver.
 
diff --git a/net-dns/validns/metadata.xml b/net-dns/validns/metadata.xml
index cce03d071dbf..94de178247a8 100644
--- a/net-dns/validns/metadata.xml
+++ b/net-dns/validns/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tom@whyscream.net</email>
 		<name>Tom Hendrikx</name>
@@ -12,5 +11,9 @@
 		<name>Wolfram Schlich</name>
 		<description>proxy-maintainer, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Validns is a standalone command line RFC 1034/1035 zone file validation tool that, in addition to basic syntactic and semantic zone checks, includes DNSSEC signature verification and NSEC/NSEC3 chain validation, as well a number of optional policy checks on the zone.</longdescription>
 </pkgmetadata>
diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 2491879fd846..520e40c219b0 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>erkiferenc@gmail.com</email>
 	<name>Ferenc Erki</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
 </use>
diff --git a/net-firewall/arptables/metadata.xml b/net-firewall/arptables/metadata.xml
index 23b2d799bbe8..1174960a6169 100644
--- a/net-firewall/arptables/metadata.xml
+++ b/net-firewall/arptables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ebtables</remote-id>
 	</upstream>
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index 5c490dd32d99..c1301934f032 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		A set of tools targeted at system administrators. They are conntrack,
 		the userspace command line interface, and conntrackd, the userspace
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index fd59ecdb05ab..9ed11df9fecf 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="perl">Install the ebtables-save script which uses perl</flag>
 	</use>
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 94ccf5421619..26ec802cbb7e 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -10,7 +10,10 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>virtualization</herd>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="gui">Builds and installs GUI configurator and GTK+ applet</flag>
 	</use>
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index cc8a621efcda..01324129795f 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build fwknop client</flag>
 		<flag name="extras">Install example AppArmor policy for fwknopd server</flag>
diff --git a/net-firewall/gshield/metadata.xml b/net-firewall/gshield/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-firewall/gshield/metadata.xml
+++ b/net-firewall/gshield/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index e2cd4f38e85b..46819600629a 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ipt-netflow</remote-id>
 	</upstream>
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 76e1b58763af..454f3551fb80 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
 	<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
diff --git a/net-firewall/itval/metadata.xml b/net-firewall/itval/metadata.xml
index 4a3f9593bd0a..bd070a1ff00b 100644
--- a/net-firewall/itval/metadata.xml
+++ b/net-firewall/itval/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">itval</remote-id>
 	</upstream>
diff --git a/net-firewall/lutelwall/metadata.xml b/net-firewall/lutelwall/metadata.xml
index 8a0d713fe48d..92ed100751bf 100644
--- a/net-firewall/lutelwall/metadata.xml
+++ b/net-firewall/lutelwall/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
     <email>tomek@lutel.pl</email>
     <name>Tomek Lutelmowski</name>
     <description>LuteWall developer, third party maintainer</description>     
 </maintainer>
+<maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 LutelWall is high-level firewall configuration tool. It uses human-readable and easy 
 to understand configuration to set up Netfilter in most secure way. Its flexibility 
diff --git a/net-firewall/nfacct/metadata.xml b/net-firewall/nfacct/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-firewall/nfacct/metadata.xml
+++ b/net-firewall/nfacct/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index 38fd447bdc5e..015a68319428 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
@@ -12,4 +10,12 @@
 		<name>Nicholas Vinson</name>
 		<description>Proxy maintainer to be assigned bugs</description>
 	</maintainer>
+<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index b44aca536691..af6610a35d73 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="nfconntrack">Use netfilter_conntrack</flag>
 <flag name="nfqueue">Use NFQUEUE instead of QUEUE</flag>
diff --git a/net-firewall/pftop/metadata.xml b/net-firewall/pftop/metadata.xml
index 49ee990318f8..bd3c6911f5f4 100644
--- a/net-firewall/pftop/metadata.xml
+++ b/net-firewall/pftop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>bsd</herd>
+	<maintainer>
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
 	<use>
 		<flag name="altq">Enable altq(4) support — alternate queuing of network packets.</flag>
 	</use>
diff --git a/net-firewall/psad/metadata.xml b/net-firewall/psad/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-firewall/psad/metadata.xml
+++ b/net-firewall/psad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index b05083f3a6ea..dce27eea7fd4 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>whissi@whissi.de</email>
     <name>Thomas D. (Whissi)</name>
   </maintainer>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
     <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml
index 9de1f77c1793..129b46d3c841 100644
--- a/net-firewall/ufw-frontends/metadata.xml
+++ b/net-firewall/ufw-frontends/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>slawomir.nizio@sabayon.org</email>
 		<name>Sławomir Nizio</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Currently, UFW provides only a command-line interface (CLI) for user
 	interaction--the ufw command. This project implements graphical frontends
 	for UFW using PyGTK and PyQt (the latter in early stage of development).</longdescription>
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index afc7f7197388..985a52e13371 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>slawomir.nizio@sabayon.org</email>
 		<name>Sławomir Nizio</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	The Uncomplicated Firewall (ufw) is a frontend for iptables and is
 	particularly well-suited for host-based firewalls. It provides a framework
diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml
index 66ec30dcd145..f1f22e9e1aea 100644
--- a/net-firewall/xtables-addons/metadata.xml
+++ b/net-firewall/xtables-addons/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -11,6 +10,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains
 extensions that were not, or are not yet, accepted in the main kernel/iptables
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index c212ce4e2fe6..2a7f710fb3eb 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-fs</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index a31a339fc794..e4e47cc32e2a 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
 	<maintainer>
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
diff --git a/net-fs/curlftpfs/metadata.xml b/net-fs/curlftpfs/metadata.xml
index d4820325dccf..5c97eb176d87 100644
--- a/net-fs/curlftpfs/metadata.xml
+++ b/net-fs/curlftpfs/metadata.xml
@@ -5,7 +5,6 @@
     <email>slyfox@gentoo.org</email>
     <name>Sergei Trofimovich</name>
   </maintainer>
-  <herd>net-fs</herd>
   <upstream>
     <remote-id type="sourceforge">curlftpfs</remote-id>
   </upstream>
diff --git a/net-fs/davfs2/metadata.xml b/net-fs/davfs2/metadata.xml
index 962495542556..7dff430d9e74 100644
--- a/net-fs/davfs2/metadata.xml
+++ b/net-fs/davfs2/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-fs</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gokturk@binghamton.edu</email>
 		<name>Gokturk 'gokturk' Yuksek</name>
 		<description>Maintainer. Assign bugs on him</description>
 	</maintainer>	
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml
index 355d2a63d717..0852a8e84e32 100644
--- a/net-fs/libnfs/metadata.xml
+++ b/net-fs/libnfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sahlberg/libnfs</remote-id>
 	</upstream>
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index 402c843654a1..ad118d5dbc55 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-fs</herd>
   <use>
     <flag name="pgp">
 			Add support pgp authentication module
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 1edec5a78d94..8e8d92002b39 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>NFS client and server daemons</longdescription>
   <use>
     <flag name="libmount">Link mount.nfs with libmount</flag>
diff --git a/net-fs/nfs4-acl-tools/metadata.xml b/net-fs/nfs4-acl-tools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-fs/nfs4-acl-tools/metadata.xml
+++ b/net-fs/nfs4-acl-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-fs/nfstest/metadata.xml b/net-fs/nfstest/metadata.xml
index 1197f94b2450..e29d3e7703ae 100644
--- a/net-fs/nfstest/metadata.xml
+++ b/net-fs/nfstest/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-fs</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml
index 57e1cce72b17..4f8c230c79f7 100644
--- a/net-fs/openafs-kernel/metadata.xml
+++ b/net-fs/openafs-kernel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
 <maintainer>
 	<email>NP-Hardass@gentoo.org</email>
 	<description>please assign bugs to</description>
diff --git a/net-fs/openafs-legacy/metadata.xml b/net-fs/openafs-legacy/metadata.xml
index dfc945c61126..097975e3adc2 100644
--- a/net-fs/openafs-legacy/metadata.xml
+++ b/net-fs/openafs-legacy/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-fs</herd>
 </pkgmetadata>
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 12670c7a96cc..a1c083b48078 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
 <maintainer>
 	<email>NP-Hardass@gentoo.org</email>
 	<description>please assign bugs to</description>
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 9c4471915d80..5bf8ef3d324a 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
 	<maintainer>
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index e66bb8abaa12..97ad1c6d52cf 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.
 
diff --git a/net-fs/smbtad/metadata.xml b/net-fs/smbtad/metadata.xml
index f3b584e4d0b0..76035c6b4f39 100644
--- a/net-fs/smbtad/metadata.xml
+++ b/net-fs/smbtad/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>samba@gentoo.org</email>
     <name>Samba Team</name>
diff --git a/net-fs/smbtatools/metadata.xml b/net-fs/smbtatools/metadata.xml
index d3af04c2780b..7d8d3aff114b 100644
--- a/net-fs/smbtatools/metadata.xml
+++ b/net-fs/smbtatools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>samba@gentoo.org</email>
     <name>Samba Team</name>
diff --git a/net-ftp/bareftp/metadata.xml b/net-ftp/bareftp/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/net-ftp/bareftp/metadata.xml
+++ b/net-ftp/bareftp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/cmdftp/metadata.xml b/net-ftp/cmdftp/metadata.xml
index 6710eddd2582..f6e9bcab3c3e 100644
--- a/net-ftp/cmdftp/metadata.xml
+++ b/net-ftp/cmdftp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-ftp</herd>
 <longdescription lang="en">
   Light weight, yet robust command line FTP client with shell-like
   functions.
diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml
index 86db3c1f8f04..6cef8fb41be5 100644
--- a/net-ftp/filezilla/metadata.xml
+++ b/net-ftp/filezilla/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-ftp</herd>
   <maintainer>
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 349948f1c316..a65447d9f366 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>proxy-maintainers</herd>
     <maintainer>
         <email>bertrand@jacquin.bzh</email>
         <name>Bertrand Jacquin</name>
         <description>Proxied maintainer.</description>
     </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="transparent">Enable transparent proxying of data connections</flag>
     </use>
diff --git a/net-ftp/ftp/metadata.xml b/net-ftp/ftp/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-ftp/ftp/metadata.xml
+++ b/net-ftp/ftp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/gftp/metadata.xml b/net-ftp/gftp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-ftp/gftp/metadata.xml
+++ b/net-ftp/gftp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/linksys-tftp/metadata.xml b/net-ftp/linksys-tftp/metadata.xml
index 4ef473d6087e..13a12dff115a 100644
--- a/net-ftp/linksys-tftp/metadata.xml
+++ b/net-ftp/linksys-tftp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>embedded</herd>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <longdescription>An extended version of BSD tftp with passwords</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/netkit-ftpd/metadata.xml b/net-ftp/netkit-ftpd/metadata.xml
index 0384a4ab03a7..c9e13ee6a3c9 100644
--- a/net-ftp/netkit-ftpd/metadata.xml
+++ b/net-ftp/netkit-ftpd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd> 
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/oneclickftp/metadata.xml b/net-ftp/oneclickftp/metadata.xml
index 4b2e4c0373d9..759978409bbb 100644
--- a/net-ftp/oneclickftp/metadata.xml
+++ b/net-ftp/oneclickftp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">oneclickftp</remote-id>
   </upstream>
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 969249534920..2d395284c7fe 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -15,8 +15,10 @@
 		<name>Sergei Trofimovich</name>
 		<description>Mostly user.</description>
 	</maintainer>
-	<herd>net-ftp</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 6a6ebebb7ad1..08029f27e60d 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-ftp</herd>
 <maintainer>
 	<email>polynomial-c@gentoo.org</email>
 	<name>Lars Wendler</name>
diff --git a/net-ftp/pybootd/metadata.xml b/net-ftp/pybootd/metadata.xml
index e256526db2cd..15420dadcb8d 100644
--- a/net-ftp/pybootd/metadata.xml
+++ b/net-ftp/pybootd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pybootd</remote-id>
 		<remote-id type="github">eblot/pybootd</remote-id>
diff --git a/net-ftp/qshare/metadata.xml b/net-ftp/qshare/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/net-ftp/qshare/metadata.xml
+++ b/net-ftp/qshare/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/scythia/metadata.xml b/net-ftp/scythia/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/net-ftp/scythia/metadata.xml
+++ b/net-ftp/scythia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-ftp/tftp-hpa/metadata.xml b/net-ftp/tftp-hpa/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-ftp/tftp-hpa/metadata.xml
+++ b/net-ftp/tftp-hpa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/tlswrap/metadata.xml b/net-ftp/tlswrap/metadata.xml
index 7a92e30a3922..ffff2d3014a6 100644
--- a/net-ftp/tlswrap/metadata.xml
+++ b/net-ftp/tlswrap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-ftp</herd>
 	<longdescription lang="en">
 		TLSWRAP is a TLS/SSL FTP wrapper/proxy which allows to use TLS with
 		every FTP client
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 53e430c2243d..d9f2079175c6 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-ftp</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
@@ -16,6 +14,10 @@
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Very Secure FTP Daemon written with speed, size and security
 		in mind
diff --git a/net-ftp/yafc/metadata.xml b/net-ftp/yafc/metadata.xml
index 7bd2aa1c49f0..b93472d83d0b 100644
--- a/net-ftp/yafc/metadata.xml
+++ b/net-ftp/yafc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>page@cubata.homelinux.net</email>
 		<name>Carles Pagès</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ssh">Build with SFTP support</flag>
 	</use>
diff --git a/net-im/ayttm/metadata.xml b/net-im/ayttm/metadata.xml
index 06a0a876dacd..0b0ad744b92d 100644
--- a/net-im/ayttm/metadata.xml
+++ b/net-im/ayttm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription lang="en">
 		Ayttm is a multi-protocol instant messaging client with some novel features
 		such as the ability to connect to livejournal.com and the ability to send
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index 4ccecd71210f..7ae140f88e4e 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
index c5c9e3a791c3..a31ca5c08c2f 100644
--- a/net-im/climm/metadata.xml
+++ b/net-im/climm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 <use>
 	<flag name="otr">Enable encrypted conversations</flag>
 </use>
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
index 14d619e0d0f4..b38ab95f642b 100644
--- a/net-im/corebird/metadata.xml
+++ b/net-im/corebird/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>thatslyude@gmail.com</email>
 		<name>Chandler Paul</name>
@@ -13,6 +11,10 @@
 		<name>Mark R. Pariente</name>
 		<description>Maintainer, Assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="glade">Install glade catalogs for corebird</flag>
 	</use>
diff --git a/net-im/cpop/metadata.xml b/net-im/cpop/metadata.xml
index 3e2b4181f5be..097975e3adc2 100644
--- a/net-im/cpop/metadata.xml
+++ b/net-im/cpop/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 </pkgmetadata>
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 3385d266e58d..942a3f912ea4 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 0968098fd22f..a790c53baed4 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="geoloc">Enable geolocation support through
 			<pkg>app-misc/geoclue</pkg></flag>
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 657c12dda759..9b8efcc7cc34 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <maintainer>
     <email>aidecoe@gentoo.org</email>
   </maintainer>
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
index e30841e388bf..d27955a45a07 100644
--- a/net-im/gg-transport/metadata.xml
+++ b/net-im/gg-transport/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <longdescription>
     Gadu-Gadu is a IM network vary famous in Poland, this package will
     enable your jabber server to talk to that network.
diff --git a/net-im/indicator-messages/metadata.xml b/net-im/indicator-messages/metadata.xml
index 86195656b0c5..4fa3e1e97bda 100644
--- a/net-im/indicator-messages/metadata.xml
+++ b/net-im/indicator-messages/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 3c4008ea7825..c217899aa696 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 <maintainer>
   <email>chainsaw@gentoo.org</email>
 </maintainer>
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
index ec73f0b66476..7720eaf315bf 100644
--- a/net-im/jabberd2/metadata.xml
+++ b/net-im/jabberd2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<use>
 		<flag name="experimental">Enable experimental features such
 			as TLS Everywhere.</flag>
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
index d54eca9f9ee3..f2226a08d88d 100644
--- a/net-im/kadu/metadata.xml
+++ b/net-im/kadu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
diff --git a/net-im/kde-telepathy-meta/metadata.xml b/net-im/kde-telepathy-meta/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/kde-telepathy-meta/metadata.xml
+++ b/net-im/kde-telepathy-meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
index 01c7bbf2f461..8c511ae02e81 100644
--- a/net-im/kouchat/metadata.xml
+++ b/net-im/kouchat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">kouchat</remote-id>
 	</upstream>
diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
index c5ae96e2c633..d713f1228a64 100644
--- a/net-im/ktp-accounts-kcm/metadata.xml
+++ b/net-im/ktp-accounts-kcm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 	</use>
diff --git a/net-im/ktp-approver/metadata.xml b/net-im/ktp-approver/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-approver/metadata.xml
+++ b/net-im/ktp-approver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-auth-handler/metadata.xml b/net-im/ktp-auth-handler/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-auth-handler/metadata.xml
+++ b/net-im/ktp-auth-handler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-call-ui/metadata.xml b/net-im/ktp-call-ui/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-im/ktp-call-ui/metadata.xml
+++ b/net-im/ktp-call-ui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-common-internals/metadata.xml b/net-im/ktp-common-internals/metadata.xml
index 0defe784bf07..4e969fb63de7 100644
--- a/net-im/ktp-common-internals/metadata.xml
+++ b/net-im/ktp-common-internals/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
 	</use>
diff --git a/net-im/ktp-contact-list/metadata.xml b/net-im/ktp-contact-list/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-contact-list/metadata.xml
+++ b/net-im/ktp-contact-list/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-contact-runner/metadata.xml b/net-im/ktp-contact-runner/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-contact-runner/metadata.xml
+++ b/net-im/ktp-contact-runner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-desktop-applets/metadata.xml b/net-im/ktp-desktop-applets/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-desktop-applets/metadata.xml
+++ b/net-im/ktp-desktop-applets/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-filetransfer-handler/metadata.xml b/net-im/ktp-filetransfer-handler/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-filetransfer-handler/metadata.xml
+++ b/net-im/ktp-filetransfer-handler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-kded-module/metadata.xml b/net-im/ktp-kded-module/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-kded-module/metadata.xml
+++ b/net-im/ktp-kded-module/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-send-file/metadata.xml b/net-im/ktp-send-file/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-im/ktp-send-file/metadata.xml
+++ b/net-im/ktp-send-file/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/ktp-text-ui/metadata.xml b/net-im/ktp-text-ui/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-im/ktp-text-ui/metadata.xml
+++ b/net-im/ktp-text-ui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml
index ab808db3af16..bae7d06ed9d4 100644
--- a/net-im/licq/metadata.xml
+++ b/net-im/licq/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index ce8c1aca6ffc..b0c5c3fc4d98 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
index 2b8a7eb73128..72b6f83d6003 100644
--- a/net-im/mu-conference/metadata.xml
+++ b/net-im/mu-conference/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <longdescription>Multi User Conference for Jabber</longdescription>
 </pkgmetadata>
diff --git a/net-im/openfire/metadata.xml b/net-im/openfire/metadata.xml
index 7776b9877bd3..794b2e52a6e7 100644
--- a/net-im/openfire/metadata.xml
+++ b/net-im/openfire/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 7a986a0958f0..b0f4d31ea1ae 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index a21f6d01e5a3..be0ed83fae22 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>Psi is a very good jabber client that uses QT</longdescription>
   <use>
     <flag name="enchant">Use enchant spell engine instead of aspell</flag>
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index 55991f084ee7..c42ba2909312 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>nikoli@gmx.us</email>
   <name>Nikoli</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="demo">build simple test application for the PsiMedia system</flag>
 </use>
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
index 28d9e8bf392f..2a8bc6a3d6f0 100644
--- a/net-im/pyaim-t/metadata.xml
+++ b/net-im/pyaim-t/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>volkris@gmail.com</email>
 		<name>Chris Carlin</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Python based jabber transport for AIM</longdescription>
 	<use>
 		<flag name="webinterface">Install dependencies needed for the web
diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml
index 2ff2b66a1c29..3284adcd2d1e 100644
--- a/net-im/pyicq-t/metadata.xml
+++ b/net-im/pyicq-t/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription>Python based jabber transport for ICQ</longdescription>
 	<use>
 		<flag name="webinterface">Install dependencies needed for the web
diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/net-im/qtwitter/metadata.xml
+++ b/net-im/qtwitter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 8862591a628c..a4890858396e 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>fatzer2@gmail.com</email>
 	<name>Alexander Golubev</name>
 	<description>Proxied maintainer. Assign bugs on him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<maintainer>
 		<email>euroelessar@yandex.ru</email>
diff --git a/net-im/qwit/metadata.xml b/net-im/qwit/metadata.xml
index e848af84bf66..a96972b82e01 100644
--- a/net-im/qwit/metadata.xml
+++ b/net-im/qwit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/net-im/reaim/metadata.xml b/net-im/reaim/metadata.xml
index 0a0826c95a75..019e4be85142 100644
--- a/net-im/reaim/metadata.xml
+++ b/net-im/reaim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="sourceforge">reaim</remote-id>
 	</upstream>
diff --git a/net-im/sendxmpp/metadata.xml b/net-im/sendxmpp/metadata.xml
index b0475f13df49..40a822ede847 100644
--- a/net-im/sendxmpp/metadata.xml
+++ b/net-im/sendxmpp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="github">lhost/sendxmpp</remote-id>
 	</upstream>
diff --git a/net-im/silc-server/metadata.xml b/net-im/silc-server/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-im/silc-server/metadata.xml
+++ b/net-im/silc-server/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-im/silc-toolkit/metadata.xml b/net-im/silc-toolkit/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-im/silc-toolkit/metadata.xml
+++ b/net-im/silc-toolkit/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-im/simpserver-bin/metadata.xml b/net-im/simpserver-bin/metadata.xml
index 2db006f2a47b..4e924e4cd1bc 100644
--- a/net-im/simpserver-bin/metadata.xml
+++ b/net-im/simpserver-bin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 <longdescription>
 SimpServer is the first lightweight instant messaging security gateway for Unix systems. Install SimpServer on a
 Unix system and configure IM clients on your local network, and conversations with Simp-equipped parties will be
diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
index ce896eba1cd1..3ef0484a2744 100644
--- a/net-im/telepathy-connection-managers/metadata.xml
+++ b/net-im/telepathy-connection-managers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
   <flag name="gadu">Enable Gadu Gadu protocol support.</flag>
   <flag name="irc">Enable Internet Relay Chat (IRC) support.</flag>
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-im/telepathy-logger/metadata.xml
+++ b/net-im/telepathy-logger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
index 5265d716d02c..7db1ad48cc10 100644
--- a/net-im/telepathy-mission-control/metadata.xml
+++ b/net-im/telepathy-mission-control/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>net-im</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>Mission Control, or MC, is a telepathy component providing a
 way for "end-user" applications to abstract some of the details of connection
 managers, to provide a simple way to manipulate a bunch of connection managers
diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
index c5f8c720a125..45aa09c00920 100644
--- a/net-im/tkabber/metadata.xml
+++ b/net-im/tkabber/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 <longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
 <use>
 	<flag name="plugins">Enables installation the extra plugins</flag>
diff --git a/net-im/turses/metadata.xml b/net-im/turses/metadata.xml
index b97b0d9a7e14..39694d0c08f7 100644
--- a/net-im/turses/metadata.xml
+++ b/net-im/turses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 4d1898eb4169..04ee9fd65154 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="adiummessagestyle">Use UI styles created for Adium</flag>
     <flag name="annotations">Enable adding comments to the contacts in the roster</flag>
diff --git a/net-im/ysm/metadata.xml b/net-im/ysm/metadata.xml
index 0afcecc3c60b..58e3d15e0970 100644
--- a/net-im/ysm/metadata.xml
+++ b/net-im/ysm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="sourceforge">ysmv7</remote-id>
 	</upstream>
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index e180509b7d60..24dce491de51 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<maintainer>
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/asuka/metadata.xml b/net-irc/asuka/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/asuka/metadata.xml
+++ b/net-irc/asuka/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml
index eefa09b17666..4eae51178a73 100644
--- a/net-irc/atheme-services/metadata.xml
+++ b/net-irc/atheme-services/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
diff --git a/net-irc/bnc/metadata.xml b/net-irc/bnc/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/bnc/metadata.xml
+++ b/net-irc/bnc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/bobotpp/metadata.xml b/net-irc/bobotpp/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/bobotpp/metadata.xml
+++ b/net-irc/bobotpp/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/cgiirc/metadata.xml b/net-irc/cgiirc/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/net-irc/cgiirc/metadata.xml
+++ b/net-irc/cgiirc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/charybdis/metadata.xml b/net-irc/charybdis/metadata.xml
index 4740cb09d293..cdf9343797d2 100644
--- a/net-irc/charybdis/metadata.xml
+++ b/net-irc/charybdis/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
diff --git a/net-irc/dccserver/metadata.xml b/net-irc/dccserver/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/dccserver/metadata.xml
+++ b/net-irc/dccserver/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/dircproxy/metadata.xml b/net-irc/dircproxy/metadata.xml
index 69b57b0d2b45..5bc45a698af7 100644
--- a/net-irc/dircproxy/metadata.xml
+++ b/net-irc/dircproxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="google-code">dircproxy</remote-id>
 	</upstream>
diff --git a/net-irc/eggdrop/metadata.xml b/net-irc/eggdrop/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/eggdrop/metadata.xml
+++ b/net-irc/eggdrop/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/emech/metadata.xml
+++ b/net-irc/emech/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/epic4/metadata.xml b/net-irc/epic4/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/epic4/metadata.xml
+++ b/net-irc/epic4/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/epic5/metadata.xml b/net-irc/epic5/metadata.xml
index 5e6a8dbf6cd0..b83ace5c61e0 100644
--- a/net-irc/epic5/metadata.xml
+++ b/net-irc/epic5/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <use>
     <flag name="archive">Use <pkg>app-arch/libarchive</pkg> to use zip and tar archives from scripts.</flag>
     <flag name="valgrind">Compile against <pkg>dev-util/valgrind</pkg> headers to improve memory-leak checking when running epic5 under valgrind.</flag>
diff --git a/net-irc/ii/metadata.xml b/net-irc/ii/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ii/metadata.xml
+++ b/net-irc/ii/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/iip/metadata.xml b/net-irc/iip/metadata.xml
index 7e25b929ec9c..ea1faeee064a 100644
--- a/net-irc/iip/metadata.xml
+++ b/net-irc/iip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="sourceforge">invisibleip</remote-id>
 	</upstream>
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 29578589c511..04e4959bfabc 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>awilfox.gentoo@foxkit.us</email>
 		<name>Andrew Wilcox</name>
 		<description>Proxy (user) maintainer, bugs to be assigned to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
 		for Linux, BSD, Windows and Mac OS X systems which was created from
diff --git a/net-irc/irc-client/metadata.xml b/net-irc/irc-client/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/irc-client/metadata.xml
+++ b/net-irc/irc-client/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/irc-server/metadata.xml b/net-irc/irc-server/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/irc-server/metadata.xml
+++ b/net-irc/irc-server/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ircii/metadata.xml
+++ b/net-irc/ircii/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/ircmap/metadata.xml b/net-irc/ircmap/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ircmap/metadata.xml
+++ b/net-irc/ircmap/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
index 715b3c1f8069..8636ca0aaac5 100644
--- a/net-irc/ircservices/metadata.xml
+++ b/net-irc/ircservices/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<maintainer>
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/ircstats/metadata.xml b/net-irc/ircstats/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ircstats/metadata.xml
+++ b/net-irc/ircstats/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml
index 52dfe678b740..33e884324848 100644
--- a/net-irc/irssi-otr/metadata.xml
+++ b/net-irc/irssi-otr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="github">cryptodotis/irssi-otr</remote-id>
 	</upstream>
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index e014acd79a6b..ba972c8ce61a 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 <maintainer>
 	<email>monsieurp@gentoo.org</email>
 	<name>Patrice Clement</name>
diff --git a/net-irc/irssistats/metadata.xml b/net-irc/irssistats/metadata.xml
index 2993f5a3bd78..5d1c08fe1ca8 100644
--- a/net-irc/irssistats/metadata.xml
+++ b/net-irc/irssistats/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 <maintainer>
 	<email>monsieurp@gentoo.org</email>
 	<name>Patrice Clement</name>
diff --git a/net-irc/jircii/metadata.xml b/net-irc/jircii/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/jircii/metadata.xml
+++ b/net-irc/jircii/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/konversation/metadata.xml b/net-irc/konversation/metadata.xml
index 96dedda219e8..f38d43267b1e 100644
--- a/net-irc/konversation/metadata.xml
+++ b/net-irc/konversation/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 8c436c20b9b1..26f6db57b42b 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,7 +5,10 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="dcc_voice">Support voice connections over DCC protocol</flag>
diff --git a/net-irc/loqui/metadata.xml b/net-irc/loqui/metadata.xml
index e3b6a0abed4d..4a78c9f36f00 100644
--- a/net-irc/loqui/metadata.xml
+++ b/net-irc/loqui/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="launchpad">loqui</remote-id>
 	</upstream>
diff --git a/net-irc/miau/metadata.xml b/net-irc/miau/metadata.xml
index 15b5f1e060e5..5cf7911309ae 100644
--- a/net-irc/miau/metadata.xml
+++ b/net-irc/miau/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="sourceforge">miau</remote-id>
 	</upstream>
diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml
index f0844b37b1d9..853d464e8d43 100644
--- a/net-irc/muh/metadata.xml
+++ b/net-irc/muh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <longdescription>
     Persistent IRC bouncer.
 </longdescription>
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
index 9af2cb65c5fa..525ebe5d9aec 100644
--- a/net-irc/nebula/metadata.xml
+++ b/net-irc/nebula/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<longdescription>
 Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
 The goals are
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index 9f4b1679abee..bd1a2e70ab88 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+<maintainer>
 		<email>gentoo@blackphoenix.de</email>
 		<name>Moritz Kick</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
 	</use>
diff --git a/net-irc/ninja/metadata.xml b/net-irc/ninja/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ninja/metadata.xml
+++ b/net-irc/ninja/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/onis/metadata.xml b/net-irc/onis/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/onis/metadata.xml
+++ b/net-irc/onis/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/pisg/metadata.xml b/net-irc/pisg/metadata.xml
index a41ad8725cbf..95c74acfc8b4 100644
--- a/net-irc/pisg/metadata.xml
+++ b/net-irc/pisg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="sourceforge">pisg</remote-id>
 	</upstream>
diff --git a/net-irc/polari/metadata.xml b/net-irc/polari/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-irc/polari/metadata.xml
+++ b/net-irc/polari/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index 5a33ac00109d..1a67e638bb6f 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<maintainer>
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/ptlink-ircd/metadata.xml b/net-irc/ptlink-ircd/metadata.xml
index c519652bdf0d..097975e3adc2 100644
--- a/net-irc/ptlink-ircd/metadata.xml
+++ b/net-irc/ptlink-ircd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/ptlink-opm/metadata.xml b/net-irc/ptlink-opm/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/ptlink-opm/metadata.xml
+++ b/net-irc/ptlink-opm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 6155014a8b29..d85723e7540b 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 	</maintainer>
@@ -14,6 +12,10 @@
 		<email>sputnick@quassel-irc.org</email>
 		<description>Upstream author, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="monolithic">
 			Build Standalone client with integrated core, no external
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index 5ea626901d56..4e71c2d5a326 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 <maintainer>
   <email>a3li@gentoo.org</email>
   <name>Alex Legler</name>
diff --git a/net-irc/redirbot/metadata.xml b/net-irc/redirbot/metadata.xml
index 96e82ef3a392..b656d3d33900 100644
--- a/net-irc/redirbot/metadata.xml
+++ b/net-irc/redirbot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/net-irc/rhapsody/metadata.xml b/net-irc/rhapsody/metadata.xml
index 832ac05e1ab0..c7aef6781699 100644
--- a/net-irc/rhapsody/metadata.xml
+++ b/net-irc/rhapsody/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<upstream>
 		<remote-id type="sourceforge">rhapsody</remote-id>
 	</upstream>
diff --git a/net-irc/savirc/metadata.xml b/net-irc/savirc/metadata.xml
index c519652bdf0d..097975e3adc2 100644
--- a/net-irc/savirc/metadata.xml
+++ b/net-irc/savirc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/scrollz/metadata.xml b/net-irc/scrollz/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/scrollz/metadata.xml
+++ b/net-irc/scrollz/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
index 764b9b8e6bb5..73cc90933f36 100644
--- a/net-irc/shadowircd/metadata.xml
+++ b/net-irc/shadowircd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <maintainer>
     <email>jdhore@gentoo.org</email>
     <name>Jeff Horelick</name>
diff --git a/net-irc/sic/metadata.xml b/net-irc/sic/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-irc/sic/metadata.xml
+++ b/net-irc/sic/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/smuxi/metadata.xml b/net-irc/smuxi/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/net-irc/smuxi/metadata.xml
+++ b/net-irc/smuxi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/srvx/metadata.xml b/net-irc/srvx/metadata.xml
index be2f91568548..a26863d4229f 100644
--- a/net-irc/srvx/metadata.xml
+++ b/net-irc/srvx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<use>
 		<flag name="bahamut">Choose bahamut protocol over p10 protocol</flag>
 	</use>
diff --git a/net-irc/telepathy-idle/metadata.xml b/net-irc/telepathy-idle/metadata.xml
index 8185e919f205..dc4f7afb790d 100644
--- a/net-irc/telepathy-idle/metadata.xml
+++ b/net-irc/telepathy-idle/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>net-im</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>Telepathy connection manager featuring IRC protocol.</longdescription>
 </pkgmetadata>
diff --git a/net-irc/ultimate/metadata.xml b/net-irc/ultimate/metadata.xml
index 580b3be35c17..9f57b917c34b 100644
--- a/net-irc/ultimate/metadata.xml
+++ b/net-irc/ultimate/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 255310e51a58..27d55d87d7b0 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<maintainer>
 		<email>binki@gentoo.org</email>
 		<name>Nathan Phillip Brink</name>
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 8fc4a83c3ea0..b2cb7b63d1a5 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-irc</herd>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 	</maintainer>
diff --git a/net-irc/xaric/metadata.xml b/net-irc/xaric/metadata.xml
index c519652bdf0d..097975e3adc2 100644
--- a/net-irc/xaric/metadata.xml
+++ b/net-irc/xaric/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index b37157dfe4de..bb18a488b927 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 <maintainer>
 	<email>wired@gentoo.org</email>
 	<name>Alex Alexander</name>
diff --git a/net-libs/accounts-qt/metadata.xml b/net-libs/accounts-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/accounts-qt/metadata.xml
+++ b/net-libs/accounts-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
index d68839c92774..15e59c978b04 100644
--- a/net-libs/biblesync/metadata.xml
+++ b/net-libs/biblesync/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>theology</herd>
 	<maintainer>
 		<email>theology@gentoo.org</email>
 	</maintainer>
diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
index 2156c37a7874..4f8dc96277cb 100644
--- a/net-libs/c-client/metadata.xml
+++ b/net-libs/c-client/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
+    <maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+    </maintainer>
 	<use>
 		<flag name="doc">Install RFCs related to IMAP</flag>
 		<flag name="topal">Enable support for <pkg>net-mail/topal</pkg>
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index 8f8d517f9cf1..bd5cf2eb0abc 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="vpopmail">Enable vpopmail support</flag>
   </use>
diff --git a/net-libs/courier-unicode/metadata.xml b/net-libs/courier-unicode/metadata.xml
index eed2873227af..7c450e2f31e6 100644
--- a/net-libs/courier-unicode/metadata.xml
+++ b/net-libs/courier-unicode/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">courier</remote-id>
 	</upstream>
diff --git a/net-libs/cppzmq/metadata.xml b/net-libs/cppzmq/metadata.xml
index f92d8e349d87..b547a06ccf7c 100644
--- a/net-libs/cppzmq/metadata.xml
+++ b/net-libs/cppzmq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">zeromq/cppzmq</remote-id>
   </upstream>
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index 9ddd5332d8f8..e1c45cabc02a 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>jason.r.wallace@gmail.com</email>
   <name>Jason Wallace</name>
@@ -10,7 +9,14 @@
   <email>patrick@gentoo.org</email>
   <name>Patrick Lauer</name>
 </maintainer>
-<herd>netmon</herd>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
 <use>
 	<flag name="afpacket">
diff --git a/net-libs/dleyna-connector-dbus/metadata.xml b/net-libs/dleyna-connector-dbus/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-libs/dleyna-connector-dbus/metadata.xml
+++ b/net-libs/dleyna-connector-dbus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/dleyna-core/metadata.xml b/net-libs/dleyna-core/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-libs/dleyna-core/metadata.xml
+++ b/net-libs/dleyna-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/dleyna-renderer/metadata.xml b/net-libs/dleyna-renderer/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-libs/dleyna-renderer/metadata.xml
+++ b/net-libs/dleyna-renderer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/farstream/metadata.xml
+++ b/net-libs/farstream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/ftplib/metadata.xml b/net-libs/ftplib/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/net-libs/ftplib/metadata.xml
+++ b/net-libs/ftplib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
index 4a1545e7ec5d..b54fb2007e2f 100644
--- a/net-libs/glib-networking/metadata.xml
+++ b/net-libs/glib-networking/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting
 		the HTTP/HTTPS/SOCKS proxy configuration</flag>
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 3e2b4181f5be..097975e3adc2 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 </pkgmetadata>
diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/gnet/metadata.xml
+++ b/net-libs/gnet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index a27834f8df74..19b90fd35da1 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
 		to set GNOME online accounts preferences</flag>
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 15dc63c698a7..8fa879196468 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <use>
     <flag name="crywrap" restrict="&gt;=net-libs/gnutls-3.2.10">
       Build the crywrap TLS proxy service
diff --git a/net-libs/gsnmp/metadata.xml b/net-libs/gsnmp/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/gsnmp/metadata.xml
+++ b/net-libs/gsnmp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/gsoap/metadata.xml b/net-libs/gsoap/metadata.xml
index 1611f0c734c3..6de530965897 100644
--- a/net-libs/gsoap/metadata.xml
+++ b/net-libs/gsoap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>swapon@gmail.com</email>
     <name>Alessio Cassibba</name>
@@ -14,6 +13,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">gsoap2</remote-id>
   </upstream>
diff --git a/net-libs/gssdp/metadata.xml b/net-libs/gssdp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/gssdp/metadata.xml
+++ b/net-libs/gssdp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
index 3a15c3288b0d..1a07f8509c12 100644
--- a/net-libs/gtk-vnc/metadata.xml
+++ b/net-libs/gtk-vnc/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>virtualization</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
   </use>
diff --git a/net-libs/gupnp-av/metadata.xml b/net-libs/gupnp-av/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/gupnp-av/metadata.xml
+++ b/net-libs/gupnp-av/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/gupnp-igd/metadata.xml b/net-libs/gupnp-igd/metadata.xml
index 45183de7300e..fe3dc94b2bcd 100644
--- a/net-libs/gupnp-igd/metadata.xml
+++ b/net-libs/gupnp-igd/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>net-p2p</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/gupnp-ui/metadata.xml b/net-libs/gupnp-ui/metadata.xml
index 7289824cb876..097975e3adc2 100644
--- a/net-libs/gupnp-ui/metadata.xml
+++ b/net-libs/gupnp-ui/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-libs/gupnp/metadata.xml b/net-libs/gupnp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/gupnp/metadata.xml
+++ b/net-libs/gupnp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 28beb72899b5..75a9438745cc 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">joyent/http-parser</remote-id>
 	</upstream>
diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml
index 35d280f52551..6c4bcc6b4e88 100644
--- a/net-libs/iojs/metadata.xml
+++ b/net-libs/iojs/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-        <maintainer>
+	<maintainer>
                 <email>bugs@bergstroem.nu</email>
                 <name>Johan Bergström</name>
         </maintainer>
@@ -10,6 +9,10 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>bugs@bergstroem.nu</email>
diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
index 1f5e912b0a8f..146fb502cc76 100644
--- a/net-libs/jreen/metadata.xml
+++ b/net-libs/jreen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">euroelessar/jreen</remote-id>
 	</upstream>
diff --git a/net-libs/liba53/metadata.xml b/net-libs/liba53/metadata.xml
index 811555c03253..a573211e418a 100644
--- a/net-libs/liba53/metadata.xml
+++ b/net-libs/liba53/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">RangeNetworks/liba53</remote-id>
 	</upstream>
diff --git a/net-libs/libaccounts-glib/metadata.xml b/net-libs/libaccounts-glib/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libaccounts-glib/metadata.xml
+++ b/net-libs/libaccounts-glib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 9afdd38d755c..e504c7efac8f 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke_gentoo_bitcoin@dashjr.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
 		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
diff --git a/net-libs/libblkmaker/metadata.xml b/net-libs/libblkmaker/metadata.xml
index 10b989126152..7bf470cf016e 100644
--- a/net-libs/libblkmaker/metadata.xml
+++ b/net-libs/libblkmaker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">bitcoin/libblkmaker</remote-id>
 	</upstream>
diff --git a/net-libs/libbluedevil/metadata.xml b/net-libs/libbluedevil/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libbluedevil/metadata.xml
+++ b/net-libs/libbluedevil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libbt/metadata.xml b/net-libs/libbt/metadata.xml
index 9a425c41b63b..12bfc8f3cc57 100644
--- a/net-libs/libbt/metadata.xml
+++ b/net-libs/libbt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">libbt</remote-id>
 	</upstream>
diff --git a/net-libs/libcapi/metadata.xml b/net-libs/libcapi/metadata.xml
index 756ddd4a6227..097975e3adc2 100644
--- a/net-libs/libcapi/metadata.xml
+++ b/net-libs/libcapi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 </pkgmetadata>
diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml
index 6bfb7dbc5f46..12ca0b4cd40f 100644
--- a/net-libs/libcrafter/metadata.xml
+++ b/net-libs/libcrafter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 Libcrafter is a high level library for C++ designed to facilitate the creation
 and decoding of network packets. It is able to craft or decode packets of most
diff --git a/net-libs/libdmapsharing/metadata.xml b/net-libs/libdmapsharing/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/libdmapsharing/metadata.xml
+++ b/net-libs/libdmapsharing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index 90c529dd9ca8..99bbb9e7cd07 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <use>
   <flag name="ntlm">Enable support for NTLM authentication</flag>
 </use>
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index a9c325b5da7d..b9717cf7c6b0 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <longdescription lang="en">
 		libEtPan ! is a mail purpose library. It will be used for low-level mail
 		handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
diff --git a/net-libs/libflowmanager/metadata.xml b/net-libs/libflowmanager/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-libs/libflowmanager/metadata.xml
+++ b/net-libs/libflowmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libgadu/metadata.xml b/net-libs/libgadu/metadata.xml
index 4784a7025da3..e912cc81127a 100644
--- a/net-libs/libgadu/metadata.xml
+++ b/net-libs/libgadu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
diff --git a/net-libs/libgfbgraph/metadata.xml b/net-libs/libgfbgraph/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/libgfbgraph/metadata.xml
+++ b/net-libs/libgfbgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libgmail/metadata.xml b/net-libs/libgmail/metadata.xml
index b5a8781360cf..edca24cba7ee 100644
--- a/net-libs/libgmail/metadata.xml
+++ b/net-libs/libgmail/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">libgmail</remote-id>
 	</upstream>
diff --git a/net-libs/libgrss/metadata.xml b/net-libs/libgrss/metadata.xml
index 09d775b34fbf..d0fee07b900c 100644
--- a/net-libs/libgrss/metadata.xml
+++ b/net-libs/libgrss/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-  <upstream>
+<upstream>
     <bugs-to>https://bugs.gnome.org</bugs-to>
     <changelog>https://git.gnome.org/browse/libgrss</changelog>
   </upstream>
@@ -10,4 +9,8 @@
     <email>lxnay@gentoo.org</email>
     <name>Fabio Erculiani</name>
   </maintainer>
+<maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index a0231acea7e2..d2d81e42c2ca 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+	</maintainer>
 <use>
 	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
 	<flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
diff --git a/net-libs/libgssglue/metadata.xml b/net-libs/libgssglue/metadata.xml
index ca66751dee2f..097975e3adc2 100644
--- a/net-libs/libgssglue/metadata.xml
+++ b/net-libs/libgssglue/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
 </pkgmetadata>
diff --git a/net-libs/libhackrf/metadata.xml b/net-libs/libhackrf/metadata.xml
index f347a49f850f..8c617321d739 100644
--- a/net-libs/libhackrf/metadata.xml
+++ b/net-libs/libhackrf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-libs/libircclient/metadata.xml b/net-libs/libircclient/metadata.xml
index 85eaa183f0ae..8dbee9bba334 100644
--- a/net-libs/libircclient/metadata.xml
+++ b/net-libs/libircclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libircclient</remote-id>
 	</upstream>
diff --git a/net-libs/libkfbapi/metadata.xml b/net-libs/libkfbapi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libkfbapi/metadata.xml
+++ b/net-libs/libkfbapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libkgapi/metadata.xml b/net-libs/libkgapi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libkgapi/metadata.xml
+++ b/net-libs/libkgapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libkolab/metadata.xml b/net-libs/libkolab/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/net-libs/libkolab/metadata.xml
+++ b/net-libs/libkolab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-libs/libkolabxml/metadata.xml b/net-libs/libkolabxml/metadata.xml
index 10fdb56d0071..d066a35e502f 100644
--- a/net-libs/libkolabxml/metadata.xml
+++ b/net-libs/libkolabxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="csharp">Enable C# language bindings</flag>
 </use>
diff --git a/net-libs/libkpeople/metadata.xml b/net-libs/libkpeople/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libkpeople/metadata.xml
+++ b/net-libs/libkpeople/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libktorrent/metadata.xml b/net-libs/libktorrent/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libktorrent/metadata.xml
+++ b/net-libs/libktorrent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libkvkontakte/metadata.xml b/net-libs/libkvkontakte/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libkvkontakte/metadata.xml
+++ b/net-libs/libkvkontakte/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-libs/liblockfile/metadata.xml
+++ b/net-libs/liblockfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libmediawiki/metadata.xml b/net-libs/libmediawiki/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libmediawiki/metadata.xml
+++ b/net-libs/libmediawiki/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml
index 631cfabe0c26..20ec68211996 100644
--- a/net-libs/libmirisdr/metadata.xml
+++ b/net-libs/libmirisdr/metadata.xml
@@ -5,7 +5,10 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<herd>radio</herd>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-libs/libmm-qt/metadata.xml b/net-libs/libmm-qt/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-libs/libmm-qt/metadata.xml
+++ b/net-libs/libmm-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 4fc285912ae1..5af908485baf 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription lang="en">
 	libmnl is a minimalistic user-space library oriented to Netlink developers.
 	There are a lot of common tasks in parsing, validating, constructing of both
diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/libndp/metadata.xml
+++ b/net-libs/libndp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml
index aaad48cdde39..4f888bed2b86 100644
--- a/net-libs/libnet/metadata.xml
+++ b/net-libs/libnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>
 Libnet is a high-level API (toolkit) allowing the application 
 programmer to construct and inject network packets. It provides a 
diff --git a/net-libs/libnetfilter_acct/metadata.xml b/net-libs/libnetfilter_acct/metadata.xml
index 1870437aa8f1..9eec5852aa65 100644
--- a/net-libs/libnetfilter_acct/metadata.xml
+++ b/net-libs/libnetfilter_acct/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription lang="en">
 libnetfilter_acct is the userspace library that provides a programming
 interface (API) to the extended accounting infrastructure. This information can
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-libs/libnetfilter_cthelper/metadata.xml
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_log/metadata.xml b/net-libs/libnetfilter_log/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libnetfilter_log/metadata.xml
+++ b/net-libs/libnetfilter_log/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-libs/libnfsidmap/metadata.xml
+++ b/net-libs/libnfsidmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index 48a9f1169a71..dca5f4074115 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>mrueg@gentoo.org</email>
 	<name>Manuel Rüger</name>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="json">Supports parsing of JSON</flag>
 </use>
diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/libnice/metadata.xml
+++ b/net-libs/libnice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml
index d669db19d880..10d7d2bf0d0f 100644
--- a/net-libs/libnids/metadata.xml
+++ b/net-libs/libnids/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection.</longdescription>
 	<use>
 		<flag name="glib">Use <pkg>dev-libs/glib</pkg> for multiprocessing support</flag>
diff --git a/net-libs/libnm-qt/metadata.xml b/net-libs/libnm-qt/metadata.xml
index c5ae96e2c633..d713f1228a64 100644
--- a/net-libs/libnm-qt/metadata.xml
+++ b/net-libs/libnm-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 	</use>
diff --git a/net-libs/libntlm/metadata.xml b/net-libs/libntlm/metadata.xml
index 3f5765681d73..aa5a37dc4e7d 100644
--- a/net-libs/libntlm/metadata.xml
+++ b/net-libs/libntlm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>
 libntlm is a library that implement Microsoft's NTLM authentication. However,
 the packaging of libntlm lacked certain things, such as having build problems,
diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
index 62e5578cfa83..56e1adf3db4c 100644
--- a/net-libs/liboping/metadata.xml
+++ b/net-libs/liboping/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-libs/libosmo-abis/metadata.xml
+++ b/net-libs/libosmo-abis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libosmo-dsp/metadata.xml b/net-libs/libosmo-dsp/metadata.xml
index 631cfabe0c26..20ec68211996 100644
--- a/net-libs/libosmo-dsp/metadata.xml
+++ b/net-libs/libosmo-dsp/metadata.xml
@@ -5,7 +5,10 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<herd>radio</herd>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml
index 79f195bfce28..fbdd074fc1ba 100644
--- a/net-libs/libosmocore/metadata.xml
+++ b/net-libs/libosmocore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="embedded">Build for embedded use and disable unsupported features</flag>
 		<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index ceb9f2c1fb6d..34685573ef09 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <use>
     <flag name="netlink">
       Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
diff --git a/net-libs/libpcapnav/metadata.xml b/net-libs/libpcapnav/metadata.xml
index 89664012b677..c7d6466eb796 100644
--- a/net-libs/libpcapnav/metadata.xml
+++ b/net-libs/libpcapnav/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">netdude</remote-id>
 	</upstream>
diff --git a/net-libs/libprotoident/metadata.xml b/net-libs/libprotoident/metadata.xml
index 2281ff091ad3..b4ab5bbe502d 100644
--- a/net-libs/libprotoident/metadata.xml
+++ b/net-libs/libprotoident/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Build and install command-line tools</flag>
 	</use>
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index a4957587f728..f2ace5d95547 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/net-libs/libqinfinity/metadata.xml b/net-libs/libqinfinity/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-libs/libqinfinity/metadata.xml
+++ b/net-libs/libqinfinity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
index 60c7f53239ef..c5570c3e872e 100644
--- a/net-libs/librouteros/metadata.xml
+++ b/net-libs/librouteros/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/librpcsecgss/metadata.xml b/net-libs/librpcsecgss/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-libs/librpcsecgss/metadata.xml
+++ b/net-libs/librpcsecgss/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
index cf0ec7685428..1b609e517fc8 100644
--- a/net-libs/librsync/metadata.xml
+++ b/net-libs/librsync/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>axelgenus@gmail.com</email>
 		<name>Alessandro Calorì</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">librsync</remote-id>
 		<remote-id type="github">librsync/librsync</remote-id>
diff --git a/net-libs/libsignon-glib/metadata.xml b/net-libs/libsignon-glib/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/libsignon-glib/metadata.xml
+++ b/net-libs/libsignon-glib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libsmi/metadata.xml b/net-libs/libsmi/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libsmi/metadata.xml
+++ b/net-libs/libsmi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-libs/libsoup-gnome/metadata.xml
+++ b/net-libs/libsoup-gnome/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index f96b3e310f95..ccd847c7928e 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
index 46b43264656a..a90fc7a5bdc9 100644
--- a/net-libs/libsrtp/metadata.xml
+++ b/net-libs/libsrtp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<use>
 		<flag name="aesicm">Use AES ICM cryptographic algorithm</flag>
 		<flag name="console">
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 9ff8b9986874..ba4425c72d6b 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<herd>kde</herd>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<maintainer>
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+</maintainer>
 <use>
   <flag name="gcrypt">Prefer <pkg>dev-libs/libgcrypt</pkg> over
     <pkg>dev-libs/openssl</pkg> for encryption</flag>
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index 1644999aaaaa..770593658441 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <use>
 <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
 </use>
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index 7c7aaf810f75..4c0c5cab74cb 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libtirpc</remote-id>
 	</upstream>
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index 50a5b2c6c3fb..5042e870e682 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <upstream>
     <remote-id type="github">rakshasa/libtorrent</remote-id>
   </upstream>
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-libs/libtrace/metadata.xml
+++ b/net-libs/libtrace/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 89b139d370cc..2d1885cc8bc7 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>maq@maqibooy.com</email>
     <name>Marcus Stjärnås</name>
@@ -10,6 +9,10 @@
     <email>gurligebis@gentoo.org</email>
     <name>Bjarke Istrup Pedersen</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pupnp</remote-id>
   </upstream>
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index c0da6a79ccd7..ce4ad39b7fd9 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 If you don't know VNC, have a look at the original VNC or at Tridia 
 VNC, who also have commercial support for it.
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index a335db2ebc1d..175103e688aa 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 		<description>Proxy-Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		libwebsockets is a C library designed to make development of websockets clients and servers easier (possible).
 	</longdescription>
diff --git a/net-libs/libwhisker/metadata.xml b/net-libs/libwhisker/metadata.xml
index 74dec4574fe6..ac0326721934 100644
--- a/net-libs/libwhisker/metadata.xml
+++ b/net-libs/libwhisker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<longdescription>
 		Libwhisker is a Perl library useful for HTTP testing scripts.  It
 		contains a pure-Perl implementation of functionality found in the LWP,
diff --git a/net-libs/libyahoo2/metadata.xml b/net-libs/libyahoo2/metadata.xml
index a4dd39fe7e4e..1e21bea6e1f1 100644
--- a/net-libs/libyahoo2/metadata.xml
+++ b/net-libs/libyahoo2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="sourceforge">libyahoo2</remote-id>
 	</upstream>
diff --git a/net-libs/libzapojit/metadata.xml b/net-libs/libzapojit/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/libzapojit/metadata.xml
+++ b/net-libs/libzapojit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
index fcbfe25fc1fc..d1774020e6f6 100644
--- a/net-libs/loudmouth/metadata.xml
+++ b/net-libs/loudmouth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
   </use>
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
index f38aad4d9e51..0e1cc0eb8474 100644
--- a/net-libs/miniupnpc/metadata.xml
+++ b/net-libs/miniupnpc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
@@ -10,4 +9,8 @@
 	<email>nikoli@gmx.us</email>
 	<name>Nikoli</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index 25503b43cd02..994779a84e81 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>arfrever.fta@gmail.com</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
 	Neon is an HTTP and WebDAV client library for Unix systems, with a C
 	language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
diff --git a/net-libs/netembryo/metadata.xml b/net-libs/netembryo/metadata.xml
index b55e0e950209..92a08ac36134 100644
--- a/net-libs/netembryo/metadata.xml
+++ b/net-libs/netembryo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/net-libs/netwib/metadata.xml b/net-libs/netwib/metadata.xml
index f1a97d721422..7dfdb343a7d3 100644
--- a/net-libs/netwib/metadata.xml
+++ b/net-libs/netwib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription>Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ntwib</remote-id>
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 850a8eed6aa0..38bb00f3c07c 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-        <maintainer>
+	<maintainer>
                 <email>bugs@bergstroem.nu</email>
                 <name>Johan Bergstroem</name>
         </maintainer>
@@ -10,6 +9,10 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 	<use>
 	<flag name="npm">Enable NPM package manager</flag>
 	<flag name="snapshot">Enable snapshot creation for faster startup</flag>
diff --git a/net-libs/openslp/metadata.xml b/net-libs/openslp/metadata.xml
index 92e1c97fcca8..0e748b505ced 100644
--- a/net-libs/openslp/metadata.xml
+++ b/net-libs/openslp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openslp</remote-id>
 	</upstream>
diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
index 38087fff4f87..a79fc2505117 100644
--- a/net-libs/phodav/metadata.xml
+++ b/net-libs/phodav/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>virtualization</herd>
+  <maintainer>
+	  <email>gnome@gentoo.org</email>
+	  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer>
+	  <email>virtualization@gentoo.org</email>
+	  <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
 	  <flag name="spice">Install the spice-webdavd guest agent</flag>
   </use>
diff --git a/net-libs/qmf/metadata.xml b/net-libs/qmf/metadata.xml
index 4fd5a5f7ed23..03f11cecfc56 100644
--- a/net-libs/qmf/metadata.xml
+++ b/net-libs/qmf/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
 <maintainer>
 	<email>pesa@gentoo.org</email>
 	<name>Davide Pesavento</name>
 </maintainer>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/qtweetlib/metadata.xml b/net-libs/qtweetlib/metadata.xml
index e297298a1cdb..dfd656121797 100644
--- a/net-libs/qtweetlib/metadata.xml
+++ b/net-libs/qtweetlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">minimoog/QTweetLib</remote-id>
 	</upstream>
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 497e5eb601ba..2b82f3349ee6 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <upstream>
 	<bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
 	<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
index e3583c47f9be..88d49c835e03 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
diff --git a/net-libs/rest/metadata.xml b/net-libs/rest/metadata.xml
index 49d7ac9b6b3f..537c6806b89b 100644
--- a/net-libs/rest/metadata.xml
+++ b/net-libs/rest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="gnome">Extract proxy information using
       <pkg>net-libs/libsoup-gnome</pkg></flag>
diff --git a/net-libs/ripe-atlas-sagan/metadata.xml b/net-libs/ripe-atlas-sagan/metadata.xml
index 3eba6ff08ade..64bc37c04c50 100644
--- a/net-libs/ripe-atlas-sagan/metadata.xml
+++ b/net-libs/ripe-atlas-sagan/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@danielquinn.org</email>
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ripe.atlas.sagan</remote-id>
 	</upstream>
diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-libs/rpc2/metadata.xml
+++ b/net-libs/rpc2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index d5a616789e6a..033b8f479ced 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">serf</remote-id>
 	</upstream>
diff --git a/net-libs/signon-oauth2/metadata.xml b/net-libs/signon-oauth2/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/signon-oauth2/metadata.xml
+++ b/net-libs/signon-oauth2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/signon-ui/metadata.xml b/net-libs/signon-ui/metadata.xml
index 8c7cd30a8a6c..f8605af0e586 100644
--- a/net-libs/signon-ui/metadata.xml
+++ b/net-libs/signon-ui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">signon-ui</remote-id>
 	</upstream>
diff --git a/net-libs/signond/metadata.xml b/net-libs/signond/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/signond/metadata.xml
+++ b/net-libs/signond/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/socket++/metadata.xml b/net-libs/socket++/metadata.xml
index 54cb0feb0740..9f7385532e6d 100644
--- a/net-libs/socket++/metadata.xml
+++ b/net-libs/socket++/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+	<maintainer>
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
 	<longdescription>Socket++ library defines a family of C++ classes that can be used more effectively than directly calling the underlying low-level system functions.</longdescription>
 </pkgmetadata>
diff --git a/net-libs/socket_wrapper/metadata.xml b/net-libs/socket_wrapper/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/net-libs/socket_wrapper/metadata.xml
+++ b/net-libs/socket_wrapper/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+<maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-libs/sofia-sip/metadata.xml b/net-libs/sofia-sip/metadata.xml
index 1779ea8f4a27..c13c566a2e13 100644
--- a/net-libs/sofia-sip/metadata.xml
+++ b/net-libs/sofia-sip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sofia-sip</remote-id>
 	</upstream>
diff --git a/net-libs/telepathy-accounts-signon/metadata.xml b/net-libs/telepathy-accounts-signon/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/telepathy-accounts-signon/metadata.xml
+++ b/net-libs/telepathy-accounts-signon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/telepathy-farstream/metadata.xml b/net-libs/telepathy-farstream/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/telepathy-farstream/metadata.xml
+++ b/net-libs/telepathy-farstream/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index 455620cf3c8e..c81875abf349 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
diff --git a/net-libs/telepathy-logger-qt/metadata.xml b/net-libs/telepathy-logger-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-libs/telepathy-logger-qt/metadata.xml
+++ b/net-libs/telepathy-logger-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index ee4ec0b56135..d0ad429063ae 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="farstream">Enable support for audio/video calls via farstream</flag>
 	</use>
diff --git a/net-libs/uhttpmock/metadata.xml b/net-libs/uhttpmock/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-libs/uhttpmock/metadata.xml
+++ b/net-libs/uhttpmock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index f3d154bebd70..513688b3376e 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+        <email>gnome@gentoo.org</email>
+        <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
   	<flag name="coverage">Enable code coverage support</flag>
 	<flag name="egl">Enable EGL support.</flag>
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index 4fd26ae6812a..7c0e71ec22c0 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <upstream>
     <remote-id type="google-code">wvstreams</remote-id>
   </upstream>
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 4d4eef0ef40d..e93168f4a7db 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   XROOTD software framework is a fully generic suite for fast, low latency
   and scalable data access, which can serve natively any kind of data,
diff --git a/net-mail/altermime/metadata.xml b/net-mail/altermime/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/altermime/metadata.xml
+++ b/net-mail/altermime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/archivemail/metadata.xml b/net-mail/archivemail/metadata.xml
index 729518bf2231..88b1f21ab5c8 100644
--- a/net-mail/archivemail/metadata.xml
+++ b/net-mail/archivemail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">archivemail</remote-id>
 	</upstream>
diff --git a/net-mail/asmail/metadata.xml b/net-mail/asmail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/asmail/metadata.xml
+++ b/net-mail/asmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
index b16361101e40..ef4e1f4becd7 100644
--- a/net-mail/autorespond/metadata.xml
+++ b/net-mail/autorespond/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qmailadmin</remote-id>
   </upstream>
diff --git a/net-mail/bincimap/metadata.xml b/net-mail/bincimap/metadata.xml
index 87a19246cf13..68adbf0ae5ce 100644
--- a/net-mail/bincimap/metadata.xml
+++ b/net-mail/bincimap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">bincimap</remote-id>
 	</upstream>
diff --git a/net-mail/checkpassword-pam/metadata.xml b/net-mail/checkpassword-pam/metadata.xml
index 26bd7d26ff10..55b8a44d78d3 100644
--- a/net-mail/checkpassword-pam/metadata.xml
+++ b/net-mail/checkpassword-pam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">checkpasswd-pam</remote-id>
 	</upstream>
diff --git a/net-mail/checkpassword/metadata.xml b/net-mail/checkpassword/metadata.xml
index 89dcd746873c..b3370ec90ca9 100644
--- a/net-mail/checkpassword/metadata.xml
+++ b/net-mail/checkpassword/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
index 0cb478b8c6ca..cf7950eb8559 100644
--- a/net-mail/cmd5checkpw/metadata.xml
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 7bf28890d090..dac48da0d638 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-needed</herd>
 	<use>
 		<flag name="trashquota">include deleted messages, and the Trash folder, in the estimated quota usage for maildirs</flag>
 	</use>
diff --git a/net-mail/courierpassd/metadata.xml b/net-mail/courierpassd/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/courierpassd/metadata.xml
+++ b/net-mail/courierpassd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/cyrus-imap-admin/metadata.xml b/net-mail/cyrus-imap-admin/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/cyrus-imap-admin/metadata.xml
+++ b/net-mail/cyrus-imap-admin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 120284d1cc4f..a1bed49ac85a 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+  </maintainer>
   <use>
 	<flag name="replication">Enable replication support in the cyrus imap server</flag>
 	<flag name="sieve">Enable sieve support</flag>
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index 9353ac561705..38a4426607d3 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
   <maintainer>
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
   <use>
     <flag name="sieve">Enable sieve filter support</flag>
diff --git a/net-mail/dot-forward/metadata.xml b/net-mail/dot-forward/metadata.xml
index 0cb478b8c6ca..cf7950eb8559 100644
--- a/net-mail/dot-forward/metadata.xml
+++ b/net-mail/dot-forward/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index d42dc8ddf5bb..d8c8fb9a8383 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
-        <maintainer>
+  <maintainer>
                 <email>eras@gentoo.org</email>
                 <name>Eray Aslan</name>
         </maintainer>
+  <maintainer>
+                <email>net-mail@gentoo.org</email>
+                <name>Net-Mail</name>
+        </maintainer>
   <use>
     <flag name="cydir">Add cydir storage support</flag>
     <flag name="managesieve">Add managesieve protocol support</flag>
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
index ca387b18c097..efd7f1e9a662 100644
--- a/net-mail/email/metadata.xml
+++ b/net-mail/email/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <longdescription lang="en">
     Advanced CLI tool for sending mail.
   </longdescription>
diff --git a/net-mail/eps/metadata.xml b/net-mail/eps/metadata.xml
index c0f9eb6c90f2..8b75b5b65e64 100644
--- a/net-mail/eps/metadata.xml
+++ b/net-mail/eps/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+ </maintainer>
  <longdescription>EPS (Email Parsing System) is intended to give people the ability to write their own email processing tools. Whether you want to process incoming and outgoing emails, or just analyze a message, this package is intended to aid in that endeavor.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/ezmlm-idx/metadata.xml b/net-mail/ezmlm-idx/metadata.xml
index 210ce3ffc25e..5f39b000ab6f 100644
--- a/net-mail/ezmlm-idx/metadata.xml
+++ b/net-mail/ezmlm-idx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/fastforward/metadata.xml b/net-mail/fastforward/metadata.xml
index 210ce3ffc25e..5f39b000ab6f 100644
--- a/net-mail/fastforward/metadata.xml
+++ b/net-mail/fastforward/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index 236fc8487bdb..dcebede9d887 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="hesiod">Enable support for hesiod</flag>
     <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
diff --git a/net-mail/gensig/metadata.xml b/net-mail/gensig/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/gensig/metadata.xml
+++ b/net-mail/gensig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/gnubiff/metadata.xml b/net-mail/gnubiff/metadata.xml
index 2c860c575d34..4114f12d7d27 100644
--- a/net-mail/gnubiff/metadata.xml
+++ b/net-mail/gnubiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="password">Enable save passwords to connect mail servers in user space</flag>
   </use>
diff --git a/net-mail/grepmail/metadata.xml b/net-mail/grepmail/metadata.xml
index 13383aa803a0..b9a2687170b9 100644
--- a/net-mail/grepmail/metadata.xml
+++ b/net-mail/grepmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">grepmail</remote-id>
 	</upstream>
diff --git a/net-mail/hotwayd/metadata.xml b/net-mail/hotwayd/metadata.xml
index d690df6a5083..d4ce7a3f920e 100644
--- a/net-mail/hotwayd/metadata.xml
+++ b/net-mail/hotwayd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="smtp">Build SMTP proxy (hotsmtpd)</flag>
   </use>
diff --git a/net-mail/imapsync/metadata.xml b/net-mail/imapsync/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-mail/imapsync/metadata.xml
+++ b/net-mail/imapsync/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index ef5e799b83b7..f9fec029df6f 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">isync</remote-id>
 	</upstream>
diff --git a/net-mail/kuvert/metadata.xml b/net-mail/kuvert/metadata.xml
index 196134491c70..5a76c527be03 100644
--- a/net-mail/kuvert/metadata.xml
+++ b/net-mail/kuvert/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index 9ab517fb5838..be7eccea77f2 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="abook">Enables <pkg>app-misc/abook</pkg> support</flag>
     <flag name="finger">Enables finger support</flag>
diff --git a/net-mail/libpst/metadata.xml b/net-mail/libpst/metadata.xml
index f2dd6174b4b0..da5441ca5e67 100644
--- a/net-mail/libpst/metadata.xml
+++ b/net-mail/libpst/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <use>
     <flag name="dii">enable dii support</flag>
   </use>
diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/mailbase/metadata.xml
+++ b/net-mail/mailbase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
index fd6c445de2f6..660d632d8c9a 100644
--- a/net-mail/maildirtree/metadata.xml
+++ b/net-mail/maildirtree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">
 		A utility that prints trees of Courier-style Maildirs.
 	</longdescription>
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
index 6091a7dd0208..cc48d0a6d388 100644
--- a/net-mail/mailfront/metadata.xml
+++ b/net-mail/mailfront/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription lang="en">
 This is mailfront, a package containing customizeable network front-ends
 for mail servers.  It contains complete SMTP, QMQP, QMTP, and POP3
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
index 196134491c70..5a76c527be03 100644
--- a/net-mail/mailgraph/metadata.xml
+++ b/net-mail/mailgraph/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 65a8fcc7d115..87ce5860fe89 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mailman</remote-id>
 	</upstream>
diff --git a/net-mail/mailsync/metadata.xml b/net-mail/mailsync/metadata.xml
index d61989237da5..b94166a24c6d 100644
--- a/net-mail/mailsync/metadata.xml
+++ b/net-mail/mailsync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mailsync</remote-id>
   </upstream>
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
index 415ebc26b926..66606a41db3d 100644
--- a/net-mail/mailutils/metadata.xml
+++ b/net-mail/mailutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <use>
   <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
   <flag name="kyotocabinet">Enable Kyoto Cabinet database support</flag>
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index e360c5c07b57..47df7148a970 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="gnus">Add support for the marks propagation feature in
 			<pkg>app-emacs/gnus</pkg></flag>
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index 9bd46c587b7f..8b7b9ef0b5d5 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mboxgrep</remote-id>
 	</upstream>
diff --git a/net-mail/mess822/metadata.xml b/net-mail/mess822/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/mess822/metadata.xml
+++ b/net-mail/mess822/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/metamail/metadata.xml
+++ b/net-mail/metamail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-mail/mhonarc/metadata.xml
+++ b/net-mail/mhonarc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/mlmmj/metadata.xml b/net-mail/mlmmj/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/mlmmj/metadata.xml
+++ b/net-mail/mlmmj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/mpack/metadata.xml
+++ b/net-mail/mpack/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/mpop/metadata.xml b/net-mail/mpop/metadata.xml
index 3b8d246714a8..49e2505077d4 100644
--- a/net-mail/mpop/metadata.xml
+++ b/net-mail/mpop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	</use>
diff --git a/net-mail/mswatch/metadata.xml b/net-mail/mswatch/metadata.xml
index b078c4f77d46..4d25bf1c800e 100644
--- a/net-mail/mswatch/metadata.xml
+++ b/net-mail/mswatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mswatch</remote-id>
 	</upstream>
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 7c7b1c92f591..a87202358688 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
-        <maintainer>
+	<maintainer>
           <email>vikraman@gentoo.org</email>
           <name>Vikraman Choudhury</name>
         </maintainer>
+	<maintainer>
+          <email>net-mail@gentoo.org</email>
+          <name>Net-Mail</name>
+        </maintainer>
 	<longdescription lang="en">'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
 are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.</longdescription>
 	<use>
diff --git a/net-mail/nmzmail/metadata.xml b/net-mail/nmzmail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/nmzmail/metadata.xml
+++ b/net-mail/nmzmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/offlineimap/metadata.xml b/net-mail/offlineimap/metadata.xml
index 8de039e83fb9..c17a9b97e6fb 100644
--- a/net-mail/offlineimap/metadata.xml
+++ b/net-mail/offlineimap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag>
   </use>
diff --git a/net-mail/peephole/metadata.xml b/net-mail/peephole/metadata.xml
index d6eb719e5b4b..f4f9a206543f 100644
--- a/net-mail/peephole/metadata.xml
+++ b/net-mail/peephole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">peephole</remote-id>
 	</upstream>
diff --git a/net-mail/perdition/metadata.xml b/net-mail/perdition/metadata.xml
index 5e1b98e0186d..e9f4384d7bb3 100644
--- a/net-mail/perdition/metadata.xml
+++ b/net-mail/perdition/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		Perdition is a fully featured POP3 and IMAP4 proxy server.
 		It is able to handle both SSL and non-SSL connections and redirect users
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
index 95b737b450fb..56b8c08285f0 100644
--- a/net-mail/pfqueue/metadata.xml
+++ b/net-mail/pfqueue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">
 		A ncurses-based tool for handling postfix queues.
 	</longdescription>
diff --git a/net-mail/pop-before-smtp/metadata.xml b/net-mail/pop-before-smtp/metadata.xml
index b3dee9a03ac9..a1b0e9b2f41d 100644
--- a/net-mail/pop-before-smtp/metadata.xml
+++ b/net-mail/pop-before-smtp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">popbsmtp</remote-id>
 	</upstream>
diff --git a/net-mail/pop2imap/metadata.xml b/net-mail/pop2imap/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-mail/pop2imap/metadata.xml
+++ b/net-mail/pop2imap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index 67f60b99c8cc..d12c1dd9b45e 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>
     A security oriented POP3 server.
 </longdescription>
diff --git a/net-mail/popick/metadata.xml b/net-mail/popick/metadata.xml
index 991a7b55bdc4..f757a9fa746c 100644
--- a/net-mail/popick/metadata.xml
+++ b/net-mail/popick/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+ </maintainer>
  <longdescription>An interactive, curses-based POP3 mail deleter that allows you to match messages with regexes.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index 0ca7470eda81..6a81e55f8444 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <longdescription>
     Provides a daemon for changing passwords over the network. This feature
     is commonly used for TCP loopback password changing from web scripting
diff --git a/net-mail/qlogtools/metadata.xml b/net-mail/qlogtools/metadata.xml
index d52303d1cbac..b3370ec90ca9 100644
--- a/net-mail/qlogtools/metadata.xml
+++ b/net-mail/qlogtools/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>qmail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmail-autoresponder/metadata.xml b/net-mail/qmail-autoresponder/metadata.xml
index 60cac0fceab8..cea6539b8a32 100644
--- a/net-mail/qmail-autoresponder/metadata.xml
+++ b/net-mail/qmail-autoresponder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription lang="en">
 This is a simple program to automatically respond to emails.
 
diff --git a/net-mail/qmail-lint/metadata.xml b/net-mail/qmail-lint/metadata.xml
index 996c7a4e5ac9..87697158843b 100644
--- a/net-mail/qmail-lint/metadata.xml
+++ b/net-mail/qmail-lint/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
   <description>Primary Maintainer</description>
 </maintainer>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <longdescription>qmail-lint checks your qmail configuration for common
     problems. Prints warning or error messages to stdout.  </longdescription>
 </pkgmetadata>
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index 210ce3ffc25e..5f39b000ab6f 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmail-qfilter/metadata.xml b/net-mail/qmail-qfilter/metadata.xml
index ee198f063095..5aabe621443d 100644
--- a/net-mail/qmail-qfilter/metadata.xml
+++ b/net-mail/qmail-qfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription lang="en">
 This program allows the body and/or envelope of a message to be filtered
 through a series of filters before being passed to the real qmail-queue
diff --git a/net-mail/qmail-qsanity/metadata.xml b/net-mail/qmail-qsanity/metadata.xml
index 21452942a3de..e2dc96a87ad7 100644
--- a/net-mail/qmail-qsanity/metadata.xml
+++ b/net-mail/qmail-qsanity/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
   <description>Primary Maintainer</description>
 </maintainer>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <longdescription>qmail-qsanity checks your queue data structures for internal
     consistency. If it finds any problems, it prints a warning to stderr. Plans
     are to change it to generate shell commands which will correct the
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
index 13ee9dc934c2..33a1a30ff2f8 100644
--- a/net-mail/qmailadmin/metadata.xml
+++ b/net-mail/qmailadmin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qmail</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="maildrop">Filter spam using maildrop</flag>
   </use>
diff --git a/net-mail/qmailanalog/metadata.xml b/net-mail/qmailanalog/metadata.xml
index d52303d1cbac..b3370ec90ca9 100644
--- a/net-mail/qmailanalog/metadata.xml
+++ b/net-mail/qmailanalog/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>qmail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmhandle/metadata.xml b/net-mail/qmhandle/metadata.xml
index bfd4139d2e0a..9ad6fb4a6621 100644
--- a/net-mail/qmhandle/metadata.xml
+++ b/net-mail/qmhandle/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qmail</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <longdescription>qmHandle is a tool which can be used to manage the qmail
     message queue. It's written in Perl (so fully customizable) and much more
     powerful than qmail-qread and qmail-qstat. Key features are colored output
diff --git a/net-mail/qmrtg/metadata.xml b/net-mail/qmrtg/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-mail/qmrtg/metadata.xml
+++ b/net-mail/qmrtg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/qpopper/metadata.xml b/net-mail/qpopper/metadata.xml
index f31c08160fa6..59fb7b673131 100644
--- a/net-mail/qpopper/metadata.xml
+++ b/net-mail/qpopper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="apop">Enables the pop.auth file in /etc/pop.auth</flag>
     <flag name="drac">Enables DRAC support</flag>
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
index 31aa828f5534..cb6e5881915b 100644
--- a/net-mail/qprint/metadata.xml
+++ b/net-mail/qprint/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/qtools/metadata.xml b/net-mail/qtools/metadata.xml
index d52303d1cbac..b3370ec90ca9 100644
--- a/net-mail/qtools/metadata.xml
+++ b/net-mail/qtools/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>qmail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/queue-fix/metadata.xml b/net-mail/queue-fix/metadata.xml
index a20f1429ccc3..17a375d53571 100644
--- a/net-mail/queue-fix/metadata.xml
+++ b/net-mail/queue-fix/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
   <description>Primary Maintainer</description>
 </maintainer>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <longdescription>It repairs or generates a qmail queue structure. You can use
     this to help move your queue location, or if you regenerate the file system
     and the inode numbering changes. It will also fix permissions and
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
index 672e44614eab..4e67a7f229f1 100644
--- a/net-mail/queue-repair/metadata.xml
+++ b/net-mail/queue-repair/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		A toolkit for dealing with the qmail queue directory structure; it can create a
 		new queue, move and properly rename a queue, dynamically change the conf-split
diff --git a/net-mail/randomsig/metadata.xml b/net-mail/randomsig/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/randomsig/metadata.xml
+++ b/net-mail/randomsig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/relay-ctrl/metadata.xml b/net-mail/relay-ctrl/metadata.xml
index 89dcd746873c..b3370ec90ca9 100644
--- a/net-mail/relay-ctrl/metadata.xml
+++ b/net-mail/relay-ctrl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/ripmime/metadata.xml b/net-mail/ripmime/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/ripmime/metadata.xml
+++ b/net-mail/ripmime/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/ripole/metadata.xml b/net-mail/ripole/metadata.xml
index 389bbbe812ff..e4be643101c9 100644
--- a/net-mail/ripole/metadata.xml
+++ b/net-mail/ripole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		ripOLE is a small program/library designed to pull out attachments from
 		OLE2 data files (ie, MS Office documents).
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
index ab44329e146f..f32a8a4574f1 100644
--- a/net-mail/rss2email/metadata.xml
+++ b/net-mail/rss2email/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		rss2email is a simple Python script that lets you subscribe to a
 		list of XML newsfeeds (RSS or Atom) and get new items sent to
diff --git a/net-mail/safecat/metadata.xml b/net-mail/safecat/metadata.xml
index 89dcd746873c..b3370ec90ca9 100644
--- a/net-mail/safecat/metadata.xml
+++ b/net-mail/safecat/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>net-mail</herd>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+<maintainer>
+        <email>net-mail@gentoo.org</email>
+        <name>Net-Mail</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/serialmail/metadata.xml b/net-mail/serialmail/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/serialmail/metadata.xml
+++ b/net-mail/serialmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/signify/metadata.xml b/net-mail/signify/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/net-mail/signify/metadata.xml
+++ b/net-mail/signify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-mail/smtptools/metadata.xml b/net-mail/smtptools/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/net-mail/smtptools/metadata.xml
+++ b/net-mail/smtptools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/spamcup/metadata.xml b/net-mail/spamcup/metadata.xml
index bdb5652534f3..0cd3edc31cdb 100644
--- a/net-mail/spamcup/metadata.xml
+++ b/net-mail/spamcup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">spamcup</remote-id>
 	</upstream>
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index 36c2242fcb91..31ac1dfc0139 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 <longdescription>"Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" - a full-featured Perl script for testing SMTP servers.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
index 42f942e8e000..d29c742c94b8 100644
--- a/net-mail/t-prot/metadata.xml
+++ b/net-mail/t-prot/metadata.xml
@@ -5,7 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		This program is a filter which shall improve the readability for messages
 		(emails and usenet postings) by *hiding* some annoying parts, e.g. mailing
diff --git a/net-mail/tnef/metadata.xml b/net-mail/tnef/metadata.xml
index f46c32ce606b..1ac245f1df3c 100644
--- a/net-mail/tnef/metadata.xml
+++ b/net-mail/tnef/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tnef</remote-id>
 	</upstream>
diff --git a/net-mail/topal/metadata.xml b/net-mail/topal/metadata.xml
index 8434a442ba8f..fc352f2b4413 100644
--- a/net-mail/topal/metadata.xml
+++ b/net-mail/topal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription lang="en">
 		Topal is a glue program that links GnuPG and Pine/Alpine. It offers
 		facilities to encrypt, decrypt, sign and verify emails.
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
index 7a0796dda823..49f7fbde78b3 100644
--- a/net-mail/tpop3d/metadata.xml
+++ b/net-mail/tpop3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="authexternal">Enable authentication by an external program</flag>
     <flag name="drac">Enable dynamic relay support in the tpop3d pop3 server</flag>
diff --git a/net-mail/up-imapproxy/metadata.xml b/net-mail/up-imapproxy/metadata.xml
index f228f9b4cc58..3b5939794e80 100644
--- a/net-mail/up-imapproxy/metadata.xml
+++ b/net-mail/up-imapproxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">squirrelmail</remote-id>
   </upstream>
diff --git a/net-mail/uw-imap/metadata.xml b/net-mail/uw-imap/metadata.xml
index 469222c3bae0..333d09c2f5c8 100644
--- a/net-mail/uw-imap/metadata.xml
+++ b/net-mail/uw-imap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-mail</herd>
+  <maintainer>
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="clearpasswd">Enables cleartext logins outside of SSL sessions</flag>
   </use>
diff --git a/net-mail/uw-mailutils/metadata.xml b/net-mail/uw-mailutils/metadata.xml
index 0f733c73e935..4aa1d29c1207 100644
--- a/net-mail/uw-mailutils/metadata.xml
+++ b/net-mail/uw-mailutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		Mail utilities common to University of Washington software packages.
 	</longdescription>
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
index 5837c64ada49..0833bcc40ae2 100644
--- a/net-mail/vchkuser/metadata.xml
+++ b/net-mail/vchkuser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="debug">Enables debug messages to syslog</flag>
 	</use>
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 3e79a0fb7bce..35751b157733 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<use>
 		<flag name="clearpasswd">Enables cleartext password storage in the
 			vpasswd files</flag>
diff --git a/net-mail/yosucker/metadata.xml b/net-mail/yosucker/metadata.xml
index afd2c3abbec4..c63dd711be10 100644
--- a/net-mail/yosucker/metadata.xml
+++ b/net-mail/yosucker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		YoSucker allows you to download Yahoo mail to a local file or pipe it to procmail. It suppourts multiple accounts, encrypted passwords, transaction safe writes, and more.
 	</longdescription>
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 0322df9ead62..c870f4812601 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>deb-tools</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 <name>Jeroen Roovers</name>
 </maintainer>
+<maintainer>
+<email>deb-tools@gentoo.org</email>
+<name>Gentoo Debian Tools Project</name>
+</maintainer>
 <use>
 <flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
 </use>
diff --git a/net-misc/arm/metadata.xml b/net-misc/arm/metadata.xml
index 9134ba92a2e9..3449cfe1d8ce 100644
--- a/net-misc/arm/metadata.xml
+++ b/net-misc/arm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
@@ -14,4 +13,8 @@
     <email>mrueg@gentoo.org</email>
 	<name>Manuel Rüger</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 61bd84d24ccf..b5111b4fa108 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bridge</remote-id>
   </upstream>
diff --git a/net-misc/bsdwhois/metadata.xml b/net-misc/bsdwhois/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/net-misc/bsdwhois/metadata.xml
+++ b/net-misc/bsdwhois/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 72e4e11f0b84..5707ccd14517 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/capiisdnmon/metadata.xml b/net-misc/capiisdnmon/metadata.xml
index 5313bf560f2e..e6bf403e0633 100644
--- a/net-misc/capiisdnmon/metadata.xml
+++ b/net-misc/capiisdnmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription>A CAPI 2.0 ISDN call monitor with LDAP name resolution</longdescription>
 	<longdescription lang="ja">CAPI 2.0 ISDN は LDAP の名前解決の様子を表示します。</longdescription>
 	<upstream>
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 4efd6988c9a6..717ab7f7f42f 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sysadmin</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
@@ -12,6 +11,10 @@
 		<name>Marc Schiffbauer</name>
 		<description>cfengine &gt;2.x only</description>
 	</maintainer>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 3ffd4b4c1866..812227cb9e38 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ki@baka.bakka.su</email>
 		<description>In baka-bakka overlay.</description>
@@ -10,6 +9,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ants1">Enable support for Antminer S1 Bitmain</flag>
 		<flag name="ants2">Enable support for Antminer S2 Bitmain</flag>
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
index 7a8af9a8b7cb..601134e0f976 100644
--- a/net-misc/charm/metadata.xml
+++ b/net-misc/charm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ljcharm</remote-id>
 	</upstream>
diff --git a/net-misc/clamz/metadata.xml b/net-misc/clamz/metadata.xml
index e5d9d408ffc8..9f9ded9f39a5 100644
--- a/net-misc/clamz/metadata.xml
+++ b/net-misc/clamz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">clamz</remote-id>
 	</upstream>
diff --git a/net-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
index fc61ef0d838f..7e42e9a3baed 100644
--- a/net-misc/clusterssh/metadata.xml
+++ b/net-misc/clusterssh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription lang="en">
   ClusterSSH is a tool for making the same change on multiple servers 
   at the same time. The 'cssh' command opens an administration console 
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 607b1687ee0a..77b82cf8aac7 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
     <remote-id type="github">andrew-bibb/cmst</remote-id>
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 1e04da18cf52..b5f1baa10e9c 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>balint@szentedwg.ro</email>
 		<name>Bálint Szente</name>
@@ -12,6 +11,10 @@
 		<name>Yixun Lan</name>
 		<description>Co Maintainer, CC bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
diff --git a/net-misc/corkscrew/metadata.xml b/net-misc/corkscrew/metadata.xml
index eb5fbf2a758e..5f1a4d657dde 100644
--- a/net-misc/corkscrew/metadata.xml
+++ b/net-misc/corkscrew/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sysadmin</herd>
+<maintainer>
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
 <longdescription>
 Corkscrew is a tool for tunneling SSH through HTTP proxies.
 </longdescription>
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
index 42486af8aabc..4d33617f0794 100644
--- a/net-misc/dhcdrop/metadata.xml
+++ b/net-misc/dhcdrop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Uility for tracing and neutralizing(blocking) fake DHCP
 		servers in Ethernet. Supports various modes. Theres possibility
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
index a2fff7185c1f..206e82b6874a 100644
--- a/net-misc/dhcp/metadata.xml
+++ b/net-misc/dhcp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription lang="en">The ISC DHCP client/server package.</longdescription>
 	<longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
 	<use>
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 8605a1493a92..f31ffbf8641d 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tokiclover@gmail.com</email>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="gtk3">
 		Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 202e48827a19..308e6e3a0e25 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>williamh@gentoo.org</email>
     <name>William Hubbs</name>
   </maintainer>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
 </upstream>
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-misc/dleyna-server/metadata.xml
+++ b/net-misc/dleyna-server/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/net-misc/dnetstats/metadata.xml
+++ b/net-misc/dnetstats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
index 5ac579bf073a..b57924f9b147 100644
--- a/net-misc/dropbear/metadata.xml
+++ b/net-misc/dropbear/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>embedded</herd>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <longdescription>
 I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard 
 disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is 
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 7f347f631bf5..95879f1c01d4 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -18,6 +17,10 @@
 		<email>emery@vfemail.net</email>
 		<name>Emery Hemingway</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
diff --git a/net-misc/ethercard-diag/metadata.xml b/net-misc/ethercard-diag/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/ethercard-diag/metadata.xml
+++ b/net-misc/ethercard-diag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/geoipupdate/metadata.xml b/net-misc/geoipupdate/metadata.xml
index e0abfd5b2dbb..7574996a6f39 100644
--- a/net-misc/geoipupdate/metadata.xml
+++ b/net-misc/geoipupdate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">maxmind/geoipupdate</remote-id>
 	</upstream>
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
index fb25ea5891bf..e12aaf03d9a1 100644
--- a/net-misc/gnome-online-miners/metadata.xml
+++ b/net-misc/gnome-online-miners/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="flickr">Enable Flickr support</flag>
 </use>
diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml
index a37eac5342bd..7a288dfa1ab2 100644
--- a/net-misc/grdesktop/metadata.xml
+++ b/net-misc/grdesktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>Gtk2 frontend for rdesktop</longdescription>
 <longdescription lang="ja">リモート・デスクトップの GTK2 フロントエンドです。</longdescription>
 </pkgmetadata>
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 4a94c4a7f8f3..3016618650da 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+	</maintainer>
 <use>
 <flag name="gcrypt">
 	Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-misc/gupnp-tools/metadata.xml
+++ b/net-misc/gupnp-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index 0a34bcaad2cb..9d954f4229bb 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
@@ -12,4 +11,8 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/gwget/metadata.xml b/net-misc/gwget/metadata.xml
index 9359a065c80e..4d37232aa036 100644
--- a/net-misc/gwget/metadata.xml
+++ b/net-misc/gwget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>Gwget2 is a gtk2 front-end for the wget program. Wget is commonly used for retrieving files from the internet, and with an easy to use gtk2 interface, gwget2 brings the utility of wget to the GNOME desktop. Gwget2 supports drag and drop from most gtk2 compatible browsers, as well as the ability to pause and continue downloads over sessions.</longdescription>
   <longdescription lang="ja">
 Gwget2 は wget プログラムの GTK2 フロントエンドです。wget とはインターネットからファイルを回収するのに一般的に
diff --git a/net-misc/hsc/metadata.xml b/net-misc/hsc/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/net-misc/hsc/metadata.xml
+++ b/net-misc/hsc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
index c7ed39f7accc..85f78bd85837 100644
--- a/net-misc/httptype/metadata.xml
+++ b/net-misc/httptype/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">httptype</remote-id>
 	</upstream>
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index 69548ea80075..f44fa08f6fba 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<maintainer>
 		<email>mattm@gentoo.org</email>
 		<name>Matthew Marlowe</name>
diff --git a/net-misc/iaxmodem/metadata.xml b/net-misc/iaxmodem/metadata.xml
index e81a784a2e5d..2a3240f5b60c 100644
--- a/net-misc/iaxmodem/metadata.xml
+++ b/net-misc/iaxmodem/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		IAXmodem is a software modem written in C that uses an IAX channel
 		(commonly provided by an Asterisk PBX system) instead of a traditional
diff --git a/net-misc/ices/metadata.xml b/net-misc/ices/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/net-misc/ices/metadata.xml
+++ b/net-misc/ices/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/iodine/metadata.xml b/net-misc/iodine/metadata.xml
index 2fe9ba7b2dd5..c1caab4cfd75 100644
--- a/net-misc/iodine/metadata.xml
+++ b/net-misc/iodine/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>vostorga@gentoo.org</email>
 		<name>Víctor Ostorga</name>
@@ -14,5 +13,9 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>iodine lets you tunnel IPv4 data through a DNS server. This can be usable in different situations where internet access is firewalled, but DNS queries are allowed</longdescription>
 </pkgmetadata>
diff --git a/net-misc/ip-sentinel/metadata.xml b/net-misc/ip-sentinel/metadata.xml
index d6c671a6f308..0af22b0ab1c9 100644
--- a/net-misc/ip-sentinel/metadata.xml
+++ b/net-misc/ip-sentinel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 This program tries to prevent unauthorized usage of IPs within the local
 ethernet broadcastdomain by giving an answer to ARP-requests. After receiving
diff --git a/net-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-misc/ipcalc/metadata.xml
+++ b/net-misc/ipcalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 0ebec195cd1d..5b58eafd18b1 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">esnet/iperf</remote-id>
 		<remote-id type="sourceforge">iperf</remote-id>
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index b3de8ae6303b..9b7fe83b2295 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <use>
     <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
     <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index f6baec0e2963..13913ef923b4 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
@@ -10,4 +9,8 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/ixp4xx/metadata.xml b/net-misc/ixp4xx/metadata.xml
index 874dddb6a57c..54f933baad7c 100644
--- a/net-misc/ixp4xx/metadata.xml
+++ b/net-misc/ixp4xx/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/java-wakeonlan/metadata.xml b/net-misc/java-wakeonlan/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/net-misc/java-wakeonlan/metadata.xml
+++ b/net-misc/java-wakeonlan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml
index 5db1b0e61f49..506f7157d6c3 100644
--- a/net-misc/jrdesktop/metadata.xml
+++ b/net-misc/jrdesktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Java Remote Desktop (jrdesktop) is an open source software for viewing and/or controlling a distance PC.
 
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index 37c46d9c39d7..38dce10c1d83 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
 	<maintainer>
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 373a5008f7c7..d21514d0e8fd 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>drobbins@funtoo.org</email>
 		<name>Daniel Robbins</name>
 		<description>Upstream contact, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">funtoo/keychain</remote-id>
 	</upstream>
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-misc/knemo/metadata.xml
+++ b/net-misc/knemo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-misc/knutclient/metadata.xml
+++ b/net-misc/knutclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/ksshaskpass/metadata.xml b/net-misc/ksshaskpass/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/net-misc/ksshaskpass/metadata.xml
+++ b/net-misc/ksshaskpass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/kvpnc/metadata.xml b/net-misc/kvpnc/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-misc/kvpnc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/lanmap/metadata.xml b/net-misc/lanmap/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-misc/lanmap/metadata.xml
+++ b/net-misc/lanmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
index 843e423a9cc0..63cad2ea36e6 100644
--- a/net-misc/lcr/metadata.xml
+++ b/net-misc/lcr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="asterisk">net-misc/asterisk channel driver</flag>
 		<flag name="misdn">net-misc/misdn driver</flag>
diff --git a/net-misc/libres3/metadata.xml b/net-misc/libres3/metadata.xml
index d41c60d2594c..cdb074ca6c74 100644
--- a/net-misc/libres3/metadata.xml
+++ b/net-misc/libres3/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tomboy64@sina.cn</email>
 	</maintainer>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		LibreS3 adds an S3-compatibility layer over SX Cluster. With LibreS3 you access the data stored in your storage cluster using any existing S3 client.
 	</longdescription>
diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
index f70b8cce14b4..530ee1c4fe7b 100644
--- a/net-misc/libteam/metadata.xml
+++ b/net-misc/libteam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-needed</herd>
 	<use>
 		<flag name="zmq">Build witch <pkg>net-libs/zeromq</pkg> support</flag>
 	</use>
diff --git a/net-misc/linux-eoip/metadata.xml b/net-misc/linux-eoip/metadata.xml
index 41458c8e4043..597c68880bb2 100644
--- a/net-misc/linux-eoip/metadata.xml
+++ b/net-misc/linux-eoip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -12,6 +11,10 @@
 	<name>Sergey Popov</name>
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<maintainer>
 		<email>nuclearcat@nuclearcat.com</email>
diff --git a/net-misc/livestreamer/metadata.xml b/net-misc/livestreamer/metadata.xml
index 0cfaa62977f9..6e2d5a31369e 100644
--- a/net-misc/livestreamer/metadata.xml
+++ b/net-misc/livestreamer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>the.telvanni@gmail.com</email>
 		<name>Guillaume Lespinasse</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chrippa/livestreamer</remote-id>
 	</upstream>
diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml
index 18b686c7ac57..7e21d5b7500d 100644
--- a/net-misc/lksctp-tools/metadata.xml
+++ b/net-misc/lksctp-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
     <description>
@@ -16,6 +15,10 @@
       if it works
     </description>
   </maintainer>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lksctp</remote-id>
   </upstream>
diff --git a/net-misc/logmein-hamachi/metadata.xml b/net-misc/logmein-hamachi/metadata.xml
index c9fafa9c83d1..08fd0be8e070 100644
--- a/net-misc/logmein-hamachi/metadata.xml
+++ b/net-misc/logmein-hamachi/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nonno.cicala@libero.it</email>
 		<name>Simone Scanzoni</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/mdidentd/metadata.xml b/net-misc/mdidentd/metadata.xml
index 6ef15e900f17..097975e3adc2 100644
--- a/net-misc/mdidentd/metadata.xml
+++ b/net-misc/mdidentd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
index 10c0a3df9c98..336d2e78776e 100644
--- a/net-misc/mediatomb/metadata.xml
+++ b/net-misc/mediatomb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
   <maintainer>
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
   </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <use>
     <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
     <flag name="flac">Enable FLAC metadata/artwork support</flag>
diff --git a/net-misc/mindterm/metadata.xml b/net-misc/mindterm/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/net-misc/mindterm/metadata.xml
+++ b/net-misc/mindterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-misc/mobile-broadband-provider-info/metadata.xml
+++ b/net-misc/mobile-broadband-provider-info/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index c10566d5d9a6..df4898fdec4f 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="mbim">Enable MBIM modem protocol</flag>
 		<flag name="qmi">Enable support for the QMI modem protocol used by
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index 20177dc2b05e..55e7202afeb0 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>rainbow@irh.it</email>
 		<name>rainbow</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nemesis</remote-id>
 	</upstream>
diff --git a/net-misc/netfleet/metadata.xml b/net-misc/netfleet/metadata.xml
index 426f5803788c..814c9e0b8edd 100644
--- a/net-misc/netfleet/metadata.xml
+++ b/net-misc/netfleet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">netfleet</remote-id>
 	</upstream>
diff --git a/net-misc/netkit-fingerd/metadata.xml b/net-misc/netkit-fingerd/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/netkit-fingerd/metadata.xml
+++ b/net-misc/netkit-fingerd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/netkit-rsh/metadata.xml b/net-misc/netkit-rsh/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/netkit-rsh/metadata.xml
+++ b/net-misc/netkit-rsh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/netkit-rwho/metadata.xml b/net-misc/netkit-rwho/metadata.xml
index 43ff75467369..fcdeee5abccf 100644
--- a/net-misc/netkit-rwho/metadata.xml
+++ b/net-misc/netkit-rwho/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
+  <maintainer>
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/netpipes/metadata.xml b/net-misc/netpipes/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-misc/netpipes/metadata.xml
+++ b/net-misc/netpipes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-misc/netstat-nat/metadata.xml
+++ b/net-misc/netstat-nat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index e210f22ed961..0c22cbb8c00b 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index e210f22ed961..0c22cbb8c00b 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index e210f22ed961..0c22cbb8c00b 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index e210f22ed961..0c22cbb8c00b 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-sstp/metadata.xml b/net-misc/networkmanager-sstp/metadata.xml
index 484deacc4471..ffae8fa43aa2 100644
--- a/net-misc/networkmanager-sstp/metadata.xml
+++ b/net-misc/networkmanager-sstp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
@@ -12,6 +11,10 @@
 	<name>Sergey Popov</name>
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">sstp-client</remote-id>
 </upstream>
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index e210f22ed961..0c22cbb8c00b 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-	<maintainer>
+<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index ed6d30f37115..25cc0483a0c4 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
 			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index 185e561eac9f..40d676929ec1 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mozilla</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
@@ -10,6 +9,10 @@
 		<email>anarchy@gentoo.org</email>
 		<name>Jory A. Pratt</name>
 	</maintainer>
+	<maintainer>
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">mgorny/npapi-sdk</remote-id>
 	</upstream>
diff --git a/net-misc/ntp/metadata.xml b/net-misc/ntp/metadata.xml
index 50f686d2f43f..cfa6d709ecf4 100644
--- a/net-misc/ntp/metadata.xml
+++ b/net-misc/ntp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>
 NTP is a protocol designed to synchronize the clocks of computers over a network. NTP 
 version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a 
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
index 1255cb0c9dc0..437701bff2cd 100644
--- a/net-misc/nx/metadata.xml
+++ b/net-misc/nx/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>nx</herd>
+<maintainer>
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
 <longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
 </pkgmetadata>
diff --git a/net-misc/nxplayer/metadata.xml b/net-misc/nxplayer/metadata.xml
index 578fd5e78458..97ab237c6099 100644
--- a/net-misc/nxplayer/metadata.xml
+++ b/net-misc/nxplayer/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>Enterprise Client is a free easy-to-use connection interface to allow quick access to your remote host where you have installed one of the NoMachine products. It's available for those who prefer just a standalone client application, rather than the NoMachine server/client app, either because regulatory requirements dictate that thin clients must install \“client-side\” software only, or simply because a scaled-down client app is your personal preference.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index cfa796d87054..a2ffa4bfa99b 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
@@ -10,6 +9,10 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans (proxy)</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		OpenNTPD is a FREE, easy to use implementation of the Network Time
 		Protocol. It provides the ability to sync the local clock to remote
diff --git a/net-misc/openssh-blacklist/metadata.xml b/net-misc/openssh-blacklist/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/openssh-blacklist/metadata.xml
+++ b/net-misc/openssh-blacklist/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index ec8bad168c76..0997b8b0c5ec 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer restrict="net-misc/openssh[ldap]">
     <email>robbat2@gentoo.org</email>
     <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
   </maintainer>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>
 OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
 increasing numbers of people on the Internet are coming to rely on. Many users of telnet, 
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index c346b732bbd3..10706eb21d04 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -7,7 +7,10 @@
 <maintainer>
 <email>prometheanfire@gentoo.org</email>
 </maintainer>
-<herd>virtualization</herd>
+<maintainer>
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
 <use>
 	<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
 	<flag name="pyside">Use <pkg>dev-python/pyside</pkg> instead of <pkg>dev-python/PyQt4</pkg> for Python/Qt-bindings when building with USE=monitor.</flag>
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index c5d8c73e53a3..76fd4b106d4d 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">packeth</remote-id>
 	</upstream>
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index 3fcf9314ee9c..e3f4cbf2e449 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>pyxlcy@gmail.com</email>
 	<description>Please assign bugs</description>
@@ -10,6 +9,10 @@
 	<email>pacho@gentoo.org</email>
 	<description>proxy-maintainer, please CC on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 <flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
 	specified, pavuk will include features to stress test web sites using an
diff --git a/net-misc/pipes/metadata.xml b/net-misc/pipes/metadata.xml
index bd1cbeb8e1f9..3db99ca629ce 100644
--- a/net-misc/pipes/metadata.xml
+++ b/net-misc/pipes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 I just noticed that netpipes doesn't support bidirectional pipes.
 So I made my own version.
diff --git a/net-misc/polly/metadata.xml b/net-misc/polly/metadata.xml
index 14d2eabbeacb..a8fc0f18e750 100644
--- a/net-misc/polly/metadata.xml
+++ b/net-misc/polly/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">polly</remote-id>
 	</upstream>
diff --git a/net-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
index f493acd58653..dbd59a69c49f 100644
--- a/net-misc/pps-tools/metadata.xml
+++ b/net-misc/pps-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ago/pps-tools</remote-id>
   </upstream>
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
index 2eadaf8a7e2f..21205b281768 100644
--- a/net-misc/pssh/metadata.xml
+++ b/net-misc/pssh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">parallel-ssh</remote-id>
 	</upstream>
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index d4d02bcdabba..511627363af4 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>honza.breuer@gmail.com</email>
 		<name>Jan Breuer</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="debug">Enable debugging informations</flag>
 		<flag name="experimental">Enable experimental features</flag>
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
index d26da4036070..1644d8bc7575 100644
--- a/net-misc/pycnb/metadata.xml
+++ b/net-misc/pycnb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yac@gentoo.org</email>
     <name>Jan Matejka</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
index 424f8b70442c..5db29427ae60 100644
--- a/net-misc/pyhoca-cli/metadata.xml
+++ b/net-misc/pyhoca-cli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>
 PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go.
 	</longdescription>
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
index 1edb00b503c0..99ff893038d8 100644
--- a/net-misc/pyhoca-gui/metadata.xml
+++ b/net-misc/pyhoca-gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>
 PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.).
 
diff --git a/net-misc/pymazon/metadata.xml b/net-misc/pymazon/metadata.xml
index 4f200ad3b95b..8299a763f40b 100644
--- a/net-misc/pymazon/metadata.xml
+++ b/net-misc/pymazon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pymazon</remote-id>
 	</upstream>
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
index 710937bd9d58..e102151ca032 100644
--- a/net-misc/python-x2go/metadata.xml
+++ b/net-misc/python-x2go/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>
 The Python X2Go module integrates X2Go client support into your python programmes.
 Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui"
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index a796a4ea0f0e..a13dd5b71d10 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">catkin</remote-id>
 	</upstream>
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 175f3d5aa56a..8d880fd9bc07 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="git">Enable git (version control system) support</flag>
 	</use>
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index c6694bd40de1..27bc871d0b74 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/metadata.xml
@@ -9,7 +9,10 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
-<herd>proxy-maintainers</herd>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index ffdcb3d23eb3..f040f077789b 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Hhoran</name>
 		<description>Proxy maintainer, to be assigned all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 0ae013fa5f95..d98da4ca574f 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
 	</upstream>
diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml
index 49d68040ba4c..0ea1a5e7e8c0 100644
--- a/net-misc/rygel/metadata.xml
+++ b/net-misc/rygel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="tracker">Install dependencies for the tracker plugin</flag>
     <flag name="transcode">Install dependencies for transcoding support</flag>
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 06966dc83fc3..0b579e115a6d 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>igor@itesten.com</email>
     <name>Igor Testen</name>
@@ -11,6 +10,10 @@
     <email>titanofold@gentoo.org</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Command line client for Amazon S3.
   </longdescription>
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index d2670aeb5e57..94e4603ee75c 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -6,7 +6,10 @@
     <name>Vladimir Pavljuchenkov</name>
     <description>Primary maintainer.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     This small program receives UDP datagrams on a given port, and resends
     those datagrams to a specified set of receivers. In addition, a
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index fa93e6debbf7..669cdaf86416 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ser2net</remote-id>
 	</upstream>
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/net-misc/shout/metadata.xml
+++ b/net-misc/shout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index 06dbd3e5c3f6..e7f31aa4c75b 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-  <maintainer>
+<maintainer>
   	<email>rogerx.oss@gmail.com</email>
 	<name>Roger Zauner</name>
 	<description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
     <flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
index 36ddf567af2e..c2ed54a2a79f 100644
--- a/net-misc/slimrat/metadata.xml
+++ b/net-misc/slimrat/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>premek@vohnout.cz</email>
 		<name>Premysl Vohnout</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="X">Install also GUI client</flag>
 	</use>
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index 353711a0c96e..38c1ed990cee 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">smb4k</remote-id>
 		<bugs-to>http://sourceforge.net/p/smb4k/tickets/</bugs-to>
diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml
index b5da052d4760..7c8b361af685 100644
--- a/net-misc/smbc/metadata.xml
+++ b/net-misc/smbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
+	<maintainer>
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
 	<longdescription>
 Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters.
 </longdescription>
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 97267d74c9ec..9179818046c5 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>virtualization</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer>
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="dbus">Support for desktop integration such as
 			automounting and other APIs exposed by your DE via D-Bus</flag>
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
index 9724727cb6fe..050bd1b807b6 100644
--- a/net-misc/ssh-askpass-fullscreen/metadata.xml
+++ b/net-misc/ssh-askpass-fullscreen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">atj/ssh-askpass-fullscreen</remote-id>
 	</upstream>
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 2461dd9ed7ef..a800ed4d4701 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
@@ -12,6 +11,10 @@
 		<name> Jing, Cheng</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sshpass</remote-id>
 	</upstream>
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 9beed9d39f88..095c1238fa81 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -14,6 +13,10 @@
 		<email>m.j.everitt@iee.org</email>
 		<name>Michael Everitt</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 4c2255b20762..7d74383db7b0 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -6,7 +6,10 @@
     <name>Vladimir Pavljuchenkov</name>
     <description>Primary maintainer.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Stargazer is a powerful (inter)net billing system, capable of gathering
     traffic statistics from many sources (such as NetFlow protocol,
diff --git a/net-misc/streamtuner/metadata.xml b/net-misc/streamtuner/metadata.xml
index 1c466c63d014..4c1a11aec65c 100644
--- a/net-misc/streamtuner/metadata.xml
+++ b/net-misc/streamtuner/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="shout">Enable shoutcast plug-in.</flag>
     <flag name="xiph">Enable xiph.org plug-in.</flag>
diff --git a/net-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml
index 82aa620760f7..f27e339c1a10 100644
--- a/net-misc/suite3270/metadata.xml
+++ b/net-misc/suite3270/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>s390</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
@@ -13,6 +11,14 @@
     <name>Jesse Farinacci</name>
     <description>Maintainer by proxy, please CC on all bugs.</description>
   </maintainer>
+  <maintainer>
+    <email>s390@gentoo.org</email>
+    <name>Gentoo Linux s390 Development</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">x3270</remote-id>
   </upstream>
diff --git a/net-misc/switzerland/metadata.xml b/net-misc/switzerland/metadata.xml
index f1752c727383..292b664e96bb 100644
--- a/net-misc/switzerland/metadata.xml
+++ b/net-misc/switzerland/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Switzerland is an open source software tool for testing the integrity of
 		data communications over networks, ISPs and firewalls. It will spot IP
diff --git a/net-misc/sx/metadata.xml b/net-misc/sx/metadata.xml
index 32f6c93e6b37..fdfe57eae112 100644
--- a/net-misc/sx/metadata.xml
+++ b/net-misc/sx/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tomboy64@sina.cn</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		SX Cluster is a reliable, fully distributed cluster solution for your data storage needs, released under the GPL licence. With SX Cluster you aggregate the disk space available on multiple servers and merge it into a single storage system. The cluster makes sure that your data is always replicated over multiple nodes (the exact number of copies is defined by the sysadmin) and synchronized. Additionally Sx has built-in support for deduplication, client-side encryption, on-the-fly compression and much more.
 	</longdescription>
diff --git a/net-misc/tcpsound/metadata.xml b/net-misc/tcpsound/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-misc/tcpsound/metadata.xml
+++ b/net-misc/tcpsound/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 6a53856dc861..5d86d8b1d20e 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wine</herd>
 	<maintainer>
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>		
@@ -10,6 +9,10 @@
 		<email>np-hardass@gentoo.org</email>
 		<name>NP-Hardass</name>		
 	</maintainer>
+	<maintainer>
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
 	<use>
 		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled wine.</flag>
 	</use>
diff --git a/net-misc/termpkg/metadata.xml b/net-misc/termpkg/metadata.xml
index 08ef7eeecbe7..9d87a337e627 100644
--- a/net-misc/termpkg/metadata.xml
+++ b/net-misc/termpkg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		Termpkg is a terminal server daemon and simple telnet like client.
 		Allows access to one or more serial ports through the telnet protocol.
diff --git a/net-misc/tipcutils/metadata.xml b/net-misc/tipcutils/metadata.xml
index 951d18820402..455557fd570b 100644
--- a/net-misc/tipcutils/metadata.xml
+++ b/net-misc/tipcutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tokiclover@gmail.com</email>
 		<description>Maintainer. Assign bugs on him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tipc</remote-id>
 	</upstream>
diff --git a/net-misc/ucarp/metadata.xml b/net-misc/ucarp/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/net-misc/ucarp/metadata.xml
+++ b/net-misc/ucarp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/udpcast/metadata.xml b/net-misc/udpcast/metadata.xml
index 526d84b8a3cd..c9f4f45b0ff3 100644
--- a/net-misc/udpcast/metadata.xml
+++ b/net-misc/udpcast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 UDPcast is a file transfer tool that can send data simultaneously to 
 many destinations on a LAN. This can for instance be used to install 
diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
index e172f68d2263..99c97ccbb58f 100644
--- a/net-misc/uftp/metadata.xml
+++ b/net-misc/uftp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>azamat.hackimov@gmail.com</email>
 	<name>Azamat Hackimov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="server">Install uftp server daemon</flag>
 </use>
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
index 712c2d256e0a..4accf104ff6a 100644
--- a/net-misc/vconfig/metadata.xml
+++ b/net-misc/vconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription>
 		The vconfig program allows you to create and remove vlan-devices on a
 		vlan enabled kernel. Vlan-devices are virtual ethernet devices which
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index ac0f4c2e6718..697602ceb3be 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nvinson234@gmail.com</email>
     <name>Nicholas Vinson</name>
@@ -14,6 +13,10 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="pcap">
     Enable the pcap-based plugin that allows creating a switch against
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 4708913096e3..2c40f6eaa45a 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="rdp">Enable access to Windows RDP protocol using
 			<pkg>net-misc/rdesktop</pkg></flag>
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index f140c75c3b91..99046455826c 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
 </use>
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 32f93b3b34cf..d2b6883844bf 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lorand.jakab@schweiz.ch</email>
     <name>Lorand Jakab</name>
@@ -10,6 +9,10 @@
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
   </use>
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 87ab6aa0aaaf..2cbd7327046a 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
 <use>
  <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
  <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-misc/whois/metadata.xml
+++ b/net-misc/whois/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/x2goclient/metadata.xml b/net-misc/x2goclient/metadata.xml
index f009de1b9d2d..81a9d86b61e9 100644
--- a/net-misc/x2goclient/metadata.xml
+++ b/net-misc/x2goclient/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>The X2Go Qt client</longdescription>
 </pkgmetadata>
diff --git a/net-misc/x2goserver/metadata.xml b/net-misc/x2goserver/metadata.xml
index b85de2f29ab3..2ded1c5d1935 100644
--- a/net-misc/x2goserver/metadata.xml
+++ b/net-misc/x2goserver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>The X2Go server</longdescription>
 	<use>
 		<flag name="fuse">Use <pkg>sys-fs/sshfs-fuse</pkg> to allow shared folders</flag>
diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml
index 9ef9c615e0c0..f06fb1626360 100644
--- a/net-misc/yandex-disk/metadata.xml
+++ b/net-misc/yandex-disk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueboar@gentoo.org</email>
 		<name>Vladimir Romanov</name>
@@ -12,4 +11,8 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/ytalk/metadata.xml b/net-misc/ytalk/metadata.xml
index a2cb70369f03..bdc1b75aa8a4 100644
--- a/net-misc/ytalk/metadata.xml
+++ b/net-misc/ytalk/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>keso@impul.se</email>
 		<name>Andreas King</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-nds/jxplorer/metadata.xml b/net-nds/jxplorer/metadata.xml
index a4dff8cda201..30a8950cfd27 100644
--- a/net-nds/jxplorer/metadata.xml
+++ b/net-nds/jxplorer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jxplorer</remote-id>
 	</upstream>
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index b10db0afc31a..3a11f1f72d92 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>ldap</herd>
     <maintainer>
         <email>ldap-bugs@gentoo.org</email>
     </maintainer>
diff --git a/net-nds/phpldapadmin/metadata.xml b/net-nds/phpldapadmin/metadata.xml
index 45abd7cf939d..a331bf92279e 100644
--- a/net-nds/phpldapadmin/metadata.xml
+++ b/net-nds/phpldapadmin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
   <maintainer>
     <email>vostorga@gentoo.org</email>
     <name>Víctor Ostorga</name>
@@ -10,6 +9,10 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
+  <maintainer>
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
   <longdescription>
   phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server.
 </longdescription>
diff --git a/net-nds/portmap/metadata.xml b/net-nds/portmap/metadata.xml
index e72c243d236f..c9e13ee6a3c9 100644
--- a/net-nds/portmap/metadata.xml
+++ b/net-nds/portmap/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>net-fs</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-nds/rpcbind/metadata.xml b/net-nds/rpcbind/metadata.xml
index 1fa86f95fe71..a753d278fd5a 100644
--- a/net-nds/rpcbind/metadata.xml
+++ b/net-nds/rpcbind/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-fs</herd>
 	<use>
 		<flag name="warmstarts">Enables rpcbind to cache configuration for warm restarts</flag>
 	</use>
diff --git a/net-nds/shelldap/metadata.xml b/net-nds/shelldap/metadata.xml
index 7027b2bf8a8e..1eb34dfae80b 100644
--- a/net-nds/shelldap/metadata.xml
+++ b/net-nds/shelldap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat Hackimov</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		A handy shell-like interface for browsing LDAP servers and editing their
 		content. It keeps command history, has sane autocompletes, credential caching,
diff --git a/net-nds/smbldap-tools/metadata.xml b/net-nds/smbldap-tools/metadata.xml
index 2ed0a54726f0..4eb0bd3286db 100644
--- a/net-nds/smbldap-tools/metadata.xml
+++ b/net-nds/smbldap-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba</name>
+</maintainer>
 <longdescription>
 smbldap-tools is a Idealx contribution to samba database management through ldap
 backend.
diff --git a/net-news/blam/metadata.xml b/net-news/blam/metadata.xml
index e01adbb307db..e372675ec783 100644
--- a/net-news/blam/metadata.xml
+++ b/net-news/blam/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index f559e94e996e..b06b28c28f88 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>vostorga@gentoo.org</email>
 		<name>Victor Ostorga</name>
@@ -10,6 +9,10 @@
 		<email>iskren.s@gmail.com</email>
 		<name>Iskren Slavov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	Liferea is a news aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds.  It's
 	based on gnome and xulrunner/webkit.
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml
index a331f411d871..d0277627a88c 100644
--- a/net-news/quiterss/metadata.xml
+++ b/net-news/quiterss/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>nikoli@gmx.us</email>
     <name>Nikoli</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg>
       or <pkg>dev-qt/qtphonon</pkg></flag>
diff --git a/net-news/rawdog/metadata.xml b/net-news/rawdog/metadata.xml
index f2ed6f38b1fe..76d18f73ec64 100644
--- a/net-news/rawdog/metadata.xml
+++ b/net-news/rawdog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<maintainer>
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
 <longdescription>
 rawdog is an RSS Aggregator Without Delusions Of Grandeur. Written in Python,
 it uses Mark Pilgrim's feed parser. It runs from cron, collects articles from
diff --git a/net-news/rsstail/metadata.xml b/net-news/rsstail/metadata.xml
index 351ed5142b29..daa7347553de 100644
--- a/net-news/rsstail/metadata.xml
+++ b/net-news/rsstail/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<longdescription lang="en">
 		RSSTail is more or less an rss reader: it monitors an rss-feed and if it
 		detects a new entry it'll emit only that new entry.
diff --git a/net-news/rsstool/metadata.xml b/net-news/rsstool/metadata.xml
index 4494d9a01242..e6ec692660e8 100644
--- a/net-news/rsstool/metadata.xml
+++ b/net-news/rsstool/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">rsstool</remote-id>
 	</upstream>
diff --git a/net-news/yencode/metadata.xml b/net-news/yencode/metadata.xml
index ffdc38f1f4d4..cdf1d9a14657 100644
--- a/net-news/yencode/metadata.xml
+++ b/net-news/yencode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">yencode</remote-id>
 	</upstream>
diff --git a/net-news/yydecode/metadata.xml b/net-news/yydecode/metadata.xml
index 0dd0b4cf1e3d..be6dcc573177 100644
--- a/net-news/yydecode/metadata.xml
+++ b/net-news/yydecode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">yydecode</remote-id>
 	</upstream>
diff --git a/net-nntp/brag/metadata.xml b/net-nntp/brag/metadata.xml
index a1e90794ffc0..e5d76ef8166a 100644
--- a/net-nntp/brag/metadata.xml
+++ b/net-nntp/brag/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-news</herd>
   <upstream>
     <remote-id type="sourceforge">brag</remote-id>
   </upstream>
diff --git a/net-nntp/hellanzb/metadata.xml b/net-nntp/hellanzb/metadata.xml
index f91da9dc28aa..21e6fceb2634 100644
--- a/net-nntp/hellanzb/metadata.xml
+++ b/net-nntp/hellanzb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
diff --git a/net-nntp/inn/metadata.xml b/net-nntp/inn/metadata.xml
index 9b3ffff95280..0aa3ca880592 100644
--- a/net-nntp/inn/metadata.xml
+++ b/net-nntp/inn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 <use>
 	<flag name="innkeywords">Enable automatic keyword generation support</flag>
 	<flag name="inntaggedhash">Use tagged hash table for history (disables large
diff --git a/net-nntp/kwooty/metadata.xml b/net-nntp/kwooty/metadata.xml
index b741437bc16a..036780115854 100644
--- a/net-nntp/kwooty/metadata.xml
+++ b/net-nntp/kwooty/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>net-news</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kwooty</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=285032</bugs-to>
diff --git a/net-nntp/leafnode/metadata.xml b/net-nntp/leafnode/metadata.xml
index a1f1b73219d4..7375f2d0d5d0 100644
--- a/net-nntp/leafnode/metadata.xml
+++ b/net-nntp/leafnode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">leafnode</remote-id>
 	</upstream>
diff --git a/net-nntp/newspost/metadata.xml b/net-nntp/newspost/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/newspost/metadata.xml
+++ b/net-nntp/newspost/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/nzb/metadata.xml b/net-nntp/nzb/metadata.xml
index 3344595f6cf7..5844158829cb 100644
--- a/net-nntp/nzb/metadata.xml
+++ b/net-nntp/nzb/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>net-news</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nzb</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=113793</bugs-to>
diff --git a/net-nntp/nzbget/metadata.xml b/net-nntp/nzbget/metadata.xml
index 22a02f229788..7bc61c2a256e 100644
--- a/net-nntp/nzbget/metadata.xml
+++ b/net-nntp/nzbget/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<maintainer>
 		<email>swegener@gentoo.org</email>
 		<name>Sven Wegener</name>
diff --git a/net-nntp/pan/metadata.xml b/net-nntp/pan/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-nntp/pan/metadata.xml
+++ b/net-nntp/pan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-nntp/slrn/metadata.xml b/net-nntp/slrn/metadata.xml
index 72b6f505360d..20f31fc54a25 100644
--- a/net-nntp/slrn/metadata.xml
+++ b/net-nntp/slrn/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-news</herd>
 	<use>
 		<flag name="uudeview">Add support for yEnc coding and more using
 		<pkg>dev-libs/uulib</pkg></flag>
diff --git a/net-nntp/slrnconf/metadata.xml b/net-nntp/slrnconf/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/slrnconf/metadata.xml
+++ b/net-nntp/slrnconf/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/sn/metadata.xml b/net-nntp/sn/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/sn/metadata.xml
+++ b/net-nntp/sn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/suck/metadata.xml b/net-nntp/suck/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/suck/metadata.xml
+++ b/net-nntp/suck/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 34720248271c..18e5f2897a18 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 <use>
 <flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
 <flag name="evil">Let tin generate a message ID</flag>
diff --git a/net-nntp/xrn/metadata.xml b/net-nntp/xrn/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/xrn/metadata.xml
+++ b/net-nntp/xrn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 </pkgmetadata>
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index ffff80acce27..c6db2af403e3 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <use>
     <flag name="daemon">Enable amule daemon</flag>
     <flag name="remote">Enable remote controlling of the client</flag>
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index 0b7af7b829ed..edff95fc8a4e 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 	</use>
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 94e1a894deb2..0f66c622b4d1 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="1stclassmsg">Enable first-class Bitcoin message tools</flag>
 		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 960bbf14b749..61c3851e1580 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="addrindex">Enable BtcDrak's addrindex patch</flag>
 		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
diff --git a/net-p2p/bitcoinxt-qt/metadata.xml b/net-p2p/bitcoinxt-qt/metadata.xml
index ad8039bd2613..f96f0fabd16f 100644
--- a/net-p2p/bitcoinxt-qt/metadata.xml
+++ b/net-p2p/bitcoinxt-qt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>rono@sentuny.com</email>
 		<name>Ron OHara</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
diff --git a/net-p2p/bitcoinxtd/metadata.xml b/net-p2p/bitcoinxtd/metadata.xml
index 3d4fb251aa79..571c7d11e050 100644
--- a/net-p2p/bitcoinxtd/metadata.xml
+++ b/net-p2p/bitcoinxtd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
 		<email>rono@sentuny.com</email>
 		<name>Ron OHara</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="doc"> Include documentatio</flag>
 		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
diff --git a/net-p2p/bittornado/metadata.xml b/net-p2p/bittornado/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/bittornado/metadata.xml
+++ b/net-p2p/bittornado/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml
index ee823cc1d09d..a846f75469a9 100644
--- a/net-p2p/classified-ads/metadata.xml
+++ b/net-p2p/classified-ads/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>proxy-maintainers</herd>
         <maintainer>
                 <email>idella4@gentoo.org</email>
         </maintainer>
@@ -10,6 +9,10 @@
 		<name>Antti Järvinen</name>
 		<description>proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 	<longdescription lang="en">
    Classified ads is an attempt to re-produce parts of the functionality
    that went away when Usenet news ceased to exist. This attempt tries to
diff --git a/net-p2p/createtorrent/metadata.xml b/net-p2p/createtorrent/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/createtorrent/metadata.xml
+++ b/net-p2p/createtorrent/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/ctcs/metadata.xml b/net-p2p/ctcs/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/ctcs/metadata.xml
+++ b/net-p2p/ctcs/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/ctorrent/metadata.xml b/net-p2p/ctorrent/metadata.xml
index 41020ae5888f..2ca2e0370ffb 100644
--- a/net-p2p/ctorrent/metadata.xml
+++ b/net-p2p/ctorrent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">dtorrent</remote-id>
 	</upstream>
diff --git a/net-p2p/dbhub/metadata.xml b/net-p2p/dbhub/metadata.xml
index b801d1628357..80d7d11fac92 100644
--- a/net-p2p/dbhub/metadata.xml
+++ b/net-p2p/dbhub/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <use>
     <flag name="switch_user">Enable support for switching user</flag>
   </use>
diff --git a/net-p2p/dclib/metadata.xml b/net-p2p/dclib/metadata.xml
index b6e0d287755a..756cd0a7da7a 100644
--- a/net-p2p/dclib/metadata.xml
+++ b/net-p2p/dclib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">wxdcgui</remote-id>
 	</upstream>
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 40f4cb0abef6..5503193c4bba 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 <use>
 	<flag name="setproctitle">Install dependencies needed for beautifying
 		the process name</flag>
diff --git a/net-p2p/ed2k_hash/metadata.xml b/net-p2p/ed2k_hash/metadata.xml
index d3e5908971f1..cfac4dfb2252 100644
--- a/net-p2p/ed2k_hash/metadata.xml
+++ b/net-p2p/ed2k_hash/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">ed2k-tools</remote-id>
 	</upstream>
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 22fd8fd7bb0a..fa7649898574 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>nikoli@gmx.us</email>
   <name>Nikoli</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
   EiskaltDC++ is a multi-platform program that uses the Direct Connect and
   ADC protocol. It is compatible with other DC clients, such as the original DC
diff --git a/net-p2p/fms/metadata.xml b/net-p2p/fms/metadata.xml
index f3900fd7c451..3953337e6fff 100644
--- a/net-p2p/fms/metadata.xml
+++ b/net-p2p/fms/metadata.xml
@@ -5,7 +5,6 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<herd>net-p2p</herd>
 	<use>
 		<flag name="frost">Add support for frost boards</flag>
 	</use>
diff --git a/net-p2p/gift-ares/metadata.xml b/net-p2p/gift-ares/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/gift-ares/metadata.xml
+++ b/net-p2p/gift-ares/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/gift-fasttrack/metadata.xml b/net-p2p/gift-fasttrack/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/gift-fasttrack/metadata.xml
+++ b/net-p2p/gift-fasttrack/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/gift-gnutella/metadata.xml b/net-p2p/gift-gnutella/metadata.xml
index 166c0c557414..057aae0a8b60 100644
--- a/net-p2p/gift-gnutella/metadata.xml
+++ b/net-p2p/gift-gnutella/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">gift</remote-id>
 	</upstream>
diff --git a/net-p2p/gift-openft/metadata.xml b/net-p2p/gift-openft/metadata.xml
index 166c0c557414..057aae0a8b60 100644
--- a/net-p2p/gift-openft/metadata.xml
+++ b/net-p2p/gift-openft/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">gift</remote-id>
 	</upstream>
diff --git a/net-p2p/gift/metadata.xml b/net-p2p/gift/metadata.xml
index f3039a551975..54a03aebe364 100644
--- a/net-p2p/gift/metadata.xml
+++ b/net-p2p/gift/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <use>
     <flag name="ares">pull in Ares plugin</flag>
     <flag name="fasttrack">pull in FastTrack plugin</flag>
diff --git a/net-p2p/giftcurs/metadata.xml b/net-p2p/giftcurs/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/giftcurs/metadata.xml
+++ b/net-p2p/giftcurs/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/gnut/metadata.xml b/net-p2p/gnut/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/gnut/metadata.xml
+++ b/net-p2p/gnut/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/gtk-gnutella/metadata.xml b/net-p2p/gtk-gnutella/metadata.xml
index ab027197642b..a6118484fbb2 100644
--- a/net-p2p/gtk-gnutella/metadata.xml
+++ b/net-p2p/gtk-gnutella/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer>
 		<email>graaff@gentoo.org</email>
 	</maintainer>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">gtk-gnutella</remote-id>
 	</upstream>
diff --git a/net-p2p/gtorrentviewer/metadata.xml b/net-p2p/gtorrentviewer/metadata.xml
index a2e44fa192cb..a11721e867cf 100644
--- a/net-p2p/gtorrentviewer/metadata.xml
+++ b/net-p2p/gtorrentviewer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">gtorrentviewer</remote-id>
 	</upstream>
diff --git a/net-p2p/hx/metadata.xml b/net-p2p/hx/metadata.xml
index b8f4c471b1cc..b81beba48863 100644
--- a/net-p2p/hx/metadata.xml
+++ b/net-p2p/hx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <longdescription>
 		hx is an Hotline Client under the GPL for Linux/Unixes.
 		It supports the Hotline Protocol from 1.2.3 up to 1.5+.
diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml
index 15efd3e70669..e523c80c9a4f 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-p2p/i2p/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>tharvik@gmail.com</email>
 	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
 <use>
 <flag name="nls">Adds Native Language Support using GNU gettext.</flag>
diff --git a/net-p2p/imule/metadata.xml b/net-p2p/imule/metadata.xml
index b1f9abb52990..274c41727fba 100644
--- a/net-p2p/imule/metadata.xml
+++ b/net-p2p/imule/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+<email>java@gentoo.org</email>
+<name>Java</name>
+</maintainer>
 <longdescription>A P2P file-sharing application designed to work on top of the I2P or Kad network stacks.</longdescription>
 <use>
 <flag name="nls">Adds Native Language Support using GNU gettext.</flag>
diff --git a/net-p2p/kmldonkey/metadata.xml b/net-p2p/kmldonkey/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/net-p2p/kmldonkey/metadata.xml
+++ b/net-p2p/kmldonkey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 566ffb324a68..e26805bfb20f 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>net-p2p</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
   <use>
     <flag name="bwscheduler">Schedule upload and download limits over a period of a week</flag>
     <flag name="downloadorder">Specify the download order of a multi-file torrent</flag>
diff --git a/net-p2p/linuxdcpp/metadata.xml b/net-p2p/linuxdcpp/metadata.xml
index a7223bf09a4e..719d5127c379 100644
--- a/net-p2p/linuxdcpp/metadata.xml
+++ b/net-p2p/linuxdcpp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="launchpad">linuxdcpp</remote-id>
 	</upstream>
diff --git a/net-p2p/microdc/metadata.xml b/net-p2p/microdc/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/microdc/metadata.xml
+++ b/net-p2p/microdc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/microdc2/metadata.xml b/net-p2p/microdc2/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/microdc2/metadata.xml
+++ b/net-p2p/microdc2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/mktorrent-borg/metadata.xml b/net-p2p/mktorrent-borg/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/mktorrent-borg/metadata.xml
+++ b/net-p2p/mktorrent-borg/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/mktorrent/metadata.xml b/net-p2p/mktorrent/metadata.xml
index 5907da4c707e..e3fda369153e 100644
--- a/net-p2p/mktorrent/metadata.xml
+++ b/net-p2p/mktorrent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">mktorrent</remote-id>
 	</upstream>
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index bc22bf0cb84c..63b161b36f45 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <longdescription>An ocaml client to access the eDonkey network.</longdescription>
   <use>
     <flag name="bittorrent">enable bittorrent support</flag>
diff --git a/net-p2p/myster/metadata.xml b/net-p2p/myster/metadata.xml
index 7a9e12eb9c4b..a9c2c4e15f5a 100644
--- a/net-p2p/myster/metadata.xml
+++ b/net-p2p/myster/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">myster</remote-id>
 	</upstream>
diff --git a/net-p2p/nap/metadata.xml b/net-p2p/nap/metadata.xml
index aa0f3664825f..097975e3adc2 100644
--- a/net-p2p/nap/metadata.xml
+++ b/net-p2p/nap/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/nicotine+/metadata.xml b/net-p2p/nicotine+/metadata.xml
index 387556b1d707..6da35f0d9d26 100644
--- a/net-p2p/nicotine+/metadata.xml
+++ b/net-p2p/nicotine+/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<maintainer>
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
diff --git a/net-p2p/opendchub/metadata.xml b/net-p2p/opendchub/metadata.xml
index 66c6da71d708..053745a86825 100644
--- a/net-p2p/opendchub/metadata.xml
+++ b/net-p2p/opendchub/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <upstream>
     <remote-id type="sourceforge">opendchub</remote-id>
   </upstream>
diff --git a/net-p2p/phxd/metadata.xml b/net-p2p/phxd/metadata.xml
index 02b118029ce4..197dcc5a6134 100644
--- a/net-p2p/phxd/metadata.xml
+++ b/net-p2p/phxd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <longdescription>phxd is an Hotline server under the GPL for Linux/Unixes.
       It supports the Hotline Protocol from 1.2.3 up to 1.5+ (and this means
       it also includes the 1.9+ clients)
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index c8a92f8ac1cc..b3c357a4017f 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
-  <herd>qt</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="webui">Enable the Web UI</flag>
   </use>
diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index 9fa2e6deabbe..332f4dab22ac 100644
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <longdescription lang="en">
     Console BitTorrent client using ncurses based on libtorrent written in C++.
   </longdescription>
diff --git a/net-p2p/smet2html/metadata.xml b/net-p2p/smet2html/metadata.xml
index d3e5908971f1..cfac4dfb2252 100644
--- a/net-p2p/smet2html/metadata.xml
+++ b/net-p2p/smet2html/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">ed2k-tools</remote-id>
 	</upstream>
diff --git a/net-p2p/syrep/metadata.xml b/net-p2p/syrep/metadata.xml
index 7289824cb876..097975e3adc2 100644
--- a/net-p2p/syrep/metadata.xml
+++ b/net-p2p/syrep/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/torrentinfo/metadata.xml b/net-p2p/torrentinfo/metadata.xml
index ed25b369cd98..f38a5051eb15 100644
--- a/net-p2p/torrentinfo/metadata.xml
+++ b/net-p2p/torrentinfo/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>fuuzetsu@fuuzetsu.co.uk</email>
diff --git a/net-p2p/transmission-remote-cli/metadata.xml b/net-p2p/transmission-remote-cli/metadata.xml
index 20f879319233..fa76e52a4660 100644
--- a/net-p2p/transmission-remote-cli/metadata.xml
+++ b/net-p2p/transmission-remote-cli/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hendrik@consetetur.de</email>
 		<name>Hendrik v. Raven (lorem_ipsum)</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">fagga/transmission-remote-cli</remote-id>
 	</upstream>
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index a31106817aaf..ff15628c5857 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
   <maintainer>
     <email>floppym@gentoo.org</email>
     <name>Mike Gilbert</name>
diff --git a/net-p2p/tvrss/metadata.xml b/net-p2p/tvrss/metadata.xml
index 5c4f222bb239..d6e17cd82df6 100644
--- a/net-p2p/tvrss/metadata.xml
+++ b/net-p2p/tvrss/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">tvtrss</remote-id>
 	</upstream>
diff --git a/net-p2p/valknut/metadata.xml b/net-p2p/valknut/metadata.xml
index b6e0d287755a..756cd0a7da7a 100644
--- a/net-p2p/valknut/metadata.xml
+++ b/net-p2p/valknut/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<upstream>
 		<remote-id type="sourceforge">wxdcgui</remote-id>
 	</upstream>
diff --git a/net-p2p/vuze-coreplugins/metadata.xml b/net-p2p/vuze-coreplugins/metadata.xml
index 432ebc5fe730..864275d35aa4 100644
--- a/net-p2p/vuze-coreplugins/metadata.xml
+++ b/net-p2p/vuze-coreplugins/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">azureus</remote-id>
 	</upstream>
diff --git a/net-p2p/vuze/metadata.xml b/net-p2p/vuze/metadata.xml
index 432ebc5fe730..864275d35aa4 100644
--- a/net-p2p/vuze/metadata.xml
+++ b/net-p2p/vuze/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">azureus</remote-id>
 	</upstream>
diff --git a/net-p2p/wire/metadata.xml b/net-p2p/wire/metadata.xml
index 0bf38b28b505..097975e3adc2 100644
--- a/net-p2p/wire/metadata.xml
+++ b/net-p2p/wire/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/xnap/metadata.xml b/net-p2p/xnap/metadata.xml
index 2a82cb5838bb..25d203930dab 100644
--- a/net-p2p/xnap/metadata.xml
+++ b/net-p2p/xnap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
 	<longdescription>
  XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the GNU Public License .
 
diff --git a/net-p2p/yaggui/metadata.xml b/net-p2p/yaggui/metadata.xml
index 1e659b751970..0d84b6c945b7 100644
--- a/net-p2p/yaggui/metadata.xml
+++ b/net-p2p/yaggui/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yaggui</remote-id>
 	</upstream>
diff --git a/net-print/apsfilter/metadata.xml b/net-print/apsfilter/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/apsfilter/metadata.xml
+++ b/net-print/apsfilter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/c2esp/metadata.xml b/net-print/c2esp/metadata.xml
index dd23d29d0696..9dc64197e883 100644
--- a/net-print/c2esp/metadata.xml
+++ b/net-print/c2esp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cupsdriverkodak</remote-id>
   </upstream>
diff --git a/net-print/cups-bjnp/metadata.xml b/net-print/cups-bjnp/metadata.xml
index 88a6a6da2e3b..1b5cd12ab62c 100644
--- a/net-print/cups-bjnp/metadata.xml
+++ b/net-print/cups-bjnp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cups-bjnp</remote-id>
 	</upstream>
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 791a4963fd3e..610c338d7d59 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
   <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
diff --git a/net-print/cups-pdf/metadata.xml b/net-print/cups-pdf/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/cups-pdf/metadata.xml
+++ b/net-print/cups-pdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/cups-pk-helper/metadata.xml b/net-print/cups-pk-helper/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-print/cups-pk-helper/metadata.xml
+++ b/net-print/cups-pk-helper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/cups-windows/metadata.xml b/net-print/cups-windows/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/cups-windows/metadata.xml
+++ b/net-print/cups-windows/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 21c1b4c36efa..ab783f3821bf 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="lprng-compat">
       Do not install lp... binaries so cups and lprng can coexist.
diff --git a/net-print/fax4cups/metadata.xml b/net-print/fax4cups/metadata.xml
index b5041330ba8b..5cb42a7ae10c 100644
--- a/net-print/fax4cups/metadata.xml
+++ b/net-print/fax4cups/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+</maintainer>
 <use>
     <flag name="hylafax">Install net-misc/hylafax backend</flag>
     <flag name="efax">Install net-misc/efax backend</flag>
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
index 447cad30a8fc..81ae2b6553cf 100644
--- a/net-print/foo2zjs/metadata.xml
+++ b/net-print/foo2zjs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db-engine/metadata.xml b/net-print/foomatic-db-engine/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db-engine/metadata.xml
+++ b/net-print/foomatic-db-engine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db-ppds/metadata.xml
+++ b/net-print/foomatic-db-ppds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db/metadata.xml
+++ b/net-print/foomatic-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-filters/metadata.xml b/net-print/foomatic-filters/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-filters/metadata.xml
+++ b/net-print/foomatic-filters/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-gui/metadata.xml b/net-print/foomatic-gui/metadata.xml
index f5e9aa5b215c..184d76fb5055 100644
--- a/net-print/foomatic-gui/metadata.xml
+++ b/net-print/foomatic-gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">foomatic-gui</remote-id>
 	</upstream>
diff --git a/net-print/gmso2/metadata.xml b/net-print/gmso2/metadata.xml
index 6a298fd15827..6eea05a26e4c 100644
--- a/net-print/gmso2/metadata.xml
+++ b/net-print/gmso2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/net-print/gtklp/metadata.xml b/net-print/gtklp/metadata.xml
index 943c68620e38..07ae5a9e0477 100644
--- a/net-print/gtklp/metadata.xml
+++ b/net-print/gtklp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription>
 	GtkLP is an graphical frontend for CUPS, the Common UNIX Printing System.
 	It is used to have an easy (and graphical) access to all of the many options
diff --git a/net-print/gutenprint/metadata.xml b/net-print/gutenprint/metadata.xml
index 09e04478b8db..e9c5e42ce556 100644
--- a/net-print/gutenprint/metadata.xml
+++ b/net-print/gutenprint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gimp-print</remote-id>
 	</upstream>
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 36375d8c02c9..4c7772592632 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Build documentation</flag>
 		<flag name="fax">Enable fax on multifunction devices which support it</flag>
diff --git a/net-print/ink/metadata.xml b/net-print/ink/metadata.xml
index f2b69ae1caa4..efcb3a5dcaf3 100644
--- a/net-print/ink/metadata.xml
+++ b/net-print/ink/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ink</remote-id>
 	</upstream>
diff --git a/net-print/libgnomecups/metadata.xml b/net-print/libgnomecups/metadata.xml
index f7a4fe6435e1..2582d48eac7a 100644
--- a/net-print/libgnomecups/metadata.xml
+++ b/net-print/libgnomecups/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>printing</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/libinklevel/metadata.xml b/net-print/libinklevel/metadata.xml
index d737387c7805..4660d0b1743c 100644
--- a/net-print/libinklevel/metadata.xml
+++ b/net-print/libinklevel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libinklevel</remote-id>
 	</upstream>
diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
index b04e4cfadbc6..a1cc1d39d881 100644
--- a/net-print/lprng/metadata.xml
+++ b/net-print/lprng/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/magicfilter/metadata.xml b/net-print/magicfilter/metadata.xml
index 865a3c330b0e..421660d2cb94 100644
--- a/net-print/magicfilter/metadata.xml
+++ b/net-print/magicfilter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="lprng-failsafe">Refuse options for compability with certain LPRng versions.</flag>
   </use>
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
index 403e2746cbe2..d8615272250d 100644
--- a/net-print/mtink/metadata.xml
+++ b/net-print/mtink/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<herd>proxy-maintainers</herd>
 <maintainer><email>SebastianLuther@gmx.de</email></maintainer>
+<maintainer>
+<email>printing@gentoo.org</email>
+<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/npadmin/metadata.xml b/net-print/npadmin/metadata.xml
index 911d11367046..5293d779b230 100644
--- a/net-print/npadmin/metadata.xml
+++ b/net-print/npadmin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">npadmin</remote-id>
 	</upstream>
diff --git a/net-print/pnm2ppa/metadata.xml b/net-print/pnm2ppa/metadata.xml
index 9a586855c36c..ea03a7d8de22 100644
--- a/net-print/pnm2ppa/metadata.xml
+++ b/net-print/pnm2ppa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pnm2ppa</remote-id>
 	</upstream>
diff --git a/net-print/poster/metadata.xml b/net-print/poster/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/poster/metadata.xml
+++ b/net-print/poster/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/pykota/metadata.xml b/net-print/pykota/metadata.xml
index e3972d2e16ea..0db81fc0278f 100644
--- a/net-print/pykota/metadata.xml
+++ b/net-print/pykota/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		PyKota is a complete GPLed Print Quota and Accounting Software Solution
 		for the Common UNIX Printing System (CUPS).
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index 4e6e5d745b1c..9cc8e98d0bdb 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
@@ -11,6 +10,10 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">splix</remote-id>
 	</upstream>
diff --git a/net-voip/blink/metadata.xml b/net-voip/blink/metadata.xml
index 3a6254875166..5e39124419c8 100644
--- a/net-voip/blink/metadata.xml
+++ b/net-voip/blink/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-voip/homer/metadata.xml b/net-voip/homer/metadata.xml
index aff5964a4a5b..b7c7424060a4 100644
--- a/net-voip/homer/metadata.xml
+++ b/net-voip/homer/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@pennewiss.de</email>
 		<name>Marcel Pennewiß</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-voip/telepathy-gabble/metadata.xml b/net-voip/telepathy-gabble/metadata.xml
index 610f8c7f3010..71d4aebafb82 100644
--- a/net-voip/telepathy-gabble/metadata.xml
+++ b/net-voip/telepathy-gabble/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 <use>
 	<flag name="plugins">Enable plugin loader</flag>
 </use>
diff --git a/net-voip/telepathy-haze/metadata.xml b/net-voip/telepathy-haze/metadata.xml
index 3025c2cead21..e6f7aeb95725 100644
--- a/net-voip/telepathy-haze/metadata.xml
+++ b/net-voip/telepathy-haze/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">
 	Telepathy connection manager for protocols supported by
 	libpurple (pidgin's core library).
diff --git a/net-voip/telepathy-rakia/metadata.xml b/net-voip/telepathy-rakia/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-voip/telepathy-rakia/metadata.xml
+++ b/net-voip/telepathy-rakia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-voip/telepathy-salut/metadata.xml b/net-voip/telepathy-salut/metadata.xml
index c4c88279556a..238051b050d9 100644
--- a/net-voip/telepathy-salut/metadata.xml
+++ b/net-voip/telepathy-salut/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>eva@gentoo.org</email>
 		<name>Gilles Dartiguelongue</name>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		A link-local XMPP connection manager for Telepathy.
 	</longdescription>
diff --git a/net-voip/yate/metadata.xml b/net-voip/yate/metadata.xml
index 00b85ca9d7a4..9534dbb81837 100644
--- a/net-voip/yate/metadata.xml
+++ b/net-voip/yate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="sctp">Enable SCTP sockets</flag>
 		<flag name="dahdi">Enable Dahdi driver</flag>
diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index 21bff513b018..2a3030a3c215 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<herd>crypto</herd>
 <maintainer>
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 	<description>Also on the upstream team</description>
 </maintainer>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription>
 	aircrack is a set of tools for auditing wireless networks.
 	aircrack-ng is the next generation of aircrack with lots of new features.
diff --git a/net-wireless/airtraf/metadata.xml b/net-wireless/airtraf/metadata.xml
index 8c9992e713f9..3210c00f75a4 100644
--- a/net-wireless/airtraf/metadata.xml
+++ b/net-wireless/airtraf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
 <longdescription>
 AirTraf 1.0 is a wireless sniffer that can detect and determine exactly what is
 being transmitted over 802.11 wireless networks. This open-source program
diff --git a/net-wireless/bladerf-firmware/metadata.xml b/net-wireless/bladerf-firmware/metadata.xml
index 1681f5f93bc5..20ec68211996 100644
--- a/net-wireless/bladerf-firmware/metadata.xml
+++ b/net-wireless/bladerf-firmware/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-wireless/bladerf-fpga/metadata.xml b/net-wireless/bladerf-fpga/metadata.xml
index ddbf40e23d31..71314342f41f 100644
--- a/net-wireless/bladerf-fpga/metadata.xml
+++ b/net-wireless/bladerf-fpga/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 <use>
diff --git a/net-wireless/bladerf/metadata.xml b/net-wireless/bladerf/metadata.xml
index 0ab524fad838..22d9a1d6ecca 100644
--- a/net-wireless/bladerf/metadata.xml
+++ b/net-wireless/bladerf/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<use>
diff --git a/net-wireless/bluedevil/metadata.xml b/net-wireless/bluedevil/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-wireless/bluedevil/metadata.xml
+++ b/net-wireless/bluedevil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/chirp/metadata.xml b/net-wireless/chirp/metadata.xml
index 0500f0efac74..3eed3509688a 100644
--- a/net-wireless/chirp/metadata.xml
+++ b/net-wireless/chirp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
+<maintainer>
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-wireless/cpyrit-cuda/metadata.xml b/net-wireless/cpyrit-cuda/metadata.xml
index 81f3a278efce..52042c6ca95c 100644
--- a/net-wireless/cpyrit-cuda/metadata.xml
+++ b/net-wireless/cpyrit-cuda/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/cpyrit-opencl/metadata.xml b/net-wireless/cpyrit-opencl/metadata.xml
index 81f3a278efce..52042c6ca95c 100644
--- a/net-wireless/cpyrit-opencl/metadata.xml
+++ b/net-wireless/cpyrit-opencl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 5c64bb297eab..595073647ba6 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">antirez/dump1090</remote-id>
 	</upstream>
diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-wireless/gnome-bluetooth/metadata.xml
+++ b/net-wireless/gnome-bluetooth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index ee76e3f3fea8..35d37a07255d 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="analog">enable analog signal processing blocks</flag>
 		<flag name="atsc">enable ATSC (HDTV) transmitter and receiver blocks</flag>
diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml
index a8431b1c0750..2ac7435d1451 100644
--- a/net-wireless/gqrx/metadata.xml
+++ b/net-wireless/gqrx/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-wireless/gr-baz/metadata.xml b/net-wireless/gr-baz/metadata.xml
index 2b0770b2e820..522b899cb46b 100644
--- a/net-wireless/gr-baz/metadata.xml
+++ b/net-wireless/gr-baz/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
+<maintainer>
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 <use>
diff --git a/net-wireless/gr-iqbal/metadata.xml b/net-wireless/gr-iqbal/metadata.xml
index 631cfabe0c26..20ec68211996 100644
--- a/net-wireless/gr-iqbal/metadata.xml
+++ b/net-wireless/gr-iqbal/metadata.xml
@@ -5,7 +5,10 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<herd>radio</herd>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 4f3bb1dd128d..1b7e2744fff7 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+	</maintainer>
 <use>
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
 	<flag name="fcd">Build with Funcube Dongle support</flag>
diff --git a/net-wireless/gr-paint/metadata.xml b/net-wireless/gr-paint/metadata.xml
index 1c8e95dc33b5..aaf6d57ee3bd 100644
--- a/net-wireless/gr-paint/metadata.xml
+++ b/net-wireless/gr-paint/metadata.xml
@@ -6,7 +6,10 @@
 		<name>Rick Farina</name>
 		<description>maintainer</description>
 	</maintainer>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-wireless/gr-rds/metadata.xml b/net-wireless/gr-rds/metadata.xml
index 01833ab8f4e7..dab694d47da4 100644
--- a/net-wireless/gr-rds/metadata.xml
+++ b/net-wireless/gr-rds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">bastibl/gr-rds</remote-id>
 	</upstream>
diff --git a/net-wireless/gr-scan/metadata.xml b/net-wireless/gr-scan/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-wireless/gr-scan/metadata.xml
+++ b/net-wireless/gr-scan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/hackrf-tools/metadata.xml b/net-wireless/hackrf-tools/metadata.xml
index f347a49f850f..8c617321d739 100644
--- a/net-wireless/hackrf-tools/metadata.xml
+++ b/net-wireless/hackrf-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-wireless/inspectrum/metadata.xml b/net-wireless/inspectrum/metadata.xml
index 1b8c14b05c58..88d5e5b2a91d 100644
--- a/net-wireless/inspectrum/metadata.xml
+++ b/net-wireless/inspectrum/metadata.xml
@@ -6,7 +6,10 @@
 		<name>Rick Farina</name>
 		<description>maintainer</description>
 	</maintainer>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-wireless/multimode/metadata.xml b/net-wireless/multimode/metadata.xml
index 0500f0efac74..3eed3509688a 100644
--- a/net-wireless/multimode/metadata.xml
+++ b/net-wireless/multimode/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>radio</herd>
 <maintainer>
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
+<maintainer>
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-wireless/openbsc/metadata.xml b/net-wireless/openbsc/metadata.xml
index 00beeae35c22..2b8c707d8ddb 100644
--- a/net-wireless/openbsc/metadata.xml
+++ b/net-wireless/openbsc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="gprs">Support GPRS via OpenGGSN</flag>
 	</use>
diff --git a/net-wireless/openggsn/metadata.xml b/net-wireless/openggsn/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-wireless/openggsn/metadata.xml
+++ b/net-wireless/openggsn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/osmobts/metadata.xml b/net-wireless/osmobts/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-wireless/osmobts/metadata.xml
+++ b/net-wireless/osmobts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/osmocom-bb/metadata.xml b/net-wireless/osmocom-bb/metadata.xml
index 96d1c991a4a4..71c024326231 100644
--- a/net-wireless/osmocom-bb/metadata.xml
+++ b/net-wireless/osmocom-bb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="transmit">Enable transmission capabilities.</flag>
 	</use>
diff --git a/net-wireless/pyrit/metadata.xml b/net-wireless/pyrit/metadata.xml
index 947800281927..39769ba6a105 100644
--- a/net-wireless/pyrit/metadata.xml
+++ b/net-wireless/pyrit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
@@ -10,6 +9,10 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="cuda">Enable CUDA support via <pkg>net-wireless/cpyrit-cuda</pkg></flag>
 	<flag name="opencl">Enable OpenCL support via <pkg>net-wireless/cpyrit-opencl</pkg></flag>
diff --git a/net-wireless/python-wifi/metadata.xml b/net-wireless/python-wifi/metadata.xml
index 30c64d4a0ec9..ae04b5dc8bb0 100644
--- a/net-wireless/python-wifi/metadata.xml
+++ b/net-wireless/python-wifi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">python-wifi.berlios</remote-id>
 	</upstream>
diff --git a/net-wireless/reaver/metadata.xml b/net-wireless/reaver/metadata.xml
index 81f3a278efce..52042c6ca95c 100644
--- a/net-wireless/reaver/metadata.xml
+++ b/net-wireless/reaver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml
index 19e2deffdc9d..370d4d1560cb 100644
--- a/net-wireless/rtl-sdr/metadata.xml
+++ b/net-wireless/rtl-sdr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml
index 25faa41d0ed4..7f10a5dc8f7e 100644
--- a/net-wireless/uhd/metadata.xml
+++ b/net-wireless/uhd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
 	<maintainer>
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
@@ -10,6 +9,10 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/net-wireless/wepattack/metadata.xml b/net-wireless/wepattack/metadata.xml
index 7d7e9c4af0ae..d89faad19863 100644
--- a/net-wireless/wepattack/metadata.xml
+++ b/net-wireless/wepattack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 	<longdescription lang="en">
 		WepAttack is a WLAN open source Linux tool for breaking 802.11 WEP keys.
 		This tool is based on an active dictionary attack that tests millions of
diff --git a/net-wireless/wepdecrypt/metadata.xml b/net-wireless/wepdecrypt/metadata.xml
index 6b90830ce01a..1303cacb80a2 100644
--- a/net-wireless/wepdecrypt/metadata.xml
+++ b/net-wireless/wepdecrypt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wepdecrypt</remote-id>
 	</upstream>
diff --git a/net-wireless/yatebts/metadata.xml b/net-wireless/yatebts/metadata.xml
index 8b4f680dfb74..f01bfe4ff889 100644
--- a/net-wireless/yatebts/metadata.xml
+++ b/net-wireless/yatebts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>radio</herd>
+	<maintainer>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="rad1">Build RAD1 transceiver</flag>
 		<flag name="usrp1">Build USRP1 transceiver</flag>
diff --git a/perl-core/CPAN-Meta-Requirements/metadata.xml b/perl-core/CPAN-Meta-Requirements/metadata.xml
index 5556b1fc335e..6d10c344b912 100644
--- a/perl-core/CPAN-Meta-Requirements/metadata.xml
+++ b/perl-core/CPAN-Meta-Requirements/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">CPAN-Meta-Requirements</remote-id>
         <remote-id type="cpan-module">CPAN::Meta::Requirements</remote-id>
diff --git a/perl-core/CPAN-Meta/metadata.xml b/perl-core/CPAN-Meta/metadata.xml
index 09194b0d531e..b34145485972 100644
--- a/perl-core/CPAN-Meta/metadata.xml
+++ b/perl-core/CPAN-Meta/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">CPAN-Meta</remote-id>
         <remote-id type="cpan-module">CPAN::Meta</remote-id>
diff --git a/perl-core/Data-Dumper/metadata.xml b/perl-core/Data-Dumper/metadata.xml
index 6002b1a3b749..62ba0534a166 100644
--- a/perl-core/Data-Dumper/metadata.xml
+++ b/perl-core/Data-Dumper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="cpan">Data-Dumper</remote-id>
         <remote-id type="cpan-module">Data::Dumper</remote-id>
diff --git a/perl-core/Devel-PPPort/metadata.xml b/perl-core/Devel-PPPort/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/perl-core/Devel-PPPort/metadata.xml
+++ b/perl-core/Devel-PPPort/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/perl-core/Digest-MD5/metadata.xml b/perl-core/Digest-MD5/metadata.xml
index badded201922..a10a0d106693 100644
--- a/perl-core/Digest-MD5/metadata.xml
+++ b/perl-core/Digest-MD5/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-MD5</remote-id>
     <remote-id type="cpan-module">Digest::MD5</remote-id>
diff --git a/perl-core/Digest-SHA/metadata.xml b/perl-core/Digest-SHA/metadata.xml
index 910736553634..2ab84223915d 100644
--- a/perl-core/Digest-SHA/metadata.xml
+++ b/perl-core/Digest-SHA/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest-SHA</remote-id>
     <remote-id type="cpan-module">Digest::SHA</remote-id>
diff --git a/perl-core/Digest/metadata.xml b/perl-core/Digest/metadata.xml
index 15d31f151f4b..f70933a820a1 100644
--- a/perl-core/Digest/metadata.xml
+++ b/perl-core/Digest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Digest</remote-id>
     <remote-id type="cpan-module">Digest</remote-id>
diff --git a/perl-core/Dumpvalue/metadata.xml b/perl-core/Dumpvalue/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/perl-core/Dumpvalue/metadata.xml
+++ b/perl-core/Dumpvalue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/perl-core/Encode/metadata.xml b/perl-core/Encode/metadata.xml
index 33a7fc2b3ef4..c2aa6bbe0570 100644
--- a/perl-core/Encode/metadata.xml
+++ b/perl-core/Encode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Encode</remote-id>
     <remote-id type="cpan-module">Encode</remote-id>
diff --git a/perl-core/ExtUtils-Command/metadata.xml b/perl-core/ExtUtils-Command/metadata.xml
index c111bfd5a68b..675241c137b8 100644
--- a/perl-core/ExtUtils-Command/metadata.xml
+++ b/perl-core/ExtUtils-Command/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-Command</remote-id>
     <remote-id type="cpan-module">ExtUtils::Command</remote-id>
diff --git a/perl-core/ExtUtils-Constant/metadata.xml b/perl-core/ExtUtils-Constant/metadata.xml
index 0e11fa898bc4..2c1fd4948239 100644
--- a/perl-core/ExtUtils-Constant/metadata.xml
+++ b/perl-core/ExtUtils-Constant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-Constant</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant</remote-id>
diff --git a/perl-core/ExtUtils-MakeMaker/metadata.xml b/perl-core/ExtUtils-MakeMaker/metadata.xml
index 61cc819ccab5..141dbef51e11 100644
--- a/perl-core/ExtUtils-MakeMaker/metadata.xml
+++ b/perl-core/ExtUtils-MakeMaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-MakeMaker</remote-id>
     <remote-id type="cpan-module">DynaLoader</remote-id>
diff --git a/perl-core/ExtUtils-Manifest/metadata.xml b/perl-core/ExtUtils-Manifest/metadata.xml
index eba770824586..368b3d1d5b88 100644
--- a/perl-core/ExtUtils-Manifest/metadata.xml
+++ b/perl-core/ExtUtils-Manifest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">ExtUtils-Manifest</remote-id>
     <remote-id type="cpan-module">ExtUtils::Manifest</remote-id>
diff --git a/perl-core/File-Path/metadata.xml b/perl-core/File-Path/metadata.xml
index dc337c8bb290..aeaf0682a667 100644
--- a/perl-core/File-Path/metadata.xml
+++ b/perl-core/File-Path/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Path</remote-id>
     <remote-id type="cpan-module">File::Path</remote-id>
diff --git a/perl-core/File-Temp/metadata.xml b/perl-core/File-Temp/metadata.xml
index d84a9188238f..6eee75d9adef 100644
--- a/perl-core/File-Temp/metadata.xml
+++ b/perl-core/File-Temp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">File-Temp</remote-id>
     <remote-id type="cpan-module">File::Temp</remote-id>
diff --git a/perl-core/Getopt-Long/metadata.xml b/perl-core/Getopt-Long/metadata.xml
index 2a8bb97ea48f..dc1428cf0996 100644
--- a/perl-core/Getopt-Long/metadata.xml
+++ b/perl-core/Getopt-Long/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-Long</remote-id>
     <remote-id type="cpan-module">Getopt::Long</remote-id>
diff --git a/perl-core/HTTP-Tiny/metadata.xml b/perl-core/HTTP-Tiny/metadata.xml
index acba82a41fef..342719827387 100644
--- a/perl-core/HTTP-Tiny/metadata.xml
+++ b/perl-core/HTTP-Tiny/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
   <maintainer>
     <email>kentfredric@gmail.com</email>
     <name>Kent Fredric</name>
   </maintainer>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">HTTP-Tiny</remote-id>
     <remote-id type="cpan-module">HTTP::Tiny</remote-id>
diff --git a/perl-core/IO-Zlib/metadata.xml b/perl-core/IO-Zlib/metadata.xml
index bbac0ab87135..dd663971074e 100644
--- a/perl-core/IO-Zlib/metadata.xml
+++ b/perl-core/IO-Zlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Zlib</remote-id>
     <remote-id type="cpan-module">IO::Zlib</remote-id>
diff --git a/perl-core/Locale-Maketext-Simple/metadata.xml b/perl-core/Locale-Maketext-Simple/metadata.xml
index b8b9b1d90287..d91ee18a992c 100644
--- a/perl-core/Locale-Maketext-Simple/metadata.xml
+++ b/perl-core/Locale-Maketext-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Simple</remote-id>
     <remote-id type="cpan-module">Locale::Maketext::Simple</remote-id>
diff --git a/perl-core/MIME-Base64/metadata.xml b/perl-core/MIME-Base64/metadata.xml
index c9f79bc24625..6a1eb47b9969 100644
--- a/perl-core/MIME-Base64/metadata.xml
+++ b/perl-core/MIME-Base64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">MIME-Base64</remote-id>
     <remote-id type="cpan-module">MIME::Base64</remote-id>
diff --git a/perl-core/Math-BigInt/metadata.xml b/perl-core/Math-BigInt/metadata.xml
index 62f2a74a972c..68b32d3186af 100644
--- a/perl-core/Math-BigInt/metadata.xml
+++ b/perl-core/Math-BigInt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Math-BigInt</remote-id>
     <remote-id type="cpan-module">Math::BigFloat</remote-id>
diff --git a/perl-core/Math-Complex/metadata.xml b/perl-core/Math-Complex/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/perl-core/Math-Complex/metadata.xml
+++ b/perl-core/Math-Complex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/perl-core/Memoize/metadata.xml b/perl-core/Memoize/metadata.xml
index ea0939c0d36c..865fd4ad7b3e 100644
--- a/perl-core/Memoize/metadata.xml
+++ b/perl-core/Memoize/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Memoize</remote-id>
     <remote-id type="cpan-module">Memoize</remote-id>
diff --git a/perl-core/Module-CoreList/metadata.xml b/perl-core/Module-CoreList/metadata.xml
index 2804832d9f04..b97ed996a516 100644
--- a/perl-core/Module-CoreList/metadata.xml
+++ b/perl-core/Module-CoreList/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-CoreList</remote-id>
     <remote-id type="cpan-module">Module::CoreList</remote-id>
diff --git a/perl-core/Module-Loaded/metadata.xml b/perl-core/Module-Loaded/metadata.xml
index e15571b9b29c..ca53d60426f5 100644
--- a/perl-core/Module-Loaded/metadata.xml
+++ b/perl-core/Module-Loaded/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Loaded</remote-id>
     <remote-id type="cpan-module">Module::Loaded</remote-id>
diff --git a/perl-core/Module-Metadata/metadata.xml b/perl-core/Module-Metadata/metadata.xml
index e5c5365a3cd6..7b2cbda12847 100644
--- a/perl-core/Module-Metadata/metadata.xml
+++ b/perl-core/Module-Metadata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Metadata</remote-id>
     <remote-id type="cpan-module">Module::Metadata</remote-id>
diff --git a/perl-core/Package-Constants/metadata.xml b/perl-core/Package-Constants/metadata.xml
index 7b8283033fc1..7fb204961823 100644
--- a/perl-core/Package-Constants/metadata.xml
+++ b/perl-core/Package-Constants/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Package-Constants</remote-id>
     <remote-id type="cpan-module">Package::Constants</remote-id>
diff --git a/perl-core/Params-Check/metadata.xml b/perl-core/Params-Check/metadata.xml
index 6baa8244a37c..dc3b352493c2 100644
--- a/perl-core/Params-Check/metadata.xml
+++ b/perl-core/Params-Check/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Params-Check</remote-id>
     <remote-id type="cpan-module">Params::Check</remote-id>
diff --git a/perl-core/Pod-Simple/metadata.xml b/perl-core/Pod-Simple/metadata.xml
index cfb870fc6af2..9d3e39870d67 100644
--- a/perl-core/Pod-Simple/metadata.xml
+++ b/perl-core/Pod-Simple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Simple</remote-id>
     <remote-id type="cpan-module">Pod::Simple</remote-id>
diff --git a/perl-core/Sys-Syslog/metadata.xml b/perl-core/Sys-Syslog/metadata.xml
index 62970526ee14..f69309b4727b 100644
--- a/perl-core/Sys-Syslog/metadata.xml
+++ b/perl-core/Sys-Syslog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>This core perl package is being provided as an ebuild to
 	address recent security issues with Sys::Syslog. Perl 5.8.8 and above should
 	have 0.13 or greater bundled with them, but users of less than 5.8.8 may
diff --git a/perl-core/Term-ANSIColor/metadata.xml b/perl-core/Term-ANSIColor/metadata.xml
index 018db1eed6fd..0b0149a0db77 100644
--- a/perl-core/Term-ANSIColor/metadata.xml
+++ b/perl-core/Term-ANSIColor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Term-ANSIColor</remote-id>
     <remote-id type="cpan-module">Term::ANSIColor</remote-id>
diff --git a/perl-core/Test/metadata.xml b/perl-core/Test/metadata.xml
index b96a92398cbf..f669f29365d8 100644
--- a/perl-core/Test/metadata.xml
+++ b/perl-core/Test/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Test</remote-id>
     <remote-id type="cpan-module">Test</remote-id>
diff --git a/perl-core/Text-Balanced/metadata.xml b/perl-core/Text-Balanced/metadata.xml
index ba1b7d39475a..f462a98810a7 100644
--- a/perl-core/Text-Balanced/metadata.xml
+++ b/perl-core/Text-Balanced/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Balanced</remote-id>
     <remote-id type="cpan-module">Text::Balanced</remote-id>
diff --git a/perl-core/Text-ParseWords/metadata.xml b/perl-core/Text-ParseWords/metadata.xml
index d501eaccc5b3..a9e5ee8a4b9b 100644
--- a/perl-core/Text-ParseWords/metadata.xml
+++ b/perl-core/Text-ParseWords/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Text-ParseWords</remote-id>
 		<remote-id type="cpan-module">Text::ParseWords</remote-id>
diff --git a/perl-core/Text-Tabs+Wrap/metadata.xml b/perl-core/Text-Tabs+Wrap/metadata.xml
index a4d24f3b9cd3..2de8b806c847 100644
--- a/perl-core/Text-Tabs+Wrap/metadata.xml
+++ b/perl-core/Text-Tabs+Wrap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Tabs+Wrap</remote-id>
     <remote-id type="cpan-module">Text::Tabs</remote-id>
diff --git a/perl-core/Thread-Semaphore/metadata.xml b/perl-core/Thread-Semaphore/metadata.xml
index 18e937e60ca7..526bbfa6331f 100644
--- a/perl-core/Thread-Semaphore/metadata.xml
+++ b/perl-core/Thread-Semaphore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Thread-Semaphore</remote-id>
     <remote-id type="cpan-module">Thread::Semaphore</remote-id>
diff --git a/perl-core/Time-HiRes/metadata.xml b/perl-core/Time-HiRes/metadata.xml
index c3abed162a81..ea1682676298 100644
--- a/perl-core/Time-HiRes/metadata.xml
+++ b/perl-core/Time-HiRes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-HiRes</remote-id>
     <remote-id type="cpan-module">Time::HiRes</remote-id>
diff --git a/perl-core/Time-Local/metadata.xml b/perl-core/Time-Local/metadata.xml
index 248e347039b3..b982e3cbfaa4 100644
--- a/perl-core/Time-Local/metadata.xml
+++ b/perl-core/Time-Local/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Time-Local</remote-id>
     <remote-id type="cpan-module">Time::Local</remote-id>
diff --git a/perl-core/Unicode-Collate/metadata.xml b/perl-core/Unicode-Collate/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/perl-core/Unicode-Collate/metadata.xml
+++ b/perl-core/Unicode-Collate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/perl-core/Unicode-Normalize/metadata.xml b/perl-core/Unicode-Normalize/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/perl-core/Unicode-Normalize/metadata.xml
+++ b/perl-core/Unicode-Normalize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/perl-core/libnet/metadata.xml b/perl-core/libnet/metadata.xml
index 84daf2b67a7e..2194f3792a7e 100644
--- a/perl-core/libnet/metadata.xml
+++ b/perl-core/libnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <longdescription>dev-perl/libnet provides the suite of basic Net:: modules (Net::Cmd, Net::Config, Net::Domain, Net::FTP, Net::NNTP, Net::Netrc, Net::POP3, Net::SMTP, and Net::Time as the key ones)</longdescription>
   <upstream>
     <remote-id type="cpan">libnet</remote-id>
diff --git a/perl-core/parent/metadata.xml b/perl-core/parent/metadata.xml
index 4e9b2eb62e04..87b2c416ddfa 100644
--- a/perl-core/parent/metadata.xml
+++ b/perl-core/parent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">parent</remote-id>
     <remote-id type="cpan-module">parent</remote-id>
diff --git a/perl-core/podlators/metadata.xml b/perl-core/podlators/metadata.xml
index 27deff23298d..c0f6451871a2 100644
--- a/perl-core/podlators/metadata.xml
+++ b/perl-core/podlators/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">podlators</remote-id>
     <remote-id type="cpan-module">Pod::Man</remote-id>
diff --git a/perl-core/version/metadata.xml b/perl-core/version/metadata.xml
index 78581ae7129e..9382abb706a6 100644
--- a/perl-core/version/metadata.xml
+++ b/perl-core/version/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">version</remote-id>
     <remote-id type="cpan-module">charstar</remote-id>
diff --git a/ros-meta/audio_common/metadata.xml b/ros-meta/audio_common/metadata.xml
index 052c64d84e8a..24c71d767a85 100644
--- a/ros-meta/audio_common/metadata.xml
+++ b/ros-meta/audio_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
diff --git a/ros-meta/bond_core/metadata.xml b/ros-meta/bond_core/metadata.xml
index 6c2a82d3306b..e719fa3c1618 100644
--- a/ros-meta/bond_core/metadata.xml
+++ b/ros-meta/bond_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
index b5f28dc8e0c3..4d302b3a5dce 100644
--- a/ros-meta/calibration/metadata.xml
+++ b/ros-meta/calibration/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
diff --git a/ros-meta/common_msgs/metadata.xml b/ros-meta/common_msgs/metadata.xml
index 7c144cf10d28..7b44351f1ba0 100644
--- a/ros-meta/common_msgs/metadata.xml
+++ b/ros-meta/common_msgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
diff --git a/ros-meta/common_tutorials/metadata.xml b/ros-meta/common_tutorials/metadata.xml
index 9263625c027a..4b10c13858ea 100644
--- a/ros-meta/common_tutorials/metadata.xml
+++ b/ros-meta/common_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
diff --git a/ros-meta/desktop/metadata.xml b/ros-meta/desktop/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/desktop/metadata.xml
+++ b/ros-meta/desktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/desktop_full/metadata.xml b/ros-meta/desktop_full/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/desktop_full/metadata.xml
+++ b/ros-meta/desktop_full/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/diagnostics/metadata.xml b/ros-meta/diagnostics/metadata.xml
index d20e2adf8c45..15864be46751 100644
--- a/ros-meta/diagnostics/metadata.xml
+++ b/ros-meta/diagnostics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
diff --git a/ros-meta/driver_common/metadata.xml b/ros-meta/driver_common/metadata.xml
index 8b588277cae3..ea953ee614f9 100644
--- a/ros-meta/driver_common/metadata.xml
+++ b/ros-meta/driver_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/driver_common</remote-id>
 	</upstream>
diff --git a/ros-meta/executive_smach/metadata.xml b/ros-meta/executive_smach/metadata.xml
index cad98c82b3c0..6c84cf0cbc0d 100644
--- a/ros-meta/executive_smach/metadata.xml
+++ b/ros-meta/executive_smach/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/executive_smach</remote-id>
 	</upstream>
diff --git a/ros-meta/gazebo_ros_pkgs/metadata.xml b/ros-meta/gazebo_ros_pkgs/metadata.xml
index 4026599733cf..76d01a34f21d 100644
--- a/ros-meta/gazebo_ros_pkgs/metadata.xml
+++ b/ros-meta/gazebo_ros_pkgs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
diff --git a/ros-meta/geographic_info/metadata.xml b/ros-meta/geographic_info/metadata.xml
index e4634a014583..74c4aa9daf3a 100644
--- a/ros-meta/geographic_info/metadata.xml
+++ b/ros-meta/geographic_info/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
 	</upstream>
diff --git a/ros-meta/geometry/metadata.xml b/ros-meta/geometry/metadata.xml
index 85acac4db1c2..d9b16b225ddc 100644
--- a/ros-meta/geometry/metadata.xml
+++ b/ros-meta/geometry/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
diff --git a/ros-meta/geometry_experimental/metadata.xml b/ros-meta/geometry_experimental/metadata.xml
index 0b847eeae0bc..35c635c4012e 100644
--- a/ros-meta/geometry_experimental/metadata.xml
+++ b/ros-meta/geometry_experimental/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_experimental</remote-id>
 	</upstream>
diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
index 00483fcf6ceb..4f4e9afa1030 100644
--- a/ros-meta/geometry_tutorials/metadata.xml
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/geometry_tutorials</remote-id>
 	</upstream>
diff --git a/ros-meta/hector_localization/metadata.xml b/ros-meta/hector_localization/metadata.xml
index 19aa8eae0479..31497090efe7 100644
--- a/ros-meta/hector_localization/metadata.xml
+++ b/ros-meta/hector_localization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
 	</upstream>
diff --git a/ros-meta/hector_slam/metadata.xml b/ros-meta/hector_slam/metadata.xml
index 3851ae3f5f29..7bc9ec62a19d 100644
--- a/ros-meta/hector_slam/metadata.xml
+++ b/ros-meta/hector_slam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
diff --git a/ros-meta/image_common/metadata.xml b/ros-meta/image_common/metadata.xml
index abd895f35e83..6bae1e541c6a 100644
--- a/ros-meta/image_common/metadata.xml
+++ b/ros-meta/image_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
diff --git a/ros-meta/image_pipeline/metadata.xml b/ros-meta/image_pipeline/metadata.xml
index 8c79df05948a..62391ec94eb8 100644
--- a/ros-meta/image_pipeline/metadata.xml
+++ b/ros-meta/image_pipeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
diff --git a/ros-meta/image_transport_plugins/metadata.xml b/ros-meta/image_transport_plugins/metadata.xml
index 1d01ac483526..1b34d59440d4 100644
--- a/ros-meta/image_transport_plugins/metadata.xml
+++ b/ros-meta/image_transport_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
 	</upstream>
diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
index c82184313d31..f292f703a1e3 100644
--- a/ros-meta/imu_pipeline/metadata.xml
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
 	</upstream>
diff --git a/ros-meta/laser_pipeline/metadata.xml b/ros-meta/laser_pipeline/metadata.xml
index afbfb658853f..f9b32d5d90a1 100644
--- a/ros-meta/laser_pipeline/metadata.xml
+++ b/ros-meta/laser_pipeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/laser_pipeline</remote-id>
 	</upstream>
diff --git a/ros-meta/mavros/metadata.xml b/ros-meta/mavros/metadata.xml
index 56ebbac87e73..0ece22b2f240 100644
--- a/ros-meta/mavros/metadata.xml
+++ b/ros-meta/mavros/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/ros-meta/navigation/metadata.xml b/ros-meta/navigation/metadata.xml
index d7ed477282f2..0e5c37b9735a 100644
--- a/ros-meta/navigation/metadata.xml
+++ b/ros-meta/navigation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
diff --git a/ros-meta/nodelet_core/metadata.xml b/ros-meta/nodelet_core/metadata.xml
index 66af76fe4206..8b2112281bbd 100644
--- a/ros-meta/nodelet_core/metadata.xml
+++ b/ros-meta/nodelet_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
diff --git a/ros-meta/perception/metadata.xml b/ros-meta/perception/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/perception/metadata.xml
+++ b/ros-meta/perception/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/perception_pcl/metadata.xml b/ros-meta/perception_pcl/metadata.xml
index a3b5c3df3d44..0946de51e297 100644
--- a/ros-meta/perception_pcl/metadata.xml
+++ b/ros-meta/perception_pcl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/perception_pcl</remote-id>
 	</upstream>
diff --git a/ros-meta/pr2_common/metadata.xml b/ros-meta/pr2_common/metadata.xml
index 6efd828db26a..9c007ad7a353 100644
--- a/ros-meta/pr2_common/metadata.xml
+++ b/ros-meta/pr2_common/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
diff --git a/ros-meta/qt_gui_core/metadata.xml b/ros-meta/qt_gui_core/metadata.xml
index 894d8923d426..ff0dae104c86 100644
--- a/ros-meta/qt_gui_core/metadata.xml
+++ b/ros-meta/qt_gui_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
diff --git a/ros-meta/robot/metadata.xml b/ros-meta/robot/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/robot/metadata.xml
+++ b/ros-meta/robot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/robot_model/metadata.xml b/ros-meta/robot_model/metadata.xml
index 0724a71af502..22ad85357198 100644
--- a/ros-meta/robot_model/metadata.xml
+++ b/ros-meta/robot_model/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
diff --git a/ros-meta/ros/metadata.xml b/ros-meta/ros/metadata.xml
index 55c0da5a3679..92ec2c77b0bb 100644
--- a/ros-meta/ros/metadata.xml
+++ b/ros-meta/ros/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
diff --git a/ros-meta/ros_base/metadata.xml b/ros-meta/ros_base/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/ros_base/metadata.xml
+++ b/ros-meta/ros_base/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/ros_comm/metadata.xml b/ros-meta/ros_comm/metadata.xml
index 39c55138e9f8..7bc2586e18fb 100644
--- a/ros-meta/ros_comm/metadata.xml
+++ b/ros-meta/ros_comm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
diff --git a/ros-meta/ros_control/metadata.xml b/ros-meta/ros_control/metadata.xml
index f4a590e3afff..cd7b1ce9309d 100644
--- a/ros-meta/ros_control/metadata.xml
+++ b/ros-meta/ros_control/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
diff --git a/ros-meta/ros_core/metadata.xml b/ros-meta/ros_core/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/ros_core/metadata.xml
+++ b/ros-meta/ros_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/ros_tutorials/metadata.xml b/ros-meta/ros_tutorials/metadata.xml
index 53c74b5b3685..2a518bc3a134 100644
--- a/ros-meta/ros_tutorials/metadata.xml
+++ b/ros-meta/ros_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/ros_tutorials</remote-id>
 	</upstream>
diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
index c655f4f6a490..31e9370d6359 100644
--- a/ros-meta/rosbridge_suite/metadata.xml
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
 	</upstream>
diff --git a/ros-meta/roscpp_core/metadata.xml b/ros-meta/roscpp_core/metadata.xml
index c6d73fb2241a..af9090b269e0 100644
--- a/ros-meta/roscpp_core/metadata.xml
+++ b/ros-meta/roscpp_core/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
index 662b7918fc22..f7b007234224 100644
--- a/ros-meta/rosserial/metadata.xml
+++ b/ros-meta/rosserial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
diff --git a/ros-meta/rqt/metadata.xml b/ros-meta/rqt/metadata.xml
index 1590eb6cfcd4..017a00d947db 100644
--- a/ros-meta/rqt/metadata.xml
+++ b/ros-meta/rqt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt</remote-id>
 	</upstream>
diff --git a/ros-meta/rqt_common_plugins/metadata.xml b/ros-meta/rqt_common_plugins/metadata.xml
index 0d4f8cdce2d2..70caa7d107f0 100644
--- a/ros-meta/rqt_common_plugins/metadata.xml
+++ b/ros-meta/rqt_common_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
diff --git a/ros-meta/rqt_robot_plugins/metadata.xml b/ros-meta/rqt_robot_plugins/metadata.xml
index 07e852f71af7..cdfc0b5c52b1 100644
--- a/ros-meta/rqt_robot_plugins/metadata.xml
+++ b/ros-meta/rqt_robot_plugins/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
diff --git a/ros-meta/simulators/metadata.xml b/ros-meta/simulators/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/simulators/metadata.xml
+++ b/ros-meta/simulators/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/ros-meta/slam_gmapping/metadata.xml b/ros-meta/slam_gmapping/metadata.xml
index 6680cdd4e8a2..df3b2372a08e 100644
--- a/ros-meta/slam_gmapping/metadata.xml
+++ b/ros-meta/slam_gmapping/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
 	</upstream>
diff --git a/ros-meta/unique_identifier/metadata.xml b/ros-meta/unique_identifier/metadata.xml
index 709a6b508f6e..7e113d11e73d 100644
--- a/ros-meta/unique_identifier/metadata.xml
+++ b/ros-meta/unique_identifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
 	</upstream>
diff --git a/ros-meta/vision_opencv/metadata.xml b/ros-meta/vision_opencv/metadata.xml
index 08c6dc2f42da..63d56aafeb4f 100644
--- a/ros-meta/vision_opencv/metadata.xml
+++ b/ros-meta/vision_opencv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
diff --git a/ros-meta/vision_visp/metadata.xml b/ros-meta/vision_visp/metadata.xml
index b1bdd1b9e63f..2b528710d86f 100644
--- a/ros-meta/vision_visp/metadata.xml
+++ b/ros-meta/vision_visp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
diff --git a/ros-meta/visualization_tutorials/metadata.xml b/ros-meta/visualization_tutorials/metadata.xml
index 1fb936910c79..2d55141e2a57 100644
--- a/ros-meta/visualization_tutorials/metadata.xml
+++ b/ros-meta/visualization_tutorials/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
diff --git a/ros-meta/viz/metadata.xml b/ros-meta/viz/metadata.xml
index eca6af80e47b..60ad3976a9d4 100644
--- a/ros-meta/viz/metadata.xml
+++ b/ros-meta/viz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ros</herd>
+	<maintainer>
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
diff --git a/sci-astronomy/aatm/metadata.xml b/sci-astronomy/aatm/metadata.xml
index 19c9bd432907..d16c1cdc419a 100644
--- a/sci-astronomy/aatm/metadata.xml
+++ b/sci-astronomy/aatm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   ATmospheric Modeling for ALMA is a library of routines for modelling
   transmission of cm/mm/sub-mm wavelength radiation through the Earths
diff --git a/sci-astronomy/casa-data/metadata.xml b/sci-astronomy/casa-data/metadata.xml
index 32643d6165b8..511e7cfd8ada 100644
--- a/sci-astronomy/casa-data/metadata.xml
+++ b/sci-astronomy/casa-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Observatory tables, ephemerides and other software data related to
   the Common Astronomy Software Applications (CASA) suite.
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
index ffd9290dad47..dad9631ffcbf 100644
--- a/sci-astronomy/casacore/metadata.xml
+++ b/sci-astronomy/casacore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   A set of libraries for the the Common Astronomy Software
   Applications for radioastronomy. This project contains C++ libraries
diff --git a/sci-astronomy/cdsclient/metadata.xml b/sci-astronomy/cdsclient/metadata.xml
index a084fd41b97b..246aa1515e35 100644
--- a/sci-astronomy/cdsclient/metadata.xml
+++ b/sci-astronomy/cdsclient/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   The cdsclient package is a set of C and csh routines which can be
   built on Unix stations or PCs running Linux, which once compiled allow
diff --git a/sci-astronomy/celestia/metadata.xml b/sci-astronomy/celestia/metadata.xml
index af1f62b75290..9269fa07ca90 100644
--- a/sci-astronomy/celestia/metadata.xml
+++ b/sci-astronomy/celestia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   Celestia is a real-time space simulation that lets you experience
   our universe in three dimensions. You can travel throughout the solar
diff --git a/sci-astronomy/cpl/metadata.xml b/sci-astronomy/cpl/metadata.xml
index 8967e690c8fa..522f1868a3fa 100644
--- a/sci-astronomy/cpl/metadata.xml
+++ b/sci-astronomy/cpl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   The Common Pipeline Library (CPL) comprises a set of ISO-C libraries
   that provide a comprehensive, efficient and robust software
diff --git a/sci-astronomy/ds9-bin/metadata.xml b/sci-astronomy/ds9-bin/metadata.xml
index 53c6d9dbf790..3536a72ec925 100644
--- a/sci-astronomy/ds9-bin/metadata.xml
+++ b/sci-astronomy/ds9-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   The Smithsonian Astrophysical Observatory Image Deep Space 9 is an
   astronomical imaging and data visualization application. It is the
diff --git a/sci-astronomy/erfa/metadata.xml b/sci-astronomy/erfa/metadata.xml
index b8cb30425bd1..d799af9f8f5f 100644
--- a/sci-astronomy/erfa/metadata.xml
+++ b/sci-astronomy/erfa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   Essential Routines for Fundamental Astronomy is a C
   library containing key algorithms for astronomy, and is based on
diff --git a/sci-astronomy/esorex/metadata.xml b/sci-astronomy/esorex/metadata.xml
index 4a01f01fa036..9169ace8a9c5 100644
--- a/sci-astronomy/esorex/metadata.xml
+++ b/sci-astronomy/esorex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   EsoRex is the ESO Recipe Execution Tool. It can list, configure and
   execute CPL-based recipes from the command line. One of the features
diff --git a/sci-astronomy/funtools/metadata.xml b/sci-astronomy/funtools/metadata.xml
index e5ca7e8ca451..f6170ba4918e 100644
--- a/sci-astronomy/funtools/metadata.xml
+++ b/sci-astronomy/funtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Funtools, is a minimal buy-in FITS library and utility package from 
   the SAO/HEAD. The Funtools library provides simplified
diff --git a/sci-astronomy/galaxy/metadata.xml b/sci-astronomy/galaxy/metadata.xml
index 94a0b6211442..8464439fdb65 100644
--- a/sci-astronomy/galaxy/metadata.xml
+++ b/sci-astronomy/galaxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Stellar simulation program. Watch a few stars move around each-other, 
   accelerated by their mutual attractions, or watch thousands of random 
diff --git a/sci-astronomy/gasgano/metadata.xml b/sci-astronomy/gasgano/metadata.xml
index 247aae21d92c..391ad8c133e8 100644
--- a/sci-astronomy/gasgano/metadata.xml
+++ b/sci-astronomy/gasgano/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Gasgano is a Data File Organiser developed and maintained by ESO to
   help its user community to manage and organise in a systematic way the
diff --git a/sci-astronomy/idlastro/metadata.xml b/sci-astronomy/idlastro/metadata.xml
index 999356b8385e..f3474e9ea364 100644
--- a/sci-astronomy/idlastro/metadata.xml
+++ b/sci-astronomy/idlastro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   The IDL Astronomy Users Library is a central repository for
   low-level astronomy software written in the commercial language
diff --git a/sci-astronomy/kapteyn/metadata.xml b/sci-astronomy/kapteyn/metadata.xml
index 267478de4e38..22a97a1474e1 100644
--- a/sci-astronomy/kapteyn/metadata.xml
+++ b/sci-astronomy/kapteyn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Kapteyn Package is a collection of Python modules and applications
   made by the computer group of the Kapteyn Astronomical Institute,
diff --git a/sci-astronomy/predict/metadata.xml b/sci-astronomy/predict/metadata.xml
index d18483f11bb1..c1c75695a602 100644
--- a/sci-astronomy/predict/metadata.xml
+++ b/sci-astronomy/predict/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Predict is a satellite tracking program. It is probably mostly of interest
   to users of amateur satellites, but includes support for optionally
diff --git a/sci-astronomy/pyephem/metadata.xml b/sci-astronomy/pyephem/metadata.xml
index e09bb9cc9755..7ef68813d27a 100644
--- a/sci-astronomy/pyephem/metadata.xml
+++ b/sci-astronomy/pyephem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   PyEphem provides astronomical computations for the Python programming
   language. Given a date and location on the Earth's surface, it can
diff --git a/sci-astronomy/skycat/metadata.xml b/sci-astronomy/skycat/metadata.xml
index 3dc3286a7646..cb67ef570c3a 100644
--- a/sci-astronomy/skycat/metadata.xml
+++ b/sci-astronomy/skycat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   SkyCat is a tool that combines visualization of images and access
   to catalogs and archive data for astronomy. It was developed at
diff --git a/sci-astronomy/sofa_c/metadata.xml b/sci-astronomy/sofa_c/metadata.xml
index 17260472bb98..a9c6ea83d457 100644
--- a/sci-astronomy/sofa_c/metadata.xml
+++ b/sci-astronomy/sofa_c/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
  This is a suite of vector/matrix routines and various utilities that
  underpin the astronomy algorithms, which include routines for the
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index fb81ca02228e..96d664effe2c 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
   <maintainer>
     <email>mr_bones_@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   Stellarium is a free open source planetarium for your computer. It
   shows a realistic sky in 3D, just like what you see with the naked
diff --git a/sci-astronomy/stiff/metadata.xml b/sci-astronomy/stiff/metadata.xml
index 320c9fec8acd..c6f7728748a9 100644
--- a/sci-astronomy/stiff/metadata.xml
+++ b/sci-astronomy/stiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   STIFF is a program that convert scientific FITS images to the
   more popular TIFF, in 8 (grayscale) or 24 (true colour: 3 times 8) bits per
diff --git a/sci-astronomy/swarp/metadata.xml b/sci-astronomy/swarp/metadata.xml
index 754cc2e41ac9..139434282f78 100644
--- a/sci-astronomy/swarp/metadata.xml
+++ b/sci-astronomy/swarp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   SWarp takes astronomical FITS images with a WCS-like projection,
   resample and stack them all.
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 555cb5bd1c8e..94d9cc42696c 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   WCSLIB is a C library, supplied with a full set of Fortran wrappers,
   that implements the "World Coordinate System" (WCS) convention in FITS
diff --git a/sci-astronomy/wcstools/metadata.xml b/sci-astronomy/wcstools/metadata.xml
index 5b47de1054ae..5a8706ad1ce8 100644
--- a/sci-astronomy/wcstools/metadata.xml
+++ b/sci-astronomy/wcstools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Astronomers often need to relate positions on an image of the sky to
   positions on the real sky to identify catalogued objects in images,
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
index fef7b80eea0d..9d7b3fc4db97 100644
--- a/sci-astronomy/xephem/metadata.xml
+++ b/sci-astronomy/xephem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   Xephem is an interactive astronomical ephemeris program for X Windows
   systems. It computes heliocentric, geocentric and topocentric
diff --git a/sci-astronomy/xfitsview/metadata.xml b/sci-astronomy/xfitsview/metadata.xml
index 443e587c9782..217f40b2f46d 100644
--- a/sci-astronomy/xfitsview/metadata.xml
+++ b/sci-astronomy/xfitsview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
   XFITSview is a Graphical User Interface based on the Motif library to
   visualize astronomical images in the FITS format. It's a fairly simple
diff --git a/sci-biology/GBrowse/metadata.xml b/sci-biology/GBrowse/metadata.xml
index 32b15c723f9d..dd5b8c1f2520 100644
--- a/sci-biology/GBrowse/metadata.xml
+++ b/sci-biology/GBrowse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
+<maintainer>
+  <email>sci-biology@gentoo.org</email>
+  <name>Gentoo Biology Project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpan">GBrowse</remote-id>
 </upstream>
diff --git a/sci-biology/aaindex/metadata.xml b/sci-biology/aaindex/metadata.xml
index ccb567e64e02..0b81292dee88 100644
--- a/sci-biology/aaindex/metadata.xml
+++ b/sci-biology/aaindex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		Amino acid indices and similarity matrices maintained at Kyoto
 		University. An amino acid index is a set of 20 numerical values
diff --git a/sci-biology/abyss/metadata.xml b/sci-biology/abyss/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/abyss/metadata.xml
+++ b/sci-biology/abyss/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/allpathslg/metadata.xml b/sci-biology/allpathslg/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/allpathslg/metadata.xml
+++ b/sci-biology/allpathslg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/amap/metadata.xml b/sci-biology/amap/metadata.xml
index 34294c65ca04..33fe2f0e7ca6 100644
--- a/sci-biology/amap/metadata.xml
+++ b/sci-biology/amap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
+<maintainer>
+	<email>sci-biology@gentoo.org</email>
+	<name>Gentoo Biology Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/amos/metadata.xml b/sci-biology/amos/metadata.xml
index a73ee9189a98..fb346f5febdd 100644
--- a/sci-biology/amos/metadata.xml
+++ b/sci-biology/amos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">amos</remote-id>
   </upstream>
diff --git a/sci-biology/arb/metadata.xml b/sci-biology/arb/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/arb/metadata.xml
+++ b/sci-biology/arb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/ariadne/metadata.xml b/sci-biology/ariadne/metadata.xml
index 3e55c00f9d7b..5abaffad62e6 100644
--- a/sci-biology/ariadne/metadata.xml
+++ b/sci-biology/ariadne/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		ARIADNE is a package of two programs, ariadne and prospero, that
 		compare protein sequences and profiles using the Smith-Waterman
diff --git a/sci-biology/augustus/metadata.xml b/sci-biology/augustus/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/augustus/metadata.xml
+++ b/sci-biology/augustus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/bamtools/metadata.xml b/sci-biology/bamtools/metadata.xml
index f2c00c1fdd0c..77ef447510c1 100644
--- a/sci-biology/bamtools/metadata.xml
+++ b/sci-biology/bamtools/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>BAM (Binary Alignment/Map) format is useful for storing large DNA sequence alignments. It is closely related to the text-based SAM format, but optimized for random-access. BamTools provides a fast, flexible C++ API for reading and writing BAM files.</longdescription>
   <upstream>
     <remote-id type="github">pezmaster31/bamtools</remote-id>
diff --git a/sci-biology/beast-mcmc/metadata.xml b/sci-biology/beast-mcmc/metadata.xml
index 7764bf07c826..90166c061e0b 100644
--- a/sci-biology/beast-mcmc/metadata.xml
+++ b/sci-biology/beast-mcmc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">beast-dev/beast-mcmc</remote-id>
   </upstream>
diff --git a/sci-biology/bedtools/metadata.xml b/sci-biology/bedtools/metadata.xml
index 6edffa4a6dc3..7cdbc1cb1bfe 100644
--- a/sci-biology/bedtools/metadata.xml
+++ b/sci-biology/bedtools/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     BEDTools: a flexible suite of utilities for comparing genomic features.
   </longdescription>
diff --git a/sci-biology/bfast/metadata.xml b/sci-biology/bfast/metadata.xml
index 45107864e217..6b84fb0e72ba 100644
--- a/sci-biology/bfast/metadata.xml
+++ b/sci-biology/bfast/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bfast</remote-id>
   </upstream>
diff --git a/sci-biology/biogrep/metadata.xml b/sci-biology/biogrep/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-biology/biogrep/metadata.xml
+++ b/sci-biology/biogrep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/biojava/metadata.xml b/sci-biology/biojava/metadata.xml
index 0a18364544e8..fd50d98599dc 100644
--- a/sci-biology/biojava/metadata.xml
+++ b/sci-biology/biojava/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
+<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/biopandas/metadata.xml b/sci-biology/biopandas/metadata.xml
index c2ee060b99bc..8b559490c96f 100644
--- a/sci-biology/biopandas/metadata.xml
+++ b/sci-biology/biopandas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">BioPandas</remote-id>
     <maintainer status="unknown">
diff --git a/sci-biology/bioperl-db/metadata.xml b/sci-biology/bioperl-db/metadata.xml
index 642468c809b7..c175ecb3d49f 100644
--- a/sci-biology/bioperl-db/metadata.xml
+++ b/sci-biology/bioperl-db/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">BioPerl-DB</remote-id>
   </upstream>
diff --git a/sci-biology/bioperl-network/metadata.xml b/sci-biology/bioperl-network/metadata.xml
index 045af7cc6148..3102a0155387 100644
--- a/sci-biology/bioperl-network/metadata.xml
+++ b/sci-biology/bioperl-network/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">BioPerl-Network</remote-id>
   </upstream>
diff --git a/sci-biology/bioperl-run/metadata.xml b/sci-biology/bioperl-run/metadata.xml
index f8c7078a2813..09980b2cce9d 100644
--- a/sci-biology/bioperl-run/metadata.xml
+++ b/sci-biology/bioperl-run/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">BioPerl-Run</remote-id>
   </upstream>
diff --git a/sci-biology/bioperl/metadata.xml b/sci-biology/bioperl/metadata.xml
index 210ba364d45f..aeed8448672e 100644
--- a/sci-biology/bioperl/metadata.xml
+++ b/sci-biology/bioperl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="run">Install sci-biology/bioperl-run</flag>
     <flag name="network">Install sci-biology/bioperl-run</flag>
diff --git a/sci-biology/biopython/metadata.xml b/sci-biology/biopython/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/biopython/metadata.xml
+++ b/sci-biology/biopython/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/bioruby/metadata.xml b/sci-biology/bioruby/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-biology/bioruby/metadata.xml
+++ b/sci-biology/bioruby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/biosql/metadata.xml b/sci-biology/biosql/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/biosql/metadata.xml
+++ b/sci-biology/biosql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/blat/metadata.xml b/sci-biology/blat/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/blat/metadata.xml
+++ b/sci-biology/blat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/blossoc/metadata.xml b/sci-biology/blossoc/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/blossoc/metadata.xml
+++ b/sci-biology/blossoc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/bowtie/metadata.xml b/sci-biology/bowtie/metadata.xml
index 6e56af71b3d1..8654e51c64f7 100644
--- a/sci-biology/bowtie/metadata.xml
+++ b/sci-biology/bowtie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bowtie-bio</remote-id>
   </upstream>
diff --git a/sci-biology/bwa/metadata.xml b/sci-biology/bwa/metadata.xml
index 97a33fbf5c42..f32466d551c7 100644
--- a/sci-biology/bwa/metadata.xml
+++ b/sci-biology/bwa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bio-bwa</remote-id>
   </upstream>
diff --git a/sci-biology/cd-hit/metadata.xml b/sci-biology/cd-hit/metadata.xml
index bd5607ab16b5..2fad5f23ef85 100644
--- a/sci-biology/cd-hit/metadata.xml
+++ b/sci-biology/cd-hit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 CD-HIT is a very widely used program for clustering and comparing large sets 
 of protein or nucleotide sequences. CD-HIT is very fast and can handle 
diff --git a/sci-biology/clustal-omega/metadata.xml b/sci-biology/clustal-omega/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/clustal-omega/metadata.xml
+++ b/sci-biology/clustal-omega/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/clustalw-mpi/metadata.xml b/sci-biology/clustalw-mpi/metadata.xml
index ab9706172a69..77328aff54c1 100644
--- a/sci-biology/clustalw-mpi/metadata.xml
+++ b/sci-biology/clustalw-mpi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
+<maintainer>
+  <email>sci-biology@gentoo.org</email>
+  <name>Gentoo Biology Project</name>
+</maintainer>
 <use>
   <flag name="mpi_njtree">Use MPI (as opposed to serial) code for computing
     neighbor-joining trees</flag>
diff --git a/sci-biology/clustalw/metadata.xml b/sci-biology/clustalw/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/clustalw/metadata.xml
+++ b/sci-biology/clustalw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/clustalx/metadata.xml b/sci-biology/clustalx/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/clustalx/metadata.xml
+++ b/sci-biology/clustalx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/consed/metadata.xml b/sci-biology/consed/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/consed/metadata.xml
+++ b/sci-biology/consed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/cufflinks/metadata.xml b/sci-biology/cufflinks/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/cufflinks/metadata.xml
+++ b/sci-biology/cufflinks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/cutg/metadata.xml b/sci-biology/cutg/metadata.xml
index 59b110912ca6..bd81d3edcae2 100644
--- a/sci-biology/cutg/metadata.xml
+++ b/sci-biology/cutg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		Codon usage tables maintained at the Kazusa DNA Research Institute.
 		Codon usage in individual genes has been calculated using the
diff --git a/sci-biology/dialign-tx/metadata.xml b/sci-biology/dialign-tx/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/dialign-tx/metadata.xml
+++ b/sci-biology/dialign-tx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/dialign2/metadata.xml b/sci-biology/dialign2/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/dialign2/metadata.xml
+++ b/sci-biology/dialign2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/diya/metadata.xml b/sci-biology/diya/metadata.xml
index d6b9de8b20a7..244e2acd0451 100644
--- a/sci-biology/diya/metadata.xml
+++ b/sci-biology/diya/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">diyg</remote-id>
   </upstream>
diff --git a/sci-biology/elph/metadata.xml b/sci-biology/elph/metadata.xml
index 469879ba8f5b..3267c1d4d444 100644
--- a/sci-biology/elph/metadata.xml
+++ b/sci-biology/elph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		ELPH is a general-purpose Gibbs sampler for finding motifs in a set of
 		DNA or protein sequences. The program takes as input a set containing
diff --git a/sci-biology/embassy-cbstools/metadata.xml b/sci-biology/embassy-cbstools/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-cbstools/metadata.xml
+++ b/sci-biology/embassy-cbstools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-clustalomega/metadata.xml b/sci-biology/embassy-clustalomega/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-clustalomega/metadata.xml
+++ b/sci-biology/embassy-clustalomega/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-domainatrix/metadata.xml b/sci-biology/embassy-domainatrix/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-domainatrix/metadata.xml
+++ b/sci-biology/embassy-domainatrix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-domalign/metadata.xml b/sci-biology/embassy-domalign/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-domalign/metadata.xml
+++ b/sci-biology/embassy-domalign/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-domsearch/metadata.xml b/sci-biology/embassy-domsearch/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-domsearch/metadata.xml
+++ b/sci-biology/embassy-domsearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-emnu/metadata.xml b/sci-biology/embassy-emnu/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-emnu/metadata.xml
+++ b/sci-biology/embassy-emnu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-esim4/metadata.xml b/sci-biology/embassy-esim4/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-esim4/metadata.xml
+++ b/sci-biology/embassy-esim4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-hmmer/metadata.xml b/sci-biology/embassy-hmmer/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-hmmer/metadata.xml
+++ b/sci-biology/embassy-hmmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-iprscan/metadata.xml b/sci-biology/embassy-iprscan/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-iprscan/metadata.xml
+++ b/sci-biology/embassy-iprscan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-meme/metadata.xml b/sci-biology/embassy-meme/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-meme/metadata.xml
+++ b/sci-biology/embassy-meme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-mse/metadata.xml b/sci-biology/embassy-mse/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-mse/metadata.xml
+++ b/sci-biology/embassy-mse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-phylipnew/metadata.xml b/sci-biology/embassy-phylipnew/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-phylipnew/metadata.xml
+++ b/sci-biology/embassy-phylipnew/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-signature/metadata.xml b/sci-biology/embassy-signature/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-signature/metadata.xml
+++ b/sci-biology/embassy-signature/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-structure/metadata.xml b/sci-biology/embassy-structure/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-structure/metadata.xml
+++ b/sci-biology/embassy-structure/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-topo/metadata.xml b/sci-biology/embassy-topo/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-topo/metadata.xml
+++ b/sci-biology/embassy-topo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy-vienna/metadata.xml b/sci-biology/embassy-vienna/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy-vienna/metadata.xml
+++ b/sci-biology/embassy-vienna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/embassy/metadata.xml b/sci-biology/embassy/metadata.xml
index fbd4705346b4..e83d435707cb 100644
--- a/sci-biology/embassy/metadata.xml
+++ b/sci-biology/embassy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">emboss</remote-id>
   </upstream>
diff --git a/sci-biology/emboss/metadata.xml b/sci-biology/emboss/metadata.xml
index 8d209e2d5d8f..c94784a8eb04 100644
--- a/sci-biology/emboss/metadata.xml
+++ b/sci-biology/emboss/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		EMBOSS is "The European Molecular Biology Open Software Suite".
 		EMBOSS is a free Open Source software analysis package specially
diff --git a/sci-biology/eugene/metadata.xml b/sci-biology/eugene/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/eugene/metadata.xml
+++ b/sci-biology/eugene/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/exonerate/metadata.xml b/sci-biology/exonerate/metadata.xml
index 711d805d77e7..6258e1d8b533 100644
--- a/sci-biology/exonerate/metadata.xml
+++ b/sci-biology/exonerate/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription lang="en">
 		exonerate is a generic tool for pairwise sequence comparison
 	</longdescription>
diff --git a/sci-biology/express/metadata.xml b/sci-biology/express/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/express/metadata.xml
+++ b/sci-biology/express/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/fasta/metadata.xml b/sci-biology/fasta/metadata.xml
index b98c9919d241..eb1406f77657 100644
--- a/sci-biology/fasta/metadata.xml
+++ b/sci-biology/fasta/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/sci-biology/fasttree/metadata.xml b/sci-biology/fasttree/metadata.xml
index 5ee1f51e55df..0c1572eed0f6 100644
--- a/sci-biology/fasttree/metadata.xml
+++ b/sci-biology/fasttree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="double-precision">
 	use double precision instead of single-precision floating point 
diff --git a/sci-biology/finchtv/metadata.xml b/sci-biology/finchtv/metadata.xml
index e487463fc00b..53f5683fb440 100644
--- a/sci-biology/finchtv/metadata.xml
+++ b/sci-biology/finchtv/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription lang="en">
 A cross-platform graphical viewer for chromatogram files.
 </longdescription>
diff --git a/sci-biology/foldingathome/metadata.xml b/sci-biology/foldingathome/metadata.xml
index 63d767b84f60..93760f0c0505 100644
--- a/sci-biology/foldingathome/metadata.xml
+++ b/sci-biology/foldingathome/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
 <maintainer>
 	<email>axs@gentoo.org</email>
 	<name>Ian Stakenvicius</name>
 </maintainer>
+<maintainer>
+	<email>sci-biology@gentoo.org</email>
+	<name>Gentoo Biology Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/gatk/metadata.xml b/sci-biology/gatk/metadata.xml
index 154ecb1ad660..6c88340e4da5 100644
--- a/sci-biology/gatk/metadata.xml
+++ b/sci-biology/gatk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">broadgsa/gatk</remote-id>
   </upstream>
diff --git a/sci-biology/gibbs/metadata.xml b/sci-biology/gibbs/metadata.xml
index c31e2db70216..04b15c135918 100644
--- a/sci-biology/gibbs/metadata.xml
+++ b/sci-biology/gibbs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		The Gibbs motif sampler stochastically examines candidate alignments
 		in an effort to find the best alignment as measured by the maximum
diff --git a/sci-biology/glimmer/metadata.xml b/sci-biology/glimmer/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/glimmer/metadata.xml
+++ b/sci-biology/glimmer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/glimmerhmm/metadata.xml b/sci-biology/glimmerhmm/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/glimmerhmm/metadata.xml
+++ b/sci-biology/glimmerhmm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/gmap/metadata.xml b/sci-biology/gmap/metadata.xml
index 7d62e2f44e07..75e4f21c5a7b 100644
--- a/sci-biology/gmap/metadata.xml
+++ b/sci-biology/gmap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="samtools">Enable support for samtools</flag>
     <flag name="goby">Enable support for goby</flag>
diff --git a/sci-biology/goby-cpp/metadata.xml b/sci-biology/goby-cpp/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/goby-cpp/metadata.xml
+++ b/sci-biology/goby-cpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/goby/metadata.xml b/sci-biology/goby/metadata.xml
index 3bc02ac6b32e..09c094d65c32 100644
--- a/sci-biology/goby/metadata.xml
+++ b/sci-biology/goby/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="cpp">Compile C/C++ API</flag>
   </use>
diff --git a/sci-biology/hmmer/metadata.xml b/sci-biology/hmmer/metadata.xml
index 66fa76626615..35f1aabfb0c6 100644
--- a/sci-biology/hmmer/metadata.xml
+++ b/sci-biology/hmmer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<use>
 		<flag name="pvm">Add support for parallel virtual machine
     (<pkg>sys-cluster/pvm</pkg>)</flag>
diff --git a/sci-biology/iedera/metadata.xml b/sci-biology/iedera/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/iedera/metadata.xml
+++ b/sci-biology/iedera/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/infernal/metadata.xml b/sci-biology/infernal/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/infernal/metadata.xml
+++ b/sci-biology/infernal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/iqpnni/metadata.xml b/sci-biology/iqpnni/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/iqpnni/metadata.xml
+++ b/sci-biology/iqpnni/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/kalign/metadata.xml b/sci-biology/kalign/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/kalign/metadata.xml
+++ b/sci-biology/kalign/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/lagan/metadata.xml b/sci-biology/lagan/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/lagan/metadata.xml
+++ b/sci-biology/lagan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/last/metadata.xml b/sci-biology/last/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/last/metadata.xml
+++ b/sci-biology/last/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mafft/metadata.xml b/sci-biology/mafft/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/mafft/metadata.xml
+++ b/sci-biology/mafft/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mammoth/metadata.xml b/sci-biology/mammoth/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/mammoth/metadata.xml
+++ b/sci-biology/mammoth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/maq/metadata.xml b/sci-biology/maq/metadata.xml
index 79ebcc09421b..ad8c7ce46d3d 100644
--- a/sci-biology/maq/metadata.xml
+++ b/sci-biology/maq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">maq</remote-id>
   </upstream>
diff --git a/sci-biology/maqview/metadata.xml b/sci-biology/maqview/metadata.xml
index 79ebcc09421b..ad8c7ce46d3d 100644
--- a/sci-biology/maqview/metadata.xml
+++ b/sci-biology/maqview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">maq</remote-id>
   </upstream>
diff --git a/sci-biology/mauve/metadata.xml b/sci-biology/mauve/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/mauve/metadata.xml
+++ b/sci-biology/mauve/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mauvealigner/metadata.xml b/sci-biology/mauvealigner/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/mauvealigner/metadata.xml
+++ b/sci-biology/mauvealigner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mcl/metadata.xml b/sci-biology/mcl/metadata.xml
index aa6527e1e839..10a66dc7fb52 100644
--- a/sci-biology/mcl/metadata.xml
+++ b/sci-biology/mcl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="blast">
 		add support for NCBI BLAST data
diff --git a/sci-biology/meme/metadata.xml b/sci-biology/meme/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/meme/metadata.xml
+++ b/sci-biology/meme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mira/metadata.xml b/sci-biology/mira/metadata.xml
index a2c7c1a0a6a7..c19aae1ceb3e 100644
--- a/sci-biology/mira/metadata.xml
+++ b/sci-biology/mira/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mira-assembler</remote-id>
   </upstream>
diff --git a/sci-biology/mosaik/metadata.xml b/sci-biology/mosaik/metadata.xml
index 4dfd5b0bdafa..aa553c40c0f8 100644
--- a/sci-biology/mosaik/metadata.xml
+++ b/sci-biology/mosaik/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">mosaik-aligner</remote-id>
   </upstream>
diff --git a/sci-biology/mothur/metadata.xml b/sci-biology/mothur/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/mothur/metadata.xml
+++ b/sci-biology/mothur/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/mrbayes/metadata.xml b/sci-biology/mrbayes/metadata.xml
index 8a6a5b986dc7..261827941f1c 100644
--- a/sci-biology/mrbayes/metadata.xml
+++ b/sci-biology/mrbayes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 MrBayes is a program for the Bayesian estimation of phylogeny.
 Bayesian inference of phylogeny is based upon a quantity called the
diff --git a/sci-biology/mummer/metadata.xml b/sci-biology/mummer/metadata.xml
index f82b462e1f95..c8ed0daf6032 100644
--- a/sci-biology/mummer/metadata.xml
+++ b/sci-biology/mummer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mummer</remote-id>
   </upstream>
diff --git a/sci-biology/muscle/metadata.xml b/sci-biology/muscle/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/muscle/metadata.xml
+++ b/sci-biology/muscle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/ncbi-tools/metadata.xml b/sci-biology/ncbi-tools/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/ncbi-tools/metadata.xml
+++ b/sci-biology/ncbi-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/newick-utils/metadata.xml b/sci-biology/newick-utils/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/newick-utils/metadata.xml
+++ b/sci-biology/newick-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/njplot/metadata.xml b/sci-biology/njplot/metadata.xml
index 31592430880f..c8f187b0f040 100644
--- a/sci-biology/njplot/metadata.xml
+++ b/sci-biology/njplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		NJplot is a tree drawing program able to draw any phylogenetic tree
 		expressed in the Newick phylogenetic tree format (e.g., the format used
diff --git a/sci-biology/pals/metadata.xml b/sci-biology/pals/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/pals/metadata.xml
+++ b/sci-biology/pals/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/paml/metadata.xml b/sci-biology/paml/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/paml/metadata.xml
+++ b/sci-biology/paml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/phrap/metadata.xml b/sci-biology/phrap/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/phrap/metadata.xml
+++ b/sci-biology/phrap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/phred/metadata.xml b/sci-biology/phred/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/phred/metadata.xml
+++ b/sci-biology/phred/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/phylip/metadata.xml b/sci-biology/phylip/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/phylip/metadata.xml
+++ b/sci-biology/phylip/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/phyml/metadata.xml b/sci-biology/phyml/metadata.xml
index d0355f85e406..8626055a85fb 100644
--- a/sci-biology/phyml/metadata.xml
+++ b/sci-biology/phyml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription lang="en">
 		 Phyml is a simple, fast, and accurate algorithm to estimate large
 		 phylogenies by maximum likelihood. Given input sequence files, it
diff --git a/sci-biology/picard/metadata.xml b/sci-biology/picard/metadata.xml
index 84dc21074bfa..0dbbc21cb0c0 100644
--- a/sci-biology/picard/metadata.xml
+++ b/sci-biology/picard/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
 	<maintainer>
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz (ercpe)</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">picard</remote-id>
 	</upstream>
diff --git a/sci-biology/piler/metadata.xml b/sci-biology/piler/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/piler/metadata.xml
+++ b/sci-biology/piler/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/pilercr/metadata.xml b/sci-biology/pilercr/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/pilercr/metadata.xml
+++ b/sci-biology/pilercr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/plink/metadata.xml b/sci-biology/plink/metadata.xml
index 80af0e1d0365..d20429783580 100644
--- a/sci-biology/plink/metadata.xml
+++ b/sci-biology/plink/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<use>
 		<flag name="webcheck">
 			add support for online update checking every time the program starts
diff --git a/sci-biology/poa/metadata.xml b/sci-biology/poa/metadata.xml
index 65027f64ec24..df5a71d4b3da 100644
--- a/sci-biology/poa/metadata.xml
+++ b/sci-biology/poa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">poamsa</remote-id>
   </upstream>
diff --git a/sci-biology/prank/metadata.xml b/sci-biology/prank/metadata.xml
index 2cd3c04eeca0..b78865c59707 100644
--- a/sci-biology/prank/metadata.xml
+++ b/sci-biology/prank/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">prank-msa</remote-id>
   </upstream>
diff --git a/sci-biology/primer3/metadata.xml b/sci-biology/primer3/metadata.xml
index 1fbadfaf3b77..ffbf630ac6d9 100644
--- a/sci-biology/primer3/metadata.xml
+++ b/sci-biology/primer3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		Primer3 picks primers for PCR reactions, considering: oligonucleotide
 		melting temperature, size, GC content, and primer-dimer possibilities;
diff --git a/sci-biology/prints/metadata.xml b/sci-biology/prints/metadata.xml
index 7d2927f1d2fb..85aa23579473 100644
--- a/sci-biology/prints/metadata.xml
+++ b/sci-biology/prints/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		A protein motif fingerprint database maintained at the University of
 		Manchester. A fingerprint is a group of conserved motifs used to
diff --git a/sci-biology/probcons/metadata.xml b/sci-biology/probcons/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/probcons/metadata.xml
+++ b/sci-biology/probcons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/prodigal/metadata.xml b/sci-biology/prodigal/metadata.xml
index 6e8b2ee66e66..6127cfce8631 100644
--- a/sci-biology/prodigal/metadata.xml
+++ b/sci-biology/prodigal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">prodigal</remote-id>
 	</upstream>
diff --git a/sci-biology/profphd/metadata.xml b/sci-biology/profphd/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/profphd/metadata.xml
+++ b/sci-biology/profphd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/prosite/metadata.xml b/sci-biology/prosite/metadata.xml
index 075d4b7bcf10..f4ae5f2f2357 100644
--- a/sci-biology/prosite/metadata.xml
+++ b/sci-biology/prosite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		A protein families and domains database maintained at the Swiss
 		Institude for Bioinformatics. It consists of biologically significant
diff --git a/sci-biology/psipred/metadata.xml b/sci-biology/psipred/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/psipred/metadata.xml
+++ b/sci-biology/psipred/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/pysam/metadata.xml b/sci-biology/pysam/metadata.xml
index 49afc3c3d532..b5ea8de18999 100644
--- a/sci-biology/pysam/metadata.xml
+++ b/sci-biology/pysam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">pysam</remote-id>
   </upstream>
diff --git a/sci-biology/qrna/metadata.xml b/sci-biology/qrna/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-biology/qrna/metadata.xml
+++ b/sci-biology/qrna/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-biology/raxml/metadata.xml b/sci-biology/raxml/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/raxml/metadata.xml
+++ b/sci-biology/raxml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/readseq/metadata.xml b/sci-biology/readseq/metadata.xml
index b198f044f3f5..c4ba5b442f03 100644
--- a/sci-biology/readseq/metadata.xml
+++ b/sci-biology/readseq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		Reads and writes nucleic/protein sequences in various formats. Data
 		files may have multiple sequences.
diff --git a/sci-biology/rebase/metadata.xml b/sci-biology/rebase/metadata.xml
index 734fcff7e215..00f4eff0230b 100644
--- a/sci-biology/rebase/metadata.xml
+++ b/sci-biology/rebase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		The Restriction Enzyme data BASE is a collection of information about
 		restriction enzymes and related proteins. It is maintained by New
diff --git a/sci-biology/recon/metadata.xml b/sci-biology/recon/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/recon/metadata.xml
+++ b/sci-biology/recon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/repeatmasker-libraries/metadata.xml b/sci-biology/repeatmasker-libraries/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/repeatmasker-libraries/metadata.xml
+++ b/sci-biology/repeatmasker-libraries/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/repeatmasker/metadata.xml b/sci-biology/repeatmasker/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/repeatmasker/metadata.xml
+++ b/sci-biology/repeatmasker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/rmblast/metadata.xml b/sci-biology/rmblast/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/rmblast/metadata.xml
+++ b/sci-biology/rmblast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/rnaview/metadata.xml b/sci-biology/rnaview/metadata.xml
index b243b0c8da63..40b3de3cd5af 100644
--- a/sci-biology/rnaview/metadata.xml
+++ b/sci-biology/rnaview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		The RNAView program generates 2-dimensional displays of RNA/DNA
 		secondary structures with tertiary interactions. RNAView
diff --git a/sci-biology/samtools/metadata.xml b/sci-biology/samtools/metadata.xml
index 74dc02bc9826..0a1dbde36484 100644
--- a/sci-biology/samtools/metadata.xml
+++ b/sci-biology/samtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">samtools</remote-id>
   </upstream>
diff --git a/sci-biology/seaview/metadata.xml b/sci-biology/seaview/metadata.xml
index 33794f43ab01..cd9ab1e768a8 100644
--- a/sci-biology/seaview/metadata.xml
+++ b/sci-biology/seaview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		SeaView is a graphical multiple sequence alignment editor developped by
 		Manolo Gouy. SeaView is able to read and write various alignment
diff --git a/sci-biology/seqan/metadata.xml b/sci-biology/seqan/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/seqan/metadata.xml
+++ b/sci-biology/seqan/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/shrimp/metadata.xml b/sci-biology/shrimp/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/shrimp/metadata.xml
+++ b/sci-biology/shrimp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/sibsim4/metadata.xml b/sci-biology/sibsim4/metadata.xml
index cfcd5be131d0..aa076ffc51a8 100644
--- a/sci-biology/sibsim4/metadata.xml
+++ b/sci-biology/sibsim4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">sibsim4</remote-id>
   </upstream>
diff --git a/sci-biology/sim4/metadata.xml b/sci-biology/sim4/metadata.xml
index ea9731279003..bda90bda309b 100644
--- a/sci-biology/sim4/metadata.xml
+++ b/sci-biology/sim4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		sim4 is a similarity-based tool for aligning an expressed DNA sequence
 		(EST, cDNA, mRNA) with a genomic sequence for the gene. It also detects
diff --git a/sci-biology/snpfile/metadata.xml b/sci-biology/snpfile/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/snpfile/metadata.xml
+++ b/sci-biology/snpfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/stride/metadata.xml b/sci-biology/stride/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/stride/metadata.xml
+++ b/sci-biology/stride/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/t-coffee/metadata.xml b/sci-biology/t-coffee/metadata.xml
index 9a577185ee36..c3fee0cdc751 100644
--- a/sci-biology/t-coffee/metadata.xml
+++ b/sci-biology/t-coffee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		T-Coffee is a multiple sequence alignment package. Given a set of
 		sequences (Proteins or DNA), T-Coffee generates a multiple sequence
diff --git a/sci-biology/tophat/metadata.xml b/sci-biology/tophat/metadata.xml
index 36cf4a138940..82e16023cf28 100644
--- a/sci-biology/tophat/metadata.xml
+++ b/sci-biology/tophat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="bam">Compile support for the BAM format</flag>
   </use>
diff --git a/sci-biology/transfac/metadata.xml b/sci-biology/transfac/metadata.xml
index d07df4fd4dbf..73322a777ed6 100644
--- a/sci-biology/transfac/metadata.xml
+++ b/sci-biology/transfac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		TRANSFAC® is a database of eukaryotic transcription factors, of their
 		genomic binding sites and DNA-binding profiles. TRANSFAC 3.2 is an old
diff --git a/sci-biology/tree-puzzle/metadata.xml b/sci-biology/tree-puzzle/metadata.xml
index cbdeede346fa..2db6e8eb8fab 100644
--- a/sci-biology/tree-puzzle/metadata.xml
+++ b/sci-biology/tree-puzzle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		TREE-PUZZLE is a computer program to reconstruct phylogenetic trees
 		from molecular sequence data by maximum likelihood. It implements a
diff --git a/sci-biology/treeviewx/metadata.xml b/sci-biology/treeviewx/metadata.xml
index e351ff6c1fa9..9a2171b2dfa3 100644
--- a/sci-biology/treeviewx/metadata.xml
+++ b/sci-biology/treeviewx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 		TreeView X is a program for displaying phylogenetic trees on Linux and
 		UNIX platforms. It can read and display NEXUS and Newick format tree
diff --git a/sci-biology/trf/metadata.xml b/sci-biology/trf/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/trf/metadata.xml
+++ b/sci-biology/trf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/trnascan-se/metadata.xml b/sci-biology/trnascan-se/metadata.xml
index 55de1683677f..ec21c8b9a5fe 100644
--- a/sci-biology/trnascan-se/metadata.xml
+++ b/sci-biology/trnascan-se/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 		tRNAscan-SE detects ~99% of eukaryotic nuclear or prokaryotic tRNA
 		genes, with a false positive rate of less than one per 15 gigabases,
diff --git a/sci-biology/uchime/metadata.xml b/sci-biology/uchime/metadata.xml
index a3c0f91c8a08..95ce07d46048 100644
--- a/sci-biology/uchime/metadata.xml
+++ b/sci-biology/uchime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<longdescription>
 UCHIME is a new algorithm for detecting chimeric sequences. It was developed in 
 collaboration with Brian Haas, Jose Carlos Clemente, Chris Quince and Rob 
diff --git a/sci-biology/ucsc-genome-browser/metadata.xml b/sci-biology/ucsc-genome-browser/metadata.xml
index f1f3ccfb77e0..76c6964ed42c 100644
--- a/sci-biology/ucsc-genome-browser/metadata.xml
+++ b/sci-biology/ucsc-genome-browser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="server">Install genome browser Web application. If this flag is off, only libraries and utilities from the suite are installed.</flag>
   </use>
diff --git a/sci-biology/unafold/metadata.xml b/sci-biology/unafold/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/unafold/metadata.xml
+++ b/sci-biology/unafold/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/update-blastdb/metadata.xml b/sci-biology/update-blastdb/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/update-blastdb/metadata.xml
+++ b/sci-biology/update-blastdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/vaal/metadata.xml b/sci-biology/vaal/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/vaal/metadata.xml
+++ b/sci-biology/vaal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/vcftools/metadata.xml b/sci-biology/vcftools/metadata.xml
index c45e9f4dea06..0f9d97881e5b 100644
--- a/sci-biology/vcftools/metadata.xml
+++ b/sci-biology/vcftools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">vcftools</remote-id>
   </upstream>
diff --git a/sci-biology/velvet/metadata.xml b/sci-biology/velvet/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/velvet/metadata.xml
+++ b/sci-biology/velvet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/vienna-rna/metadata.xml b/sci-biology/vienna-rna/metadata.xml
index 50f4e02d4a18..74cfe54c799e 100644
--- a/sci-biology/vienna-rna/metadata.xml
+++ b/sci-biology/vienna-rna/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <longdescription>
 	The Vienna RNA Package consists of a C code library and several
 	stand-alone programs for the prediction and comparison of RNA secondary
diff --git a/sci-biology/wgs-assembler/metadata.xml b/sci-biology/wgs-assembler/metadata.xml
index 8e4a74368071..3b4bdcaa7d30 100644
--- a/sci-biology/wgs-assembler/metadata.xml
+++ b/sci-biology/wgs-assembler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wgs-assembler</remote-id>
   </upstream>
diff --git a/sci-biology/wise/metadata.xml b/sci-biology/wise/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-biology/wise/metadata.xml
+++ b/sci-biology/wise/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/yass/metadata.xml b/sci-biology/yass/metadata.xml
index e4a717e691b2..f2397a173c2a 100644
--- a/sci-biology/yass/metadata.xml
+++ b/sci-biology/yass/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <use>
     <flag name="dmalloc">Enable debugging with the dmalloc library</flag>
     <flag name="lowmem">Build for environments with low amounts of memory</flag>
diff --git a/sci-calculators/calcoo/metadata.xml b/sci-calculators/calcoo/metadata.xml
index c5a8a0875d1a..f70b3eb37b88 100644
--- a/sci-calculators/calcoo/metadata.xml
+++ b/sci-calculators/calcoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   Calcoo is a scientific calculator designed to provide maximum
   usability.
diff --git a/sci-calculators/calculator/metadata.xml b/sci-calculators/calculator/metadata.xml
index 82d1363de62e..a3d9e1e09aa4 100644
--- a/sci-calculators/calculator/metadata.xml
+++ b/sci-calculators/calculator/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>mabi@gentoo.org</email>
     <name>Matti Bickel</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   The FOX Calculator is a simple desktop calculator geared toward the
   programmer for the FOX Toolkit. It supports not only a full
diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml
index f6131cfba999..66daf2593f6c 100644
--- a/sci-calculators/galculator/metadata.xml
+++ b/sci-calculators/galculator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">galculator/galculator</remote-id>
 		<remote-id type="sourceforge">galculator</remote-id>
diff --git a/sci-calculators/gonvert/metadata.xml b/sci-calculators/gonvert/metadata.xml
index c9d73bdff576..c09ea47b95ec 100644
--- a/sci-calculators/gonvert/metadata.xml
+++ b/sci-calculators/gonvert/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   gonvert is a conversion utility that allows conversion between many
   units like CGS, Ancient, Imperial with many categories like length,
diff --git a/sci-calculators/grpn/metadata.xml b/sci-calculators/grpn/metadata.xml
index 7ece1bced204..1367b173c74b 100644
--- a/sci-calculators/grpn/metadata.xml
+++ b/sci-calculators/grpn/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-calculators/hcalc/metadata.xml b/sci-calculators/hcalc/metadata.xml
index cc77603f55d0..c152966dd298 100644
--- a/sci-calculators/hcalc/metadata.xml
+++ b/sci-calculators/hcalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   Small X hexadecimal calculator
 </longdescription>
diff --git a/sci-calculators/hexcalc/metadata.xml b/sci-calculators/hexcalc/metadata.xml
index e5e99f310994..11f69bb5f66b 100644
--- a/sci-calculators/hexcalc/metadata.xml
+++ b/sci-calculators/hexcalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   hexcalc is a mutli-radix calculator that offers the standard C
   integer operations.
diff --git a/sci-calculators/keurocalc/metadata.xml b/sci-calculators/keurocalc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sci-calculators/keurocalc/metadata.xml
+++ b/sci-calculators/keurocalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-calculators/orpie/metadata.xml b/sci-calculators/orpie/metadata.xml
index c3fb63e00ce6..2044f6dae6c1 100644
--- a/sci-calculators/orpie/metadata.xml
+++ b/sci-calculators/orpie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Orpie is a fullscreen RPN calculator for the console. Its operation is
   similar to that of modern HP calculators, but data entry has been
diff --git a/sci-calculators/pcalc/metadata.xml b/sci-calculators/pcalc/metadata.xml
index f7f2c211445a..08fb1649594e 100644
--- a/sci-calculators/pcalc/metadata.xml
+++ b/sci-calculators/pcalc/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pcalc</remote-id>
 		<remote-id type="github">vapier/pcalc</remote-id>
diff --git a/sci-calculators/qalculate-bases/metadata.xml b/sci-calculators/qalculate-bases/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-bases/metadata.xml
+++ b/sci-calculators/qalculate-bases/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculate-currency/metadata.xml b/sci-calculators/qalculate-currency/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-currency/metadata.xml
+++ b/sci-calculators/qalculate-currency/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculate-gtk/metadata.xml b/sci-calculators/qalculate-gtk/metadata.xml
index 5260b5c72e5f..13067ea00f42 100644
--- a/sci-calculators/qalculate-gtk/metadata.xml
+++ b/sci-calculators/qalculate-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Qalculate! is a multi-purpose desktop calculator for GNU/Linux. It is
   small and simple to use but with much power and versatility
diff --git a/sci-calculators/qalculate-units/metadata.xml b/sci-calculators/qalculate-units/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-units/metadata.xml
+++ b/sci-calculators/qalculate-units/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculator/metadata.xml b/sci-calculators/qalculator/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/sci-calculators/qalculator/metadata.xml
+++ b/sci-calculators/qalculator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-calculators/speedcrunch/metadata.xml b/sci-calculators/speedcrunch/metadata.xml
index 8568f761ebc5..498cf61c1be2 100644
--- a/sci-calculators/speedcrunch/metadata.xml
+++ b/sci-calculators/speedcrunch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">A fast and usable calculator for power users.</longdescription>
   <upstream>
     <remote-id type="google-code">speedcrunch</remote-id>
diff --git a/sci-calculators/tiemu/metadata.xml b/sci-calculators/tiemu/metadata.xml
index 3f72a1c51b7d..2af248f53f3f 100644
--- a/sci-calculators/tiemu/metadata.xml
+++ b/sci-calculators/tiemu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   This project aims to develop a fast emulator for the
   TI89(titanium), 92(+), and V200PLT calculators. This emulator
diff --git a/sci-calculators/tilp2/metadata.xml b/sci-calculators/tilp2/metadata.xml
index e3505ed44c9e..aa9356c986ca 100644
--- a/sci-calculators/tilp2/metadata.xml
+++ b/sci-calculators/tilp2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   TiLP is a linking program for Texas Instruments' graphing
   calculators. It can handle any TI calculator (from TI73 to V200) with
diff --git a/sci-calculators/transcalc/metadata.xml b/sci-calculators/transcalc/metadata.xml
index 6242740909b2..040b26230afb 100644
--- a/sci-calculators/transcalc/metadata.xml
+++ b/sci-calculators/transcalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>sci</herd>
+    <maintainer>
+        <email>sci@gentoo.org</email>
+        <name>Gentoo Science Project</name>
+    </maintainer>
     <longdescription>
     Transcalc is an analysis and synthesis tool for calculating the
     electrical and physical properties of different kinds of RF and
diff --git a/sci-calculators/wcalc/metadata.xml b/sci-calculators/wcalc/metadata.xml
index 2f71e70ac84f..176ce095937a 100644
--- a/sci-calculators/wcalc/metadata.xml
+++ b/sci-calculators/wcalc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Wcalc is a very capable calculator. It has standard functions (sin,
   asin, and sinh for example, in either radians or degrees), many
diff --git a/sci-chemistry/GromacsWrapper/metadata.xml b/sci-chemistry/GromacsWrapper/metadata.xml
index 43390c98619e..899a0cabd7cd 100644
--- a/sci-chemistry/GromacsWrapper/metadata.xml
+++ b/sci-chemistry/GromacsWrapper/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">orbeckst/GromacsWrapper</remote-id>
   </upstream>
diff --git a/sci-chemistry/PyMca/metadata.xml b/sci-chemistry/PyMca/metadata.xml
index 2b99b08c2b52..306bfe531edc 100644
--- a/sci-chemistry/PyMca/metadata.xml
+++ b/sci-chemistry/PyMca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 The PyMca Toolkit is a collection of Python tools for visualization and 
 analysis of energy-dispersive X-ray fluorescence data. It builds its graphic 
diff --git a/sci-chemistry/acpype/metadata.xml b/sci-chemistry/acpype/metadata.xml
index 13ef0bf5a17c..efda2490636f 100644
--- a/sci-chemistry/acpype/metadata.xml
+++ b/sci-chemistry/acpype/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
+<maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/ambertools/metadata.xml b/sci-chemistry/ambertools/metadata.xml
index 13ef0bf5a17c..efda2490636f 100644
--- a/sci-chemistry/ambertools/metadata.xml
+++ b/sci-chemistry/ambertools/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
+<maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/apbs/metadata.xml b/sci-chemistry/apbs/metadata.xml
index f74d00607311..1c5d026e8918 100644
--- a/sci-chemistry/apbs/metadata.xml
+++ b/sci-chemistry/apbs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="fetk">Include support for FeTK</flag>
     <flag name="fast">APBS fast mode (experimental)</flag>
diff --git a/sci-chemistry/aqua/metadata.xml b/sci-chemistry/aqua/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/aqua/metadata.xml
+++ b/sci-chemistry/aqua/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/aria/metadata.xml b/sci-chemistry/aria/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/aria/metadata.xml
+++ b/sci-chemistry/aria/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/autodock/metadata.xml b/sci-chemistry/autodock/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/autodock/metadata.xml
+++ b/sci-chemistry/autodock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/autodock_vina/metadata.xml b/sci-chemistry/autodock_vina/metadata.xml
index b732a4dcd044..c619a1cbda2d 100644
--- a/sci-chemistry/autodock_vina/metadata.xml
+++ b/sci-chemistry/autodock_vina/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 AutoDock Vina is a new open-source program for drug discovery, molecular
 docking and virtual screening, offering multi-core capability, high
diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml
index bacd1480b120..33fab962dd8a 100644
--- a/sci-chemistry/avogadro/metadata.xml
+++ b/sci-chemistry/avogadro/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
     Avogadro is an advanced molecular editor designed for cross-platform use in
 	computational chemistry, molecular modeling, bioinformatics, materials
diff --git a/sci-chemistry/avogadro2/metadata.xml b/sci-chemistry/avogadro2/metadata.xml
index 9b97348742c4..e39056ec8cd2 100644
--- a/sci-chemistry/avogadro2/metadata.xml
+++ b/sci-chemistry/avogadro2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="rpc">Enable RPC server</flag>
     <flag name="vtk">include vtk support</flag>
diff --git a/sci-chemistry/azara/metadata.xml b/sci-chemistry/azara/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/azara/metadata.xml
+++ b/sci-chemistry/azara/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/ball/metadata.xml b/sci-chemistry/ball/metadata.xml
index ad29c1121a90..a330d56d9efa 100644
--- a/sci-chemistry/ball/metadata.xml
+++ b/sci-chemistry/ball/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 Rapid Software Prototyping can significantly reduce development times in the 
 field of Computational Molecular Biology and Molecular Modeling. 
diff --git a/sci-chemistry/bkchem/metadata.xml b/sci-chemistry/bkchem/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/bkchem/metadata.xml
+++ b/sci-chemistry/bkchem/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/bodr/metadata.xml b/sci-chemistry/bodr/metadata.xml
index a30a888d000f..4f11edb46c33 100644
--- a/sci-chemistry/bodr/metadata.xml
+++ b/sci-chemistry/bodr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
     Blue Obelisk Data Repository (BODR) is a shared data repository. It lists
 	many important chemoinformatics data such as elemental properties, atomic
diff --git a/sci-chemistry/burrow-owl/metadata.xml b/sci-chemistry/burrow-owl/metadata.xml
index 9849d77b1370..aa5d865c731a 100644
--- a/sci-chemistry/burrow-owl/metadata.xml
+++ b/sci-chemistry/burrow-owl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">burrow-owl</remote-id>
   </upstream>
diff --git a/sci-chemistry/cara-bin/metadata.xml b/sci-chemistry/cara-bin/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/cara-bin/metadata.xml
+++ b/sci-chemistry/cara-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/ccpn/metadata.xml b/sci-chemistry/ccpn/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/ccpn/metadata.xml
+++ b/sci-chemistry/ccpn/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/chemical-mime-data/metadata.xml b/sci-chemistry/chemical-mime-data/metadata.xml
index 941ce487e86e..7807f582fb43 100644
--- a/sci-chemistry/chemical-mime-data/metadata.xml
+++ b/sci-chemistry/chemical-mime-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription lang="en">
 A collection of data files to add support for chemical MIME types.
 </longdescription>
diff --git a/sci-chemistry/chemtool/metadata.xml b/sci-chemistry/chemtool/metadata.xml
index 26c258873424..63d560ce1a6b 100644
--- a/sci-chemistry/chemtool/metadata.xml
+++ b/sci-chemistry/chemtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="emf">EMF export support</flag>
   </use>
diff --git a/sci-chemistry/clashlist/metadata.xml b/sci-chemistry/clashlist/metadata.xml
index c100316ef39d..744288369673 100644
--- a/sci-chemistry/clashlist/metadata.xml
+++ b/sci-chemistry/clashlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription>
 Clashlist is a simple UNIX script which uses the awk facility along with
 the programs Probe and Cluster to build lists of van der Waals clashes
diff --git a/sci-chemistry/cluster/metadata.xml b/sci-chemistry/cluster/metadata.xml
index a1afde14e821..8f44ac7c67a5 100644
--- a/sci-chemistry/cluster/metadata.xml
+++ b/sci-chemistry/cluster/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 Cluster is a simple UNIX C++ program to build lists of collections
 of interacting items from records containing interacting pairs
diff --git a/sci-chemistry/cns/metadata.xml b/sci-chemistry/cns/metadata.xml
index 824d04240138..0f68fa036924 100644
--- a/sci-chemistry/cns/metadata.xml
+++ b/sci-chemistry/cns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="aria"> Support patch for sci-chemistry/aria</flag>
   </use>
diff --git a/sci-chemistry/coot/metadata.xml b/sci-chemistry/coot/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/coot/metadata.xml
+++ b/sci-chemistry/coot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/cyana/metadata.xml b/sci-chemistry/cyana/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/cyana/metadata.xml
+++ b/sci-chemistry/cyana/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/dssp/metadata.xml b/sci-chemistry/dssp/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/dssp/metadata.xml
+++ b/sci-chemistry/dssp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/easychem/metadata.xml b/sci-chemistry/easychem/metadata.xml
index 0a2ea04beeec..8b463b442948 100644
--- a/sci-chemistry/easychem/metadata.xml
+++ b/sci-chemistry/easychem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
     EasyChem is a program designed to draw chemical molecules, written under
 	Linux using Gtk+ 2.4. It is implemented with a strong focus on producing
diff --git a/sci-chemistry/eden/metadata.xml b/sci-chemistry/eden/metadata.xml
index 732277b2b750..37c92da4e889 100644
--- a/sci-chemistry/eden/metadata.xml
+++ b/sci-chemistry/eden/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="double-precision">More precise calculations at the expense of
     speed</flag>
diff --git a/sci-chemistry/elem/metadata.xml b/sci-chemistry/elem/metadata.xml
index 841c9b22af92..d3a9f4ec81f8 100644
--- a/sci-chemistry/elem/metadata.xml
+++ b/sci-chemistry/elem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elem</remote-id>
 	</upstream>
diff --git a/sci-chemistry/freeon/metadata.xml b/sci-chemistry/freeon/metadata.xml
index eba82069680b..302ca5f31b22 100644
--- a/sci-chemistry/freeon/metadata.xml
+++ b/sci-chemistry/freeon/metadata.xml
@@ -4,9 +4,12 @@
 	<longdescription lang="en">
 		FreeON is an experimental, open source (GPL) suite of programs for linear scaling quantum chemistry.
 	</longdescription>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/gabedit/metadata.xml b/sci-chemistry/gabedit/metadata.xml
index cc8d776158eb..38c0497e0e9f 100644
--- a/sci-chemistry/gabedit/metadata.xml
+++ b/sci-chemistry/gabedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">gabedit</remote-id>
   </upstream>
diff --git a/sci-chemistry/gamess/metadata.xml b/sci-chemistry/gamess/metadata.xml
index 65e218a68820..9007628f5343 100644
--- a/sci-chemistry/gamess/metadata.xml
+++ b/sci-chemistry/gamess/metadata.xml
@@ -5,7 +5,10 @@
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="neo">Enable NEO for nuclear basis support</flag>
     <flag name="pax_kernel">Make this package work on PAX kernels</flag>
diff --git a/sci-chemistry/gamessq/metadata.xml b/sci-chemistry/gamessq/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/gamessq/metadata.xml
+++ b/sci-chemistry/gamessq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/gelemental/metadata.xml b/sci-chemistry/gelemental/metadata.xml
index d63987f1d9ef..1b8a230e3151 100644
--- a/sci-chemistry/gelemental/metadata.xml
+++ b/sci-chemistry/gelemental/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freecode">gelemental</remote-id>
 	</upstream>
diff --git a/sci-chemistry/ghemical/metadata.xml b/sci-chemistry/ghemical/metadata.xml
index a14165c71373..7f2d37d1008a 100644
--- a/sci-chemistry/ghemical/metadata.xml
+++ b/sci-chemistry/ghemical/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+  <email>sci-chemistry@gentoo.org</email>
+  <name>Gentoo Chemistry Project</name>
+</maintainer>
 <longdescription>
 Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models 
 and molecular mechanics models (there is an experimental Tripos 5.2-like force 
diff --git a/sci-chemistry/gopenmol/metadata.xml b/sci-chemistry/gopenmol/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/gopenmol/metadata.xml
+++ b/sci-chemistry/gopenmol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/gperiodic/metadata.xml b/sci-chemistry/gperiodic/metadata.xml
index 3fd04c61c7d5..5a7b941ceac7 100644
--- a/sci-chemistry/gperiodic/metadata.xml
+++ b/sci-chemistry/gperiodic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription>
     GPeriodic is a program for looking up various data about elements from the
     periodic table, based on the GTK2 toolkit. It also features a command line
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index 083289348b0d..77f10823daba 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="cuda">Enable cuda non-bonded kernels</flag>
     <flag name="double-precision">More precise calculations at the expense of speed</flag>
diff --git a/sci-chemistry/gsim/metadata.xml b/sci-chemistry/gsim/metadata.xml
index b43821bd487b..d955ecf9c9d2 100644
--- a/sci-chemistry/gsim/metadata.xml
+++ b/sci-chemistry/gsim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="emf">Support for .emf export</flag>
   </use>
diff --git a/sci-chemistry/gtk-gamess/metadata.xml b/sci-chemistry/gtk-gamess/metadata.xml
index 0ddae2afddfa..a7b5b306a271 100644
--- a/sci-chemistry/gtk-gamess/metadata.xml
+++ b/sci-chemistry/gtk-gamess/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>je_fro@gentoo.org</email>
 		<name>Jeff Gardner</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription lang="en">
 GTK-Gamess is a frontend to GAMESS that allows users to queue up GAMESS
 calculations and run them sequentially.
diff --git a/sci-chemistry/hollow/metadata.xml b/sci-chemistry/hollow/metadata.xml
index 2a7e5e8081a1..284f2cc58c28 100644
--- a/sci-chemistry/hollow/metadata.xml
+++ b/sci-chemistry/hollow/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">hollow</remote-id>
   </upstream>
diff --git a/sci-chemistry/icm/metadata.xml b/sci-chemistry/icm/metadata.xml
index 55d880878df8..bbf599b3c0d9 100644
--- a/sci-chemistry/icm/metadata.xml
+++ b/sci-chemistry/icm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<use>
 		<flag name="32bit">Automatically generated description for 32bit</flag>
 		<flag name="64bit">Automatically generated description for 64bit</flag>
diff --git a/sci-chemistry/jmol/metadata.xml b/sci-chemistry/jmol/metadata.xml
index 9e4d1db2e0a2..9985960b429e 100644
--- a/sci-chemistry/jmol/metadata.xml
+++ b/sci-chemistry/jmol/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="client-only">Install the viewer only, no applet files for httpd
     </flag>
diff --git a/sci-chemistry/ksdssp/metadata.xml b/sci-chemistry/ksdssp/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/ksdssp/metadata.xml
+++ b/sci-chemistry/ksdssp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/mars/metadata.xml b/sci-chemistry/mars/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/mars/metadata.xml
+++ b/sci-chemistry/mars/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/massxpert/metadata.xml b/sci-chemistry/massxpert/metadata.xml
index a4137981114b..b167bbc96a44 100644
--- a/sci-chemistry/massxpert/metadata.xml
+++ b/sci-chemistry/massxpert/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription lang="en">
 Prediction and analysis of mass spectrometric data for proteomic projects.
 </longdescription>
diff --git a/sci-chemistry/mdanalysis/metadata.xml b/sci-chemistry/mdanalysis/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-chemistry/mdanalysis/metadata.xml
+++ b/sci-chemistry/mdanalysis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/mead/metadata.xml b/sci-chemistry/mead/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/sci-chemistry/mead/metadata.xml
+++ b/sci-chemistry/mead/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/mm-align/metadata.xml b/sci-chemistry/mm-align/metadata.xml
index f56cf090a157..ebad288c945e 100644
--- a/sci-chemistry/mm-align/metadata.xml
+++ b/sci-chemistry/mm-align/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 MM-align is an algorithm for structurally aligning multiple-chain 
 protein-protein complexes. The algorithm is built on a heuristic 
diff --git a/sci-chemistry/molden/metadata.xml b/sci-chemistry/molden/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/molden/metadata.xml
+++ b/sci-chemistry/molden/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/moldy/metadata.xml b/sci-chemistry/moldy/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/moldy/metadata.xml
+++ b/sci-chemistry/moldy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/molequeue/metadata.xml b/sci-chemistry/molequeue/metadata.xml
index f106c9b478d7..0b488ed3e1e3 100644
--- a/sci-chemistry/molequeue/metadata.xml
+++ b/sci-chemistry/molequeue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 MoleQueue is an open-source, cross-platform, system-tray resident desktop 
 application for abstracting, managing, and coordinating the execution of tasks 
diff --git a/sci-chemistry/molmol/metadata.xml b/sci-chemistry/molmol/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/molmol/metadata.xml
+++ b/sci-chemistry/molmol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/molscript/metadata.xml b/sci-chemistry/molscript/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/molscript/metadata.xml
+++ b/sci-chemistry/molscript/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/molsketch/metadata.xml b/sci-chemistry/molsketch/metadata.xml
index 96bf379cef43..5105e77aab7e 100644
--- a/sci-chemistry/molsketch/metadata.xml
+++ b/sci-chemistry/molsketch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription lang="en">
 	Molsketch is a 2D molecular editing tool. Its goal is to help you draw 
 	molecules quick and easily. Of course you're creation can be exported 
diff --git a/sci-chemistry/mongochem/metadata.xml b/sci-chemistry/mongochem/metadata.xml
index 7e818d2db8aa..e19331122c62 100644
--- a/sci-chemistry/mongochem/metadata.xml
+++ b/sci-chemistry/mongochem/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">OpenChemistry/mongochem</remote-id>
   </upstream>
diff --git a/sci-chemistry/mopac7/metadata.xml b/sci-chemistry/mopac7/metadata.xml
index ae48044fa709..55ea3930b05b 100644
--- a/sci-chemistry/mopac7/metadata.xml
+++ b/sci-chemistry/mopac7/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="gmxmopac7">Add support library for gromacs</flag>
   </use>
diff --git a/sci-chemistry/mpqc/metadata.xml b/sci-chemistry/mpqc/metadata.xml
index 6526df6225a9..d736ce4efe41 100644
--- a/sci-chemistry/mpqc/metadata.xml
+++ b/sci-chemistry/mpqc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mpqc</remote-id>
   </upstream>
diff --git a/sci-chemistry/msms-bin/metadata.xml b/sci-chemistry/msms-bin/metadata.xml
index 51426ab8d003..c8d5d9a869f8 100644
--- a/sci-chemistry/msms-bin/metadata.xml
+++ b/sci-chemistry/msms-bin/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/mustang/metadata.xml b/sci-chemistry/mustang/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/mustang/metadata.xml
+++ b/sci-chemistry/mustang/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/namd/metadata.xml b/sci-chemistry/namd/metadata.xml
index c73650100bed..f86273f4738f 100644
--- a/sci-chemistry/namd/metadata.xml
+++ b/sci-chemistry/namd/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/nmrglue/metadata.xml b/sci-chemistry/nmrglue/metadata.xml
index d43529e3c586..deb4b1411183 100644
--- a/sci-chemistry/nmrglue/metadata.xml
+++ b/sci-chemistry/nmrglue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 Nmrglue has the ability to read, write and convert between a number of NMR file 
 formats including Agilent/Varian, Bruker, NMRPipe, Sparky, SIMPSON, Rowland NMR 
diff --git a/sci-chemistry/numbat/metadata.xml b/sci-chemistry/numbat/metadata.xml
index 457cb52b6910..71367f3c0b92 100644
--- a/sci-chemistry/numbat/metadata.xml
+++ b/sci-chemistry/numbat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 Numbat is a user friendly software that fits dX-tensor to a set of PCS 
 measurements and a structure from a PDB file. It has also been designed to 
diff --git a/sci-chemistry/openbabel-perl/metadata.xml b/sci-chemistry/openbabel-perl/metadata.xml
index 068b6b2c4442..2b329b8b8ced 100644
--- a/sci-chemistry/openbabel-perl/metadata.xml
+++ b/sci-chemistry/openbabel-perl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 OpenBabel is a chemical toolbox designed to speak the many languages of
 chemical data. It's an open, collaborative project allowing anyone to
diff --git a/sci-chemistry/openbabel-python/metadata.xml b/sci-chemistry/openbabel-python/metadata.xml
index 2fec701db8fc..27c7d710dcea 100644
--- a/sci-chemistry/openbabel-python/metadata.xml
+++ b/sci-chemistry/openbabel-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 OpenBabel is a chemical toolbox designed to speak the many languages of
 chemical data. It's an open, collaborative project allowing anyone to
diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 3353dfa452a4..0653e016be67 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
     Open Babel is a chemical toolbox designed to speak the many languages of
 	chemical data. It's an open, collaborative project allowing anyone to
diff --git a/sci-chemistry/ortep3/metadata.xml b/sci-chemistry/ortep3/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/ortep3/metadata.xml
+++ b/sci-chemistry/ortep3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/p3d/metadata.xml b/sci-chemistry/p3d/metadata.xml
index 425cc4839d53..a4f062527ea2 100644
--- a/sci-chemistry/p3d/metadata.xml
+++ b/sci-chemistry/p3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription>
 p3d was developed in order to offer a Python module that is powerful and fast,
 yet intuitive to use. The simplicity of p3d is due to the usage of object 
diff --git a/sci-chemistry/parassign/metadata.xml b/sci-chemistry/parassign/metadata.xml
index a537bab98286..c3e70c6eaef9 100644
--- a/sci-chemistry/parassign/metadata.xml
+++ b/sci-chemistry/parassign/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 The use of paramagnetic NMR data for the refinement of structures of proteins 
 and protein complexes is widespread. However, the power of paramagnetism for 
diff --git a/sci-chemistry/pdb-tools/metadata.xml b/sci-chemistry/pdb-tools/metadata.xml
index fca80d3886e0..039cf8120f39 100644
--- a/sci-chemistry/pdb-tools/metadata.xml
+++ b/sci-chemistry/pdb-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">pdb-tools</remote-id>
     <remote-id type="github">harmslab/pdbtools</remote-id>
diff --git a/sci-chemistry/pdb2pqr/metadata.xml b/sci-chemistry/pdb2pqr/metadata.xml
index 81003ba2152a..0aa5eb0205a0 100644
--- a/sci-chemistry/pdb2pqr/metadata.xml
+++ b/sci-chemistry/pdb2pqr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="opal">Add web interface via opal</flag>
     <flag name="pdb2pka">Install experimental pdb2pka interface</flag>
diff --git a/sci-chemistry/pdbcat/metadata.xml b/sci-chemistry/pdbcat/metadata.xml
index 31588262b38b..40e4d5851295 100644
--- a/sci-chemistry/pdbcat/metadata.xml
+++ b/sci-chemistry/pdbcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 The Brookhaven Protein Data Bank stores atomic coordinate information
 for protein structures in a column based format.  This is designed to
diff --git a/sci-chemistry/pdbcns/metadata.xml b/sci-chemistry/pdbcns/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/pdbcns/metadata.xml
+++ b/sci-chemistry/pdbcns/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pdbmat/metadata.xml b/sci-chemistry/pdbmat/metadata.xml
index 569826e0076b..8c60217cf431 100644
--- a/sci-chemistry/pdbmat/metadata.xml
+++ b/sci-chemistry/pdbmat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 A fortran program in which Tirion's model (also called the Elastic Network 
 Model) is implemented. Within the frame of this model, atoms (particles) 
diff --git a/sci-chemistry/platon/metadata.xml b/sci-chemistry/platon/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/platon/metadata.xml
+++ b/sci-chemistry/platon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/povscript+/metadata.xml b/sci-chemistry/povscript+/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/povscript+/metadata.xml
+++ b/sci-chemistry/povscript+/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/prekin/metadata.xml b/sci-chemistry/prekin/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/sci-chemistry/prekin/metadata.xml
+++ b/sci-chemistry/prekin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/probe/metadata.xml b/sci-chemistry/probe/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/probe/metadata.xml
+++ b/sci-chemistry/probe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/procheck/metadata.xml b/sci-chemistry/procheck/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/procheck/metadata.xml
+++ b/sci-chemistry/procheck/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/prodecomp/metadata.xml b/sci-chemistry/prodecomp/metadata.xml
index 2cdeed2aa478..a7de6e7d8315 100644
--- a/sci-chemistry/prodecomp/metadata.xml
+++ b/sci-chemistry/prodecomp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 	PRODECOMP (PROjection DECOMPosition) is a software tool for 
 	decomposition of 2D projections of high-dimensional NMR spectra to a set
diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
index 4fa312deced4..70178f407f50 100644
--- a/sci-chemistry/prody/metadata.xml
+++ b/sci-chemistry/prody/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">prody/ProDy</remote-id>
   </upstream>
diff --git a/sci-chemistry/propka/metadata.xml b/sci-chemistry/propka/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/propka/metadata.xml
+++ b/sci-chemistry/propka/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/psi/metadata.xml b/sci-chemistry/psi/metadata.xml
index 3774ad2a405f..38e0c29264a5 100644
--- a/sci-chemistry/psi/metadata.xml
+++ b/sci-chemistry/psi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">psicode</remote-id>
   </upstream>
diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
index 49049e1aab60..ad4303479544 100644
--- a/sci-chemistry/pymol-apbs-plugin/metadata.xml
+++ b/sci-chemistry/pymol-apbs-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pymolapbsplugin</remote-id>
   </upstream>
diff --git a/sci-chemistry/pymol-plugins-bni-tools/metadata.xml b/sci-chemistry/pymol-plugins-bni-tools/metadata.xml
index 719acc794773..dc2916f58730 100644
--- a/sci-chemistry/pymol-plugins-bni-tools/metadata.xml
+++ b/sci-chemistry/pymol-plugins-bni-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">bni-tools</remote-id>
   </upstream>
diff --git a/sci-chemistry/pymol-plugins-caver/metadata.xml b/sci-chemistry/pymol-plugins-caver/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/pymol-plugins-caver/metadata.xml
+++ b/sci-chemistry/pymol-plugins-caver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-dssp/metadata.xml b/sci-chemistry/pymol-plugins-dssp/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/pymol-plugins-dssp/metadata.xml
+++ b/sci-chemistry/pymol-plugins-dssp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-dynamics/metadata.xml b/sci-chemistry/pymol-plugins-dynamics/metadata.xml
index a1353a78555e..7888f4188d3a 100644
--- a/sci-chemistry/pymol-plugins-dynamics/metadata.xml
+++ b/sci-chemistry/pymol-plugins-dynamics/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">tomaszmakarewicz/Dynamics</remote-id>
   </upstream>
diff --git a/sci-chemistry/pymol-plugins-emovie/metadata.xml b/sci-chemistry/pymol-plugins-emovie/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/pymol-plugins-emovie/metadata.xml
+++ b/sci-chemistry/pymol-plugins-emovie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-msms/metadata.xml b/sci-chemistry/pymol-plugins-msms/metadata.xml
index 7ddc96a81c51..74381e1bec3a 100644
--- a/sci-chemistry/pymol-plugins-msms/metadata.xml
+++ b/sci-chemistry/pymol-plugins-msms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 MSMS is an excellent tool for computing protein solvent excluded surface (SES).
 MSMS Plugin for PyMOL provides a graphical user interface for running MSMS and 
diff --git a/sci-chemistry/pymol-plugins-promol/metadata.xml b/sci-chemistry/pymol-plugins-promol/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/pymol-plugins-promol/metadata.xml
+++ b/sci-chemistry/pymol-plugins-promol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-psico/metadata.xml b/sci-chemistry/pymol-plugins-psico/metadata.xml
index 8c918a2488fb..d2438895c506 100644
--- a/sci-chemistry/pymol-plugins-psico/metadata.xml
+++ b/sci-chemistry/pymol-plugins-psico/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">speleo3/pymol-psico</remote-id>
   </upstream>
diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 2bb375bdfeca..f51d54324c56 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
diff --git a/sci-chemistry/rasmol/metadata.xml b/sci-chemistry/rasmol/metadata.xml
index b06ec8f7a2fa..9fdf0510282d 100644
--- a/sci-chemistry/rasmol/metadata.xml
+++ b/sci-chemistry/rasmol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">openrasmol</remote-id>
   </upstream>
diff --git a/sci-chemistry/raster3d/metadata.xml b/sci-chemistry/raster3d/metadata.xml
index 2a6e4b56f965..114122485ef6 100644
--- a/sci-chemistry/raster3d/metadata.xml
+++ b/sci-chemistry/raster3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <changelog>http://skuld.bmsc.washington.edu/raster3d/CHANGELOG</changelog>
   </upstream>
diff --git a/sci-chemistry/reduce/metadata.xml b/sci-chemistry/reduce/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/reduce/metadata.xml
+++ b/sci-chemistry/reduce/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/relax/metadata.xml b/sci-chemistry/relax/metadata.xml
index 3240dd8c9f62..1f1ee9b2d3da 100644
--- a/sci-chemistry/relax/metadata.xml
+++ b/sci-chemistry/relax/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 The program relax is a software package designed for the study of molecular 
 dynamics through the analysis of experimental NMR data. Organic molecules, 
diff --git a/sci-chemistry/shelx/metadata.xml b/sci-chemistry/shelx/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/shelx/metadata.xml
+++ b/sci-chemistry/shelx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/sparky/metadata.xml b/sci-chemistry/sparky/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/sparky/metadata.xml
+++ b/sci-chemistry/sparky/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/suitename/metadata.xml b/sci-chemistry/suitename/metadata.xml
index 90cb2d5d8981..980e109138ee 100644
--- a/sci-chemistry/suitename/metadata.xml
+++ b/sci-chemistry/suitename/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription>
 Suitename is a new C program that supports the ROC RNA Ontology Consortium 
 consensus RNA backbone nomenclature and conformer-list development (see our RNA 
diff --git a/sci-chemistry/surf/metadata.xml b/sci-chemistry/surf/metadata.xml
index 9ac9ffdb3a41..c87fc3121bf1 100644
--- a/sci-chemistry/surf/metadata.xml
+++ b/sci-chemistry/surf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/theseus/metadata.xml b/sci-chemistry/theseus/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/theseus/metadata.xml
+++ b/sci-chemistry/theseus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/threeV/metadata.xml b/sci-chemistry/threeV/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/threeV/metadata.xml
+++ b/sci-chemistry/threeV/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/tinker/metadata.xml b/sci-chemistry/tinker/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-chemistry/tinker/metadata.xml
+++ b/sci-chemistry/tinker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/tm-align/metadata.xml b/sci-chemistry/tm-align/metadata.xml
index 1586622fb853..5b8711471a7e 100644
--- a/sci-chemistry/tm-align/metadata.xml
+++ b/sci-chemistry/tm-align/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 TM-align is a computer algorithm for protein structure alignment using dynamic 
 programming and TM-score rotation matrix. An optimal alignment between two 
diff --git a/sci-chemistry/viewmol/metadata.xml b/sci-chemistry/viewmol/metadata.xml
index c23d7012cd04..68d3b91373f2 100644
--- a/sci-chemistry/viewmol/metadata.xml
+++ b/sci-chemistry/viewmol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">viewmol</remote-id>
 	</upstream>
diff --git a/sci-chemistry/vmd/metadata.xml b/sci-chemistry/vmd/metadata.xml
index 4b17d8d6b913..0589e62ee21f 100644
--- a/sci-chemistry/vmd/metadata.xml
+++ b/sci-chemistry/vmd/metadata.xml
@@ -5,7 +5,10 @@
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="cuda">Use nvidia cuda toolkit for speeding up computations</flag>
     <flag name="gromacs">Add support for TNG file format</flag>
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 5b8236a4000f..2cd51935ae6b 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<use>
 		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
 		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
index e68af23c5893..b8570dac0703 100644
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ b/sci-chemistry/votca-csgapps/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
 		<remote-id type="github">votca/csgapps</remote-id>
diff --git a/sci-chemistry/wxmacmolplt/metadata.xml b/sci-chemistry/wxmacmolplt/metadata.xml
index cd9831eb3c5f..b47aee032552 100644
--- a/sci-chemistry/wxmacmolplt/metadata.xml
+++ b/sci-chemistry/wxmacmolplt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 wxMacMolPlt is a program for plotting 3D molecular structures and normal modes (vibrations), various orbitals and electron density maps. It reads a variety of file formats including any GAMESS input, log or IRC file directly to create animations. It has a simple GAMESS input (.inp) builder and a primitive molecule builder.
 </longdescription>
diff --git a/sci-chemistry/xds-bin/metadata.xml b/sci-chemistry/xds-bin/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/xds-bin/metadata.xml
+++ b/sci-chemistry/xds-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/xdsgui/metadata.xml b/sci-chemistry/xdsgui/metadata.xml
index f8c72d709978..1640149bd135 100644
--- a/sci-chemistry/xdsgui/metadata.xml
+++ b/sci-chemistry/xdsgui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 XDSgui is a GUI (graphical user interface) for XDS that is supposed to help both
 novice and experienced users. It graphically displays the ASCII and cbf files 
diff --git a/sci-chemistry/xdsstat-bin/metadata.xml b/sci-chemistry/xdsstat-bin/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/xdsstat-bin/metadata.xml
+++ b/sci-chemistry/xdsstat-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/xyza2pipe/metadata.xml b/sci-chemistry/xyza2pipe/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-chemistry/xyza2pipe/metadata.xml
+++ b/sci-chemistry/xyza2pipe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/alliance/metadata.xml b/sci-electronics/alliance/metadata.xml
index 8160b1a44dde..b47354f6bf52 100644
--- a/sci-electronics/alliance/metadata.xml
+++ b/sci-electronics/alliance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
   Alliance is a complete set of free CAD tools and portable libraries for VLSI
   design. It includes a VHDL compiler and simulator, logic synthesis tools, and
diff --git a/sci-electronics/balsa/metadata.xml b/sci-electronics/balsa/metadata.xml
index 5e761826e5a7..fcf664fe3cd7 100644
--- a/sci-electronics/balsa/metadata.xml
+++ b/sci-electronics/balsa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
   Balsa is an asynchronous circuit synthesis system developed over a number of
   years at the APT group of the School Of Computer Science, The University of
diff --git a/sci-electronics/cirkuit/metadata.xml b/sci-electronics/cirkuit/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sci-electronics/cirkuit/metadata.xml
+++ b/sci-electronics/cirkuit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/drawtiming/metadata.xml b/sci-electronics/drawtiming/metadata.xml
index 1c604f7d6c24..370cab39109e 100644
--- a/sci-electronics/drawtiming/metadata.xml
+++ b/sci-electronics/drawtiming/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 	This package provides a command line tool for documenting hardware
 	and software designs through timing diagrams.  It reads signal descriptions
diff --git a/sci-electronics/eagle/metadata.xml b/sci-electronics/eagle/metadata.xml
index e99012ea5f3c..445e2a0aff3e 100644
--- a/sci-electronics/eagle/metadata.xml
+++ b/sci-electronics/eagle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>EAGLE (Easily Applicable Graphical Layout Editor)
 		is a powerful tool for creating printed circuit boards (PCBs).
 		It requires a 586 (or higher), kernel 2.x (or higher), and
diff --git a/sci-electronics/electric/metadata.xml b/sci-electronics/electric/metadata.xml
index 75917fdaf7da..e4e58612dc18 100644
--- a/sci-electronics/electric/metadata.xml
+++ b/sci-electronics/electric/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   The Electric VLSI Design System is a complete Electronic Design Automation
   (EDA) system that can handle many forms of circuit design, including:
diff --git a/sci-electronics/electronics-menu/metadata.xml b/sci-electronics/electronics-menu/metadata.xml
index 6c07ad627655..8cda99095769 100644
--- a/sci-electronics/electronics-menu/metadata.xml
+++ b/sci-electronics/electronics-menu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
 	Create a dedicated "Electronics" entry in the top-menu of your XDG-compliant
 	Desktop Environment (Gnome, KDE, etc...), so that you electronics
diff --git a/sci-electronics/espresso-ab/metadata.xml b/sci-electronics/espresso-ab/metadata.xml
index 2943e6bcb92a..ddfc5870f8d1 100644
--- a/sci-electronics/espresso-ab/metadata.xml
+++ b/sci-electronics/espresso-ab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   POSIX compliant version of the espresso logic minimization tool.
   </longdescription>
diff --git a/sci-electronics/fasthenry/metadata.xml b/sci-electronics/fasthenry/metadata.xml
index 3c960239bd7b..a3a261be0e46 100644
--- a/sci-electronics/fasthenry/metadata.xml
+++ b/sci-electronics/fasthenry/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/freehdl/metadata.xml b/sci-electronics/freehdl/metadata.xml
index b8b55fb63800..67df7439c93d 100644
--- a/sci-electronics/freehdl/metadata.xml
+++ b/sci-electronics/freehdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Free, open source, GPL'ed VHDL simulator. The project goal is to develop a
   VHDL simulator that :
diff --git a/sci-electronics/geda-suite/metadata.xml b/sci-electronics/geda-suite/metadata.xml
index ce0e016bb307..e386f906d165 100644
--- a/sci-electronics/geda-suite/metadata.xml
+++ b/sci-electronics/geda-suite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/geda-xgsch2pcb/metadata.xml b/sci-electronics/geda-xgsch2pcb/metadata.xml
index 4e046ebc9c46..4eb096d7988b 100644
--- a/sci-electronics/geda-xgsch2pcb/metadata.xml
+++ b/sci-electronics/geda-xgsch2pcb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 		``gsch2pcb`` is a command-line tool, part of the gEDA suite, which is used
 		to generate and update a PCB layout.  It works with schematics created
diff --git a/sci-electronics/geda/metadata.xml b/sci-electronics/geda/metadata.xml
index aac1202be030..cded7a787545 100644
--- a/sci-electronics/geda/metadata.xml
+++ b/sci-electronics/geda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 		The GPL Electronic Design Automation (gEDA) project has produced and
 		continues working on a full GPL'd suite and toolkit of Electronic
diff --git a/sci-electronics/gerbv/metadata.xml b/sci-electronics/gerbv/metadata.xml
index 655a535046fe..d18b8bc34854 100644
--- a/sci-electronics/gerbv/metadata.xml
+++ b/sci-electronics/gerbv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 		Gerbv is a viewer for Gerber RS-274X files, Excellon drill files, and CSV
 		pick-and-place files.  (Note:  RS-274D files are not supported.)
diff --git a/sci-electronics/ghdl/metadata.xml b/sci-electronics/ghdl/metadata.xml
index 21cf833ed2ac..2a5c3558e80c 100644
--- a/sci-electronics/ghdl/metadata.xml
+++ b/sci-electronics/ghdl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   A complete VHDL simulator, using the GCC technology. GHDL implements the VHDL
   language according to the IEEE 1076-1987 or the IEEE 1076-1993 standard. GHDL
diff --git a/sci-electronics/gnetman/metadata.xml b/sci-electronics/gnetman/metadata.xml
index 1d035ec3a1b9..9bd9a1163d21 100644
--- a/sci-electronics/gnetman/metadata.xml
+++ b/sci-electronics/gnetman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
   The gnetman project has one simple goal: Enabling interoperability between
   open-source EDA tools. To date, gnetman can read and/or write (in theory)
diff --git a/sci-electronics/gnucap/metadata.xml b/sci-electronics/gnucap/metadata.xml
index 736e953cd4d5..ef7508500746 100644
--- a/sci-electronics/gnucap/metadata.xml
+++ b/sci-electronics/gnucap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Gnucap is a general purpose circuit simulator. It performs nonlinear dc and
   transient analyses, fourier analysis, and ac analysis. Gnucap is not based on
diff --git a/sci-electronics/gplcver/metadata.xml b/sci-electronics/gplcver/metadata.xml
index ee65e169fe4f..d8e956cd474b 100644
--- a/sci-electronics/gplcver/metadata.xml
+++ b/sci-electronics/gplcver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   GPL Cver is a Verilog HDL simulator that is released under the GNU General
   Public License. GPL Cver is a full 1995 P1364 Verilog standard HDL simulator.
diff --git a/sci-electronics/gsmc/metadata.xml b/sci-electronics/gsmc/metadata.xml
index 53ae7d77c6b9..dc3baf31b8ee 100644
--- a/sci-electronics/gsmc/metadata.xml
+++ b/sci-electronics/gsmc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd>
+<maintainer>
+	<email>sci-electronics@gentoo.org</email>
+	<name>Gentoo Electronics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/gspeakers/metadata.xml b/sci-electronics/gspeakers/metadata.xml
index ddaf5bd1f300..49a4b442b376 100644
--- a/sci-electronics/gspeakers/metadata.xml
+++ b/sci-electronics/gspeakers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
     GSpeakers is a GTK based loudspeaker and crossovernetwork design program.
   </longdescription>
diff --git a/sci-electronics/gspiceui/metadata.xml b/sci-electronics/gspiceui/metadata.xml
index 8af905c02f4a..e3fb654b077f 100644
--- a/sci-electronics/gspiceui/metadata.xml
+++ b/sci-electronics/gspiceui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <use>
     <flag name="schematics">Use <pkg>sci-electronics/geda</pkg> for schematics editing</flag>
     <flag name="waveform">Use <pkg>sci-electronics/gwave</pkg> for waveform display</flag>
diff --git a/sci-electronics/gtkwave/metadata.xml b/sci-electronics/gtkwave/metadata.xml
index 8167c590aa91..3e6992dc7f5a 100644
--- a/sci-electronics/gtkwave/metadata.xml
+++ b/sci-electronics/gtkwave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   GTKWave is a fully featured GTK+ based wave viewer for Unix and Win32 which
   reads LXT, LXT2, VZT, and GHW files as well as standard Verilog VCD/EVCD
diff --git a/sci-electronics/gwave/metadata.xml b/sci-electronics/gwave/metadata.xml
index abb9bb11811b..7eeafcc8ba8c 100644
--- a/sci-electronics/gwave/metadata.xml
+++ b/sci-electronics/gwave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Gwave is a waveform viewer. Gwave can read binary or ascii files written by
   HSpice from transient, AC, or Sweep analyses, "raw" files written by Spice2,
diff --git a/sci-electronics/irsim/metadata.xml b/sci-electronics/irsim/metadata.xml
index a99d934521dc..680c3a82d3d0 100644
--- a/sci-electronics/irsim/metadata.xml
+++ b/sci-electronics/irsim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
 		 IRSIM is a tool for simulating digital circuits. It is a "switch-level"
 		 simulator; that is, it treats transistors as ideal switches. Extracted
diff --git a/sci-electronics/iverilog/metadata.xml b/sci-electronics/iverilog/metadata.xml
index ceafe325f3ef..c1e3fe335633 100644
--- a/sci-electronics/iverilog/metadata.xml
+++ b/sci-electronics/iverilog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Icarus Verilog is a Verilog simulation and synthesis tool. It operates as a
   compiler, compiling source code writen in Verilog (IEEE-1364) into some target
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 83b376986f32..58c812bb92ba 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="github">Add github support into PCB editor</flag>
 		<flag name="i18n">Allow GUI internationalization through linguas_* use flags</flag>
diff --git a/sci-electronics/klayout/metadata.xml b/sci-electronics/klayout/metadata.xml
index eb47c894cf16..4ba883eb1e73 100644
--- a/sci-electronics/klayout/metadata.xml
+++ b/sci-electronics/klayout/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd>
 <maintainer>
   <email>dilfridge@gentoo.org</email>
   <name>Andreas K. Huettel</name>
 </maintainer>
+<maintainer>
+  <email>sci-electronics@gentoo.org</email>
+  <name>Gentoo Electronics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/linsmith/metadata.xml b/sci-electronics/linsmith/metadata.xml
index 5604ed5d092d..98656cea6232 100644
--- a/sci-electronics/linsmith/metadata.xml
+++ b/sci-electronics/linsmith/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
   <maintainer>
     <email>tomjbe@gentoo.org</email>
     <name>Thomas Beierlein</name>
   </maintainer>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">linsmith</remote-id>
   </upstream>
diff --git a/sci-electronics/magic/metadata.xml b/sci-electronics/magic/metadata.xml
index 4bbd90c81497..11e725c27c7c 100644
--- a/sci-electronics/magic/metadata.xml
+++ b/sci-electronics/magic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Magic is a venerable VLSI layout tool, written in the 1980's at Berkeley by
   John Ousterhout, of Tcl fame. Due largely in part to its liberal Berkeley
diff --git a/sci-electronics/netgen/metadata.xml b/sci-electronics/netgen/metadata.xml
index 1f1b0356769e..be310457dd32 100644
--- a/sci-electronics/netgen/metadata.xml
+++ b/sci-electronics/netgen/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
   <maintainer>
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>tim@opencircuitdesign.com</email>
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index 627c13b51b87..81731bba4278 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
   Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on
   three open source software packages: Spice3f5, Cider1b1 and Xspice.
diff --git a/sci-electronics/oregano/metadata.xml b/sci-electronics/oregano/metadata.xml
index caeaccf04b35..87d1e0439b25 100644
--- a/sci-electronics/oregano/metadata.xml
+++ b/sci-electronics/oregano/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 		Oregano is an application for schematic capture and simulation of electrical
 		circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 80fcc7c9fb1e..d7c0d46dfef2 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
 		Printed Circuit Board layout tool. Used together with the gEDA tools for
 		Electronic Design Automation or on its own.  
diff --git a/sci-electronics/petrify/metadata.xml b/sci-electronics/petrify/metadata.xml
index 617189f8bd24..2e4d1418993d 100644
--- a/sci-electronics/petrify/metadata.xml
+++ b/sci-electronics/petrify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   Petrify is a tool for synthesis of Petri nets and asynchronous controllers.
   Petrify is able to obtain Petri nets with some specific properties: pure, free
diff --git a/sci-electronics/plcedit/metadata.xml b/sci-electronics/plcedit/metadata.xml
index 447fa9bf40b3..41e29dae6003 100644
--- a/sci-electronics/plcedit/metadata.xml
+++ b/sci-electronics/plcedit/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+<email>qt@gentoo.org</email>
+<name>Gentoo Qt Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sci-electronics/puff/metadata.xml b/sci-electronics/puff/metadata.xml
index 54e80a6841ab..22473fc09ece 100644
--- a/sci-electronics/puff/metadata.xml
+++ b/sci-electronics/puff/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
 	</maintainer>
+<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/pulseview/metadata.xml b/sci-electronics/pulseview/metadata.xml
index 9b1f0971ed95..bd2766b1243b 100644
--- a/sci-electronics/pulseview/metadata.xml
+++ b/sci-electronics/pulseview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="decode">Enable decoding of protocols while capturing</flag>
 </use>
diff --git a/sci-electronics/qelectrotech/metadata.xml b/sci-electronics/qelectrotech/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/sci-electronics/qelectrotech/metadata.xml
+++ b/sci-electronics/qelectrotech/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
index ffd48dce37c4..ba652a3e530b 100644
--- a/sci-electronics/quartus-prime-lite/metadata.xml
+++ b/sci-electronics/quartus-prime-lite/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/qucs/metadata.xml b/sci-electronics/qucs/metadata.xml
index cf8c179db29c..d8a0c99ab067 100644
--- a/sci-electronics/qucs/metadata.xml
+++ b/sci-electronics/qucs/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qucs</remote-id>
 	</upstream>
diff --git a/sci-electronics/sigrok-cli/metadata.xml b/sci-electronics/sigrok-cli/metadata.xml
index 9b1f0971ed95..bd2766b1243b 100644
--- a/sci-electronics/sigrok-cli/metadata.xml
+++ b/sci-electronics/sigrok-cli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="decode">Enable decoding of protocols while capturing</flag>
 </use>
diff --git a/sci-electronics/spice/metadata.xml b/sci-electronics/spice/metadata.xml
index 90ad22c07fd3..cce897f6e4cc 100644
--- a/sci-electronics/spice/metadata.xml
+++ b/sci-electronics/spice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   SPICE is a general-purpose circuit simulation program for nonlinear dc,
   nonlinear transient, and linear ac analyses. Circuits may contain resistors,
diff --git a/sci-electronics/splat/metadata.xml b/sci-electronics/splat/metadata.xml
index 1e01843e45dc..08518b14af2e 100644
--- a/sci-electronics/splat/metadata.xml
+++ b/sci-electronics/splat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+  	<email>sci-electronics@gentoo.org</email>
+  	<name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the
   spectrum between 20 MHz and 20 GHz. Applications of SPLAT! include site
diff --git a/sci-electronics/systemc/metadata.xml b/sci-electronics/systemc/metadata.xml
index b2e59d373fab..cef99745e57a 100644
--- a/sci-electronics/systemc/metadata.xml
+++ b/sci-electronics/systemc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>
   SystemC provides hardware-oriented constructs within the context of C++
   as a class library implemented in standard C++. Its use spans design and
diff --git a/sci-electronics/vbs/metadata.xml b/sci-electronics/vbs/metadata.xml
index 38fa0bd5549e..7f4155f62fcf 100644
--- a/sci-electronics/vbs/metadata.xml
+++ b/sci-electronics/vbs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   This program is a simple implementation of a Verilog simulator. VBS tries to
   implement all of the Verilog behavioral constructs that are synthesizable, but
diff --git a/sci-electronics/xcircuit/metadata.xml b/sci-electronics/xcircuit/metadata.xml
index acdbac4ec91a..152da420f054 100644
--- a/sci-electronics/xcircuit/metadata.xml
+++ b/sci-electronics/xcircuit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <longdescription>
   XCircuit is a UNIX/X11 program for drawing publishable-quality electrical
   circuit schematic diagrams and related figures, and produce circuit netlists
diff --git a/sci-electronics/xnec2c/metadata.xml b/sci-electronics/xnec2c/metadata.xml
index df6a496aa5b7..e1231ecb16e6 100644
--- a/sci-electronics/xnec2c/metadata.xml
+++ b/sci-electronics/xnec2c/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-electronics</herd>
-<herd>proxy-maintainers</herd>
-	<maintainer>
+<maintainer>
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
 	</maintainer>
+<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <upstream>
 	<maintainer>
 		<email>neoklis.kyriazis@gmail.com</email>
diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml
index 87e1ee6b49ae..c188df7ac4cf 100644
--- a/sci-electronics/xoscope/metadata.xml
+++ b/sci-electronics/xoscope/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xoscope</remote-id>
 	</upstream>
diff --git a/sci-geosciences/bt747/metadata.xml b/sci-geosciences/bt747/metadata.xml
index 3bb1317da08e..f6d2070c3caf 100644
--- a/sci-geosciences/bt747/metadata.xml
+++ b/sci-geosciences/bt747/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription lang="en">
 BT747 is software that can:
   * Download recorded position data from GPS Data Loggers based on the MTK chipset.
diff --git a/sci-geosciences/foxtrotgps/metadata.xml b/sci-geosciences/foxtrotgps/metadata.xml
index 15f410f0302d..553da175b081 100644
--- a/sci-geosciences/foxtrotgps/metadata.xml
+++ b/sci-geosciences/foxtrotgps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription lang="en">
 FoxtrotGPS is an offshoot of Marcus Bauer's excellent Free &amp; Open Source tangoGPS application, with a focus on cooperation and fostering community innovation. FoxtrotGPS is freely available to the public for use, redistribution, and modification under the terms of the GNU General Public License 2.0 (GPLv2). 
 </longdescription>
diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml
index cbf80664b811..2a19e2734809 100644
--- a/sci-geosciences/gdal-grass/metadata.xml
+++ b/sci-geosciences/gdal-grass/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>wraeth@wraeth.id.au</email>
     <name>Sam Jorna</name>
     <description>Proxy maintainer - assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag>
   </use>
diff --git a/sci-geosciences/gebabbel/metadata.xml b/sci-geosciences/gebabbel/metadata.xml
index 97fe68c15d2d..0fb1ddebdd77 100644
--- a/sci-geosciences/gebabbel/metadata.xml
+++ b/sci-geosciences/gebabbel/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">gebabbel</remote-id>
   </upstream>
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/gmapcatcher/metadata.xml b/sci-geosciences/gmapcatcher/metadata.xml
index f671fec3d63d..3b224e4f2102 100644
--- a/sci-geosciences/gmapcatcher/metadata.xml
+++ b/sci-geosciences/gmapcatcher/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>god@politeia.in</email>
 		<name>Denis M.</name>
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 800476249b1f..65c0cbc77ffe 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
     <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
     <flag name="gmtfull">Full resolution bathymetry database</flag>
diff --git a/sci-geosciences/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/sci-geosciences/gnome-maps/metadata.xml
+++ b/sci-geosciences/gnome-maps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
index 5f27678c1441..9ac429de7c04 100644
--- a/sci-geosciences/gpsbabel/metadata.xml
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/gpscorrelate/metadata.xml
+++ b/sci-geosciences/gpscorrelate/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index f08524166f55..ed1d429c6e9e 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription>Unbundled GPS daemon and library to support USB and serial
  GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and
  pygps.
diff --git a/sci-geosciences/gpx-viewer/metadata.xml b/sci-geosciences/gpx-viewer/metadata.xml
index 5f27678c1441..9ac429de7c04 100644
--- a/sci-geosciences/gpx-viewer/metadata.xml
+++ b/sci-geosciences/gpx-viewer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 8a0d685237b6..fb8fbf7e3e13 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
-	<herd>proxy-maintainers</herd><maintainer>
+	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintainer - assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <longdescription>The original GIS, yes the first one, developed by the US 
 Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation 
 Project for more info http://grass.itc.it/gdp/index.php
diff --git a/sci-geosciences/gshhs-data/metadata.xml b/sci-geosciences/gshhs-data/metadata.xml
index 2a17d73afa19..dc8934f7f6f3 100644
--- a/sci-geosciences/gshhs-data/metadata.xml
+++ b/sci-geosciences/gshhs-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 <longdescription lang="en">
   GSHHS is a high-resolution shoreline data set amalgamated from two
   databases in the public domain. The data have undergone extensive
diff --git a/sci-geosciences/gshhs/metadata.xml b/sci-geosciences/gshhs/metadata.xml
index 963cd264c045..b8e0f7f43e79 100644
--- a/sci-geosciences/gshhs/metadata.xml
+++ b/sci-geosciences/gshhs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+  <email>sci-geosciences@gentoo.org</email>
+  <name>Gentoo Geosciences Project</name>
+</maintainer>
 <longdescription lang="en">
   GSHHS is a high-resolution shoreline data set amalgamated from two
   databases in the public domain.  This package contains access
diff --git a/sci-geosciences/gtk-g-rays2/metadata.xml b/sci-geosciences/gtk-g-rays2/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/gtk-g-rays2/metadata.xml
+++ b/sci-geosciences/gtk-g-rays2/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/josm/metadata.xml
+++ b/sci-geosciences/josm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml
index 89f1b9660bc2..9c618c04c8f7 100644
--- a/sci-geosciences/laszip/metadata.xml
+++ b/sci-geosciences/laszip/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintainer - assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 An open-source utility for compressing LAS-stored LiDAR information in a
 lossless format.
diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml
index 96d8999b253f..90cbe0ce8c1a 100644
--- a/sci-geosciences/liblas/metadata.xml
+++ b/sci-geosciences/liblas/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>wraeth@wraeth.id.au</email>
 	<name>Sam Jorna</name>
 	<description>Proxy maintainer - assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial
 	raster library</flag>
diff --git a/sci-geosciences/mapnik-world-boundaries/metadata.xml b/sci-geosciences/mapnik-world-boundaries/metadata.xml
index 441155c7386c..7fa6a6a5526f 100644
--- a/sci-geosciences/mapnik-world-boundaries/metadata.xml
+++ b/sci-geosciences/mapnik-world-boundaries/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 <longdescription lang="en">
 World Boundaries data from openstreetmap needed by mapnik
 </longdescription>
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index ff0b4f5cd996..ace60909f0ca 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>sci-geosciences</herd>
+    <maintainer>
+        <email>sci-geosciences@gentoo.org</email>
+        <name>Gentoo Geosciences Project</name>
+    </maintainer>
     <longdescription>Mapnik is a toolkit for developing both web and desktop
     mapping applications.  The core libraries are written in C++, with
     optional Python bindings.
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index a4103a88dd1e..537ceced8052 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<use>
 		<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
 		<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index fabea7a8e6d2..446fe1be7fde 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
     <flag name="libproxy">
     	Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration
diff --git a/sci-geosciences/mkgmap/metadata.xml b/sci-geosciences/mkgmap/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/mkgmap/metadata.xml
+++ b/sci-geosciences/mkgmap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/mtkbabel/metadata.xml b/sci-geosciences/mtkbabel/metadata.xml
index 216ac4862b82..b6ca1d896a5c 100644
--- a/sci-geosciences/mtkbabel/metadata.xml
+++ b/sci-geosciences/mtkbabel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<longdescription lang="en">
 MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger.
 It should work also with other GPS devices based on the MediaTek MTK chipset.
diff --git a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
index 010539357cf4..d2a4c128e1b6 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">canboat/BR24radar_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-climatology/metadata.xml b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
index 112a36bbcf8d..73876c4bfe19 100644
--- a/sci-geosciences/opencpn-plugin-climatology/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">opencpnplugins</remote-id>
 		<remote-id type="github">seandepagnier/climatology_pi</remote-id>
diff --git a/sci-geosciences/opencpn-plugin-launcher/metadata.xml b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
index a88c3246e941..10a08a612d28 100644
--- a/sci-geosciences/opencpn-plugin-launcher/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nohal/launcher_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
index 7f351bb360a4..3f147c8e1c3b 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">delatbabel/LogbookKonni-1.2</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
index 55ad044d7106..77d1874b1320 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nohal/objsearch_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
index dc938a7ae9ef..cbff85ac1b9c 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nohal/ocpndebugger_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
index 716c11b549c2..0c1c67d7451e 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">seandepagnier/statusbar_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
index 5d730ba9631a..035c693ffa9b 100644
--- a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">seandepagnier/weather_routing_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
index d84967ebbf7c..b9fcd47d820d 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">seandepagnier/weatherfax_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn-plugin-wmm/metadata.xml b/sci-geosciences/opencpn-plugin-wmm/metadata.xml
index e9de5c118dfe..24f81399299a 100644
--- a/sci-geosciences/opencpn-plugin-wmm/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-wmm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nohal/wmm_pi</remote-id>
 	</upstream>
diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
index 5fc3e52fbced..cbb802053f15 100644
--- a/sci-geosciences/opencpn/metadata.xml
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">OpenCPN/OpenCPN</remote-id>
 		<remote-id type="launchpad">~opencpn</remote-id>
diff --git a/sci-geosciences/osm2mp/metadata.xml b/sci-geosciences/osm2mp/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/osm2mp/metadata.xml
+++ b/sci-geosciences/osm2mp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index 922b6a85e315..5f73f42aee36 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>sci-geosciences</herd>
-    <herd>postgresql</herd>
+    <maintainer>
+        <email>sci-geosciences@gentoo.org</email>
+        <name>Gentoo Geosciences Project</name>
+    </maintainer>
+    <maintainer>
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
     <longdescription lang="en">
         Converts OSM planet.osm data to a PostgreSQL / PostGIS database
         suitable for specific applications like rendering into map tiles by
diff --git a/sci-geosciences/osmosis/metadata.xml b/sci-geosciences/osmosis/metadata.xml
index 3beda91ba209..c958dfda7f71 100644
--- a/sci-geosciences/osmosis/metadata.xml
+++ b/sci-geosciences/osmosis/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index c7d2ce32745c..19de51d0aca3 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription lang="en">
   Quantum GIS (QGIS) is a user friendly Open Source Geographic
   Information System (GIS). QGIS supports vector, raster, and database
diff --git a/sci-geosciences/qlandkartegt-garmindev/metadata.xml b/sci-geosciences/qlandkartegt-garmindev/metadata.xml
index 9d61c0ed5adb..a651a4812255 100644
--- a/sci-geosciences/qlandkartegt-garmindev/metadata.xml
+++ b/sci-geosciences/qlandkartegt-garmindev/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qlandkartegt</remote-id>
 	</upstream>
diff --git a/sci-geosciences/qlandkartegt/metadata.xml b/sci-geosciences/qlandkartegt/metadata.xml
index 58b619ab77fc..01c965d9ac52 100644
--- a/sci-geosciences/qlandkartegt/metadata.xml
+++ b/sci-geosciences/qlandkartegt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
     <flag name="dmtx">Enable libdmtx support for summarizing waypoints as  2D barcode</flag>
     <flag name="gpsbabel">Enable support for wide range of geodata file formats</flag>
diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml
index e9f94a17a31f..f6f1eeaaeb1f 100644
--- a/sci-geosciences/qmapshack/metadata.xml
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Use QMapShack to plan your next outdoor trip or to visualize and archive
   all the GPS recordings of your past exciting adventures.
diff --git a/sci-geosciences/readosm/metadata.xml b/sci-geosciences/readosm/metadata.xml
index 3190fbf9c377..203359d7bee8 100644
--- a/sci-geosciences/readosm/metadata.xml
+++ b/sci-geosciences/readosm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/routino/metadata.xml b/sci-geosciences/routino/metadata.xml
index 577c6e944a64..9b4bf31cbb6f 100644
--- a/sci-geosciences/routino/metadata.xml
+++ b/sci-geosciences/routino/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
     An application for finding a route between two points using the dataset
     of topographical information collected by http://www.OpenStreetMap.org.
diff --git a/sci-geosciences/tilecache/metadata.xml b/sci-geosciences/tilecache/metadata.xml
index d21d11884553..bd2549cbee2d 100644
--- a/sci-geosciences/tilecache/metadata.xml
+++ b/sci-geosciences/tilecache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index b1a37b4886e5..8c6891eefe6f 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <use>
     <flag name="libexif">
       Use <pkg>media-libs/libexif</pkg> for EXIF support
diff --git a/sci-libs/acml/metadata.xml b/sci-libs/acml/metadata.xml
index 29546f51523b..8aebdc78787a 100644
--- a/sci-libs/acml/metadata.xml
+++ b/sci-libs/acml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 	The AMD(R) Core Math Library provides an implementation of the "Basic
 	Linear Algebra Subprograms" (BLAS) and the "Linear Algebra PACKage"
diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
index ea1d9dd9ce2e..05919ee00d24 100644
--- a/sci-libs/adolc/metadata.xml
+++ b/sci-libs/adolc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The ADOLC system automatically calculates exact derivatives of a
   C/C++ function.  It uses C++ overloading to record arithmetic
diff --git a/sci-libs/alglib/metadata.xml b/sci-libs/alglib/metadata.xml
index 2fb39b50afad..d1cc4d5f04bb 100644
--- a/sci-libs/alglib/metadata.xml
+++ b/sci-libs/alglib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 ALGLIB is a cross-platform numerical analysis and data processing library. It 
 supports several programming languages (C++, C#, Pascal, VBA) and several 
diff --git a/sci-libs/amd/metadata.xml b/sci-libs/amd/metadata.xml
index f4c85ca59868..3899f62675f6 100644
--- a/sci-libs/amd/metadata.xml
+++ b/sci-libs/amd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   AMD is a set of routines for ordering a sparse matrix prior to Cholesky
   factorization (or for LU factorization with diagonal pivoting). There
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index fb8d262a30ec..e497c48a6598 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>dilfridge@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Armadillo is a C++ linear algebra library (matrix maths) aiming
   towards a good balance between speed and ease of use. Integer,
diff --git a/sci-libs/arpack/metadata.xml b/sci-libs/arpack/metadata.xml
index c598daff90b3..19decf8e3088 100644
--- a/sci-libs/arpack/metadata.xml
+++ b/sci-libs/arpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The ARnoldi PACKage is a library of routines capable of solving large scale symmetric,
   nonsymmetric, and generalized eigenproblems. The software is designed to compute a few
diff --git a/sci-libs/arprec/metadata.xml b/sci-libs/arprec/metadata.xml
index f5a8029c8896..617e9a67829f 100644
--- a/sci-libs/arprec/metadata.xml
+++ b/sci-libs/arprec/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-<maintainer>
+  <maintainer>
   <email>grozin@gentoo.org</email>
   <name>Andrey Grozin</name>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+  </maintainer>
 <longdescription>
   Arbitrary precision library for float arithmetics and mathematical functions.
 </longdescription>
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index 7cf447e9155b..107b46a9a0d9 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="static-plugins">
 		build all plugins statically into main plugin modules
diff --git a/sci-libs/beagle/metadata.xml b/sci-libs/beagle/metadata.xml
index 4b2a7479afe8..e79a972c843a 100644
--- a/sci-libs/beagle/metadata.xml
+++ b/sci-libs/beagle/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
     Open BEAGLE is a C++ Evolutionary Computation (EC) framework. It provides an high-level software environment to do any kind of EC, with support for tree-based genetic programming, bit string and real-valued genetic algorithms, and evolution strategy.
   </longdescription>
diff --git a/sci-libs/blas-reference/metadata.xml b/sci-libs/blas-reference/metadata.xml
index 6d6f67c0371c..392841adc88f 100644
--- a/sci-libs/blas-reference/metadata.xml
+++ b/sci-libs/blas-reference/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 The BLAS (Basic Linear Algebra Subprograms) are high quality "building
 block" routines for performing basic vector and matrix operations. Level 1
diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml
index 64784b089c3f..c8cb92b13955 100644
--- a/sci-libs/bliss/metadata.xml
+++ b/sci-libs/bliss/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
@@ -10,4 +9,8 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/bmrblib/metadata.xml b/sci-libs/bmrblib/metadata.xml
index ba33fe4751e4..4948ea476ba1 100644
--- a/sci-libs/bmrblib/metadata.xml
+++ b/sci-libs/bmrblib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 	Bmrblib is an API abstracting the BioMagResBank (BMRB) NMR-STAR format 
 	(http://www.bmrb.wisc.edu/). It allows the writing of NMR-STAR files 
diff --git a/sci-libs/btf/metadata.xml b/sci-libs/btf/metadata.xml
index 2c22e8591c55..a15674eed530 100644
--- a/sci-libs/btf/metadata.xml
+++ b/sci-libs/btf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The Block Triangular Form is a library of routines offering
   permutation of an unsymmetric matrix (square or rectangular) into
diff --git a/sci-libs/buddy/metadata.xml b/sci-libs/buddy/metadata.xml
index c09b86dde138..2a3d9ceea527 100644
--- a/sci-libs/buddy/metadata.xml
+++ b/sci-libs/buddy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   A Binary Decision Diagram library, with :many highly efficient
   vectorized BDD operations,dynamic variable reordering,automated
diff --git a/sci-libs/camd/metadata.xml b/sci-libs/camd/metadata.xml
index 9c4f1c34262f..1253a6581d28 100644
--- a/sci-libs/camd/metadata.xml
+++ b/sci-libs/camd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Constrained Approximate Minimum Degree ordering is a set of routines
   for ordering a sparse matrix prior to Cholesky factorization (or for
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
index 7371ec6ccff3..2097529d2669 100644
--- a/sci-libs/cbflib/metadata.xml
+++ b/sci-libs/cbflib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
 CBFLIB is a library of ANSI-C functions providing a simple mechanism
 for accessing Crystallographic Binary Files (CBF files) and Image-supporting
diff --git a/sci-libs/cblas-reference/metadata.xml b/sci-libs/cblas-reference/metadata.xml
index f08baae0892a..f6589bf86285 100644
--- a/sci-libs/cblas-reference/metadata.xml
+++ b/sci-libs/cblas-reference/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 The BLAS (Basic Linear Algebra Subprograms) are high quality "building
 block" routines for performing basic vector and matrix operations. Level 1
diff --git a/sci-libs/ccfits/metadata.xml b/sci-libs/ccfits/metadata.xml
index b4532406f703..23a257b5e9d5 100644
--- a/sci-libs/ccfits/metadata.xml
+++ b/sci-libs/ccfits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   CCfits is an object oriented interface to the cfitsio library. It is
   designed to make the capabilities of cfitsio available to
diff --git a/sci-libs/ccolamd/metadata.xml b/sci-libs/ccolamd/metadata.xml
index 2451169809d7..642ac0b0cb33 100644
--- a/sci-libs/ccolamd/metadata.xml
+++ b/sci-libs/ccolamd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Constrained COLAMD computes an column approximate minimum degree ordering
   algorithm, (like COLAMD), but it can also be given a set of ordering
diff --git a/sci-libs/ccpn-data/metadata.xml b/sci-libs/ccpn-data/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/ccpn-data/metadata.xml
+++ b/sci-libs/ccpn-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/cctbx/metadata.xml b/sci-libs/cctbx/metadata.xml
index 2b8dcca992bb..cec693e57fb6 100644
--- a/sci-libs/cctbx/metadata.xml
+++ b/sci-libs/cctbx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 	The Computational Crystallography Toolbox (cctbx) is being developed
 	as the open source component of the PHENIX system. The goal of
diff --git a/sci-libs/cdd+/metadata.xml b/sci-libs/cdd+/metadata.xml
index 3444aa87b903..a06107bd1119 100644
--- a/sci-libs/cdd+/metadata.xml
+++ b/sci-libs/cdd+/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
     The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all
     vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear
diff --git a/sci-libs/cddlib/metadata.xml b/sci-libs/cddlib/metadata.xml
index 2f650f9efbfa..e0d40ba2abc5 100644
--- a/sci-libs/cddlib/metadata.xml
+++ b/sci-libs/cddlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 The C-library  cddlib is a C implementation of the Double Description 
 Method of Motzkin et al. for generating all vertices (i.e. extreme points)
diff --git a/sci-libs/cdf/metadata.xml b/sci-libs/cdf/metadata.xml
index aadf07573aff..442c23c9d6ef 100644
--- a/sci-libs/cdf/metadata.xml
+++ b/sci-libs/cdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 Common Data Format (CDF) is a conceptual data abstraction for storing
 multi-dimensional data sets. The basic component of CDF is a software
diff --git a/sci-libs/ceres-solver/metadata.xml b/sci-libs/ceres-solver/metadata.xml
index c61f580793c1..f80f663dbe4f 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Ceres Solver is a portable C++ library that allows for
   modeling and solving large complicated nonlinear least squares
diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
index 3a1d7eeeb433..7a366205ff3e 100644
--- a/sci-libs/cfitsio/metadata.xml
+++ b/sci-libs/cfitsio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   CFITSIO is a library of C and Fortran subroutines for reading and
   writing data files in FITS (Flexible Image Transport System) data
diff --git a/sci-libs/cgcode/metadata.xml b/sci-libs/cgcode/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/cgcode/metadata.xml
+++ b/sci-libs/cgcode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index 993590617a99..3626d248e663 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <use>
     <flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag>
   </use>
   <maintainer>
     <email>slis@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cgns</remote-id>
   </upstream>
diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml
index f24df5a36123..d7c7e2fec1bf 100644
--- a/sci-libs/chemkit/metadata.xml
+++ b/sci-libs/chemkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="applications">Build also applications not only the libraries</flag>
   </use>
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index 7590541d295d..3a18327c2cda 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   CHOLMOD is a set of ANSI C routines for sparse Cholesky
   factorization and update/downdate.
diff --git a/sci-libs/cifparse-obj/metadata.xml b/sci-libs/cifparse-obj/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/cifparse-obj/metadata.xml
+++ b/sci-libs/cifparse-obj/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml
index a256cf4867f0..2743bd1f8d7c 100644
--- a/sci-libs/clapack/metadata.xml
+++ b/sci-libs/clapack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   LAPACK is a comprehensive library that does linear algebra
   operations including matrix inversions, least squared solutions to
diff --git a/sci-libs/clashscore-db/metadata.xml b/sci-libs/clashscore-db/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/clashscore-db/metadata.xml
+++ b/sci-libs/clashscore-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/clipper/metadata.xml b/sci-libs/clipper/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/clipper/metadata.xml
+++ b/sci-libs/clipper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/cln/metadata.xml b/sci-libs/cln/metadata.xml
index 91b9559a615a..0bdb2ec72e13 100644
--- a/sci-libs/cln/metadata.xml
+++ b/sci-libs/cln/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   A Class Library for Numbers is a library for computations with all
   kinds of numbers in arbitrary precision. It has a set of number
diff --git a/sci-libs/cminpack/metadata.xml b/sci-libs/cminpack/metadata.xml
index 7f432fd0dc55..fc989892c44a 100644
--- a/sci-libs/cminpack/metadata.xml
+++ b/sci-libs/cminpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Minpack includes software for solving nonlinear equations and
   nonlinear least squares problems. Five algorithmic paths each
diff --git a/sci-libs/cmpfit/metadata.xml b/sci-libs/cmpfit/metadata.xml
index 549aa60ca56b..3b3dec3f12cc 100644
--- a/sci-libs/cmpfit/metadata.xml
+++ b/sci-libs/cmpfit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   MPFIT uses the Levenberg-Marquardt technique to solve the
   least-squares problem. In its typical use, MPFIT will be used to fit
diff --git a/sci-libs/coinhsl/metadata.xml b/sci-libs/coinhsl/metadata.xml
index 2dc94508a9bf..34ff7a0261a8 100644
--- a/sci-libs/coinhsl/metadata.xml
+++ b/sci-libs/coinhsl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   HSL (formerly the Harwell Subroutine Library) is a collection of
   state-of-the-art packages for large-scale scientific computation
diff --git a/sci-libs/coinor-alps/metadata.xml b/sci-libs/coinor-alps/metadata.xml
index 56d981f3f91c..a21fde666544 100644
--- a/sci-libs/coinor-alps/metadata.xml
+++ b/sci-libs/coinor-alps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   CHiPPS is the COIN-OR High-Performance Parallel Search Framework, a
   framework for implementing parallel algorithms based on tree
diff --git a/sci-libs/coinor-bcp/metadata.xml b/sci-libs/coinor-bcp/metadata.xml
index 733700021f6b..e4bf47a64798 100644
--- a/sci-libs/coinor-bcp/metadata.xml
+++ b/sci-libs/coinor-bcp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   BCP is a parallel framework for implementing branch, cut, and price
   algorithms for solving mixed integer programs (MIPs). BCP provides
diff --git a/sci-libs/coinor-bcps/metadata.xml b/sci-libs/coinor-bcps/metadata.xml
index 0e526c6a3d39..bb83d978359c 100644
--- a/sci-libs/coinor-bcps/metadata.xml
+++ b/sci-libs/coinor-bcps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   CHiPPS is the COIN-OR High-Performance Parallel Search Framework, a
   framework for implementing parallel algorithms based on tree
diff --git a/sci-libs/coinor-blis/metadata.xml b/sci-libs/coinor-blis/metadata.xml
index 357e4dd7282e..2b04df5edc81 100644
--- a/sci-libs/coinor-blis/metadata.xml
+++ b/sci-libs/coinor-blis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   CHiPPS is the COIN-OR High-Performance Parallel Search Framework, a
   framework for implementing parallel algorithms based on tree
diff --git a/sci-libs/coinor-bonmin/metadata.xml b/sci-libs/coinor-bonmin/metadata.xml
index b43dff4cbb32..2f199ce4c70d 100644
--- a/sci-libs/coinor-bonmin/metadata.xml
+++ b/sci-libs/coinor-bonmin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   BONMIN (Basic Open-source Nonlinear Mixed INteger programming) is an
   open-source code for solving general MINLP (Mixed Integer NonLinear
diff --git a/sci-libs/coinor-cbc/metadata.xml b/sci-libs/coinor-cbc/metadata.xml
index 340871a6b828..e1aea0041a99 100644
--- a/sci-libs/coinor-cbc/metadata.xml
+++ b/sci-libs/coinor-cbc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   COIN-OR Branch-and-Cut is a Mixed integer linear programming
   solver. It uses many of the COIN-OR components and is designed to be
diff --git a/sci-libs/coinor-cgl/metadata.xml b/sci-libs/coinor-cgl/metadata.xml
index 20a7edd0c5af..a17e549d213f 100644
--- a/sci-libs/coinor-cgl/metadata.xml
+++ b/sci-libs/coinor-cgl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COIN-OR Cut Generation Library (Cgl) is an open collection of
   cutting plane implementations ("cut generators") for use in teaching,
diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index c9bc5818e5f6..9e2ff54c5b23 100644
--- a/sci-libs/coinor-clp/metadata.xml
+++ b/sci-libs/coinor-clp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Clp (Coin-or linear programming) is an open-source linear
   programming solver written in C++. It is primarily meant to be used
diff --git a/sci-libs/coinor-couenne/metadata.xml b/sci-libs/coinor-couenne/metadata.xml
index 77cb214ea9d7..b6cceeae6e5b 100644
--- a/sci-libs/coinor-couenne/metadata.xml
+++ b/sci-libs/coinor-couenne/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Couenne (Convex Over and Under ENvelopes for Nonlinear Estimation)
   is a spatial branch and bound algorithm that implements linearization, bound
diff --git a/sci-libs/coinor-cppad/metadata.xml b/sci-libs/coinor-cppad/metadata.xml
index d31eb17d7b5f..c460d1f5fd6d 100644
--- a/sci-libs/coinor-cppad/metadata.xml
+++ b/sci-libs/coinor-cppad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   We refer to the step by step conversion from an algorithm that
   computes function values to an algorithm that computes derivative
diff --git a/sci-libs/coinor-csdp/metadata.xml b/sci-libs/coinor-csdp/metadata.xml
index cfceba8a14b8..9e27f0e7baca 100644
--- a/sci-libs/coinor-csdp/metadata.xml
+++ b/sci-libs/coinor-csdp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
    CSDP is a library of routines that implements a predictor corrector
    variant of the semidefinite programming algorithm of Helmberg,
diff --git a/sci-libs/coinor-dip/metadata.xml b/sci-libs/coinor-dip/metadata.xml
index bc503d8abeea..51413035abfe 100644
--- a/sci-libs/coinor-dip/metadata.xml
+++ b/sci-libs/coinor-dip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   DIP (Decomposition for Integer Programming) is an open-source
   extensible software framework for implementing decomposition-based
diff --git a/sci-libs/coinor-dylp/metadata.xml b/sci-libs/coinor-dylp/metadata.xml
index 148a97c63e2c..aba398f5dcfa 100644
--- a/sci-libs/coinor-dylp/metadata.xml
+++ b/sci-libs/coinor-dylp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   DyLp is designed to find solutions of constrained linear mathematical
   optimization problems. To this end, it is using a full implementation
diff --git a/sci-libs/coinor-flopcpp/metadata.xml b/sci-libs/coinor-flopcpp/metadata.xml
index fd88f4003de5..0c428577a4db 100644
--- a/sci-libs/coinor-flopcpp/metadata.xml
+++ b/sci-libs/coinor-flopcpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COIN-OR Formulation of Linear Optimization Problems in C++
   (FLOPC++) is a linear optimization modelling language that can be
diff --git a/sci-libs/coinor-mp/metadata.xml b/sci-libs/coinor-mp/metadata.xml
index d740b64ecba3..b683e5fa2e3e 100644
--- a/sci-libs/coinor-mp/metadata.xml
+++ b/sci-libs/coinor-mp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The COmputational INfrastructure for Operations Research (COIN-OR) 
   MP is a C-API interface library that supports most of the
diff --git a/sci-libs/coinor-netlib/metadata.xml b/sci-libs/coinor-netlib/metadata.xml
index 19f3fd4936b3..4e6f2d24467b 100644
--- a/sci-libs/coinor-netlib/metadata.xml
+++ b/sci-libs/coinor-netlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COmputational INfrastructure for Operations Research (COIN-OR)
   models from netlib for testing.
diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml
index fd3616a08225..3c8de0f57cc9 100644
--- a/sci-libs/coinor-os/metadata.xml
+++ b/sci-libs/coinor-os/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The objective of Optimization Services (OS) is to provide a set of
   standards for representing optimization instances, results, solver
diff --git a/sci-libs/coinor-osi/metadata.xml b/sci-libs/coinor-osi/metadata.xml
index fd3d4a39854d..f12971d0300c 100644
--- a/sci-libs/coinor-osi/metadata.xml
+++ b/sci-libs/coinor-osi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COIN-OR Open Solver Interface is a uniform API for interacting with
   callable solver libraries. It supports linear programming solvers as
diff --git a/sci-libs/coinor-sample/metadata.xml b/sci-libs/coinor-sample/metadata.xml
index 6c1aa99232fe..9a783d875e59 100644
--- a/sci-libs/coinor-sample/metadata.xml
+++ b/sci-libs/coinor-sample/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COmputational INfrastructure for Operations Research (COIN-OR)
   sample models for testing.
diff --git a/sci-libs/coinor-smi/metadata.xml b/sci-libs/coinor-smi/metadata.xml
index 551066284b8a..eadbc96f85af 100644
--- a/sci-libs/coinor-smi/metadata.xml
+++ b/sci-libs/coinor-smi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The COIN-OR Stochastic Modeling Interface (SMI) is an interface for
   problems in which uncertainty and optimization appear
diff --git a/sci-libs/coinor-symphony/metadata.xml b/sci-libs/coinor-symphony/metadata.xml
index 1ff830e61d40..4e5b457dd384 100644
--- a/sci-libs/coinor-symphony/metadata.xml
+++ b/sci-libs/coinor-symphony/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   SYMPHONY is a generic mixed-integer linear programs
   (MILP) solver, callable library, and extensible framework for implementing
diff --git a/sci-libs/coinor-utils/metadata.xml b/sci-libs/coinor-utils/metadata.xml
index 652e29c64193..019a2ef15d66 100644
--- a/sci-libs/coinor-utils/metadata.xml
+++ b/sci-libs/coinor-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   CoinUtils (Coin-or Utilities) is a collection of classes that are
   generally useful to COmputational INfrastructure for Operations
diff --git a/sci-libs/coinor-vol/metadata.xml b/sci-libs/coinor-vol/metadata.xml
index a9bae533930c..273d3f6672d0 100644
--- a/sci-libs/coinor-vol/metadata.xml
+++ b/sci-libs/coinor-vol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Volume Algorithm is part of COIN-OR (COmputational INfrastructure
   for Operations Research) project. Vol is an implementation of a
diff --git a/sci-libs/colamd/metadata.xml b/sci-libs/colamd/metadata.xml
index fd01c0c5651a..b48bbab99b3a 100644
--- a/sci-libs/colamd/metadata.xml
+++ b/sci-libs/colamd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The COLumn Approximate Minimum Degree ordering algorithm
   computes a permutation vector P such that the LU factorization of A
diff --git a/sci-libs/colpack/metadata.xml b/sci-libs/colpack/metadata.xml
index 97c2ff62782c..6416359370da 100644
--- a/sci-libs/colpack/metadata.xml
+++ b/sci-libs/colpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   ColPack is a package comprising of implementations of algorithms for
   the specialized vertex coloring problems as well as algorithms for a
diff --git a/sci-libs/coot-data/metadata.xml b/sci-libs/coot-data/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/coot-data/metadata.xml
+++ b/sci-libs/coot-data/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/cqrlib/metadata.xml b/sci-libs/cqrlib/metadata.xml
index 6092f303ad7e..e763be7f7630 100644
--- a/sci-libs/cqrlib/metadata.xml
+++ b/sci-libs/cqrlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cqrlib</remote-id>
   </upstream>
diff --git a/sci-libs/cxsparse/metadata.xml b/sci-libs/cxsparse/metadata.xml
index 1eb9a37955ca..bdf405818080 100644
--- a/sci-libs/cxsparse/metadata.xml
+++ b/sci-libs/cxsparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   CXSparse is an extended version of CSparse, a sparse matrix package,
   with support for double or complex matrices, with int or long
diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml
index 68a2a8a28c3b..877e64920654 100644
--- a/sci-libs/dcmtk/metadata.xml
+++ b/sci-libs/dcmtk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
   <maintainer>
     <email>sci-biology@gentoo.org</email>
   </maintainer>
diff --git a/sci-libs/djbfft/metadata.xml b/sci-libs/djbfft/metadata.xml
index acca8fb6c86a..c5c8ccf23383 100644
--- a/sci-libs/djbfft/metadata.xml
+++ b/sci-libs/djbfft/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>video</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
   <longdescription lang="en">
   D.J. Bernstein Fast Fourier Transform (djbfft) is an extremely 
   fast library for floating-point convolution. The current version
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 80d9f9e16c0f..83273ac9ecc5 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   dlib is a C++ library for developing portable applications dealing with
   networking, threads, graphical interfaces, data structures, linear
diff --git a/sci-libs/dsdp/metadata.xml b/sci-libs/dsdp/metadata.xml
index 583a107924f4..4607ce5b751b 100644
--- a/sci-libs/dsdp/metadata.xml
+++ b/sci-libs/dsdp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The DSDP software is a free open source implementation of an
   interior-point method for semidefinite programming. It provides
diff --git a/sci-libs/exodusii/metadata.xml b/sci-libs/exodusii/metadata.xml
index 28ba0daae5e1..1ef9f8d90b9f 100644
--- a/sci-libs/exodusii/metadata.xml
+++ b/sci-libs/exodusii/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 EXODUS II is a model developed to store and retrieve transient data for 
 finite element analyses. It is used for preprocessing, postprocessing, 
diff --git a/sci-libs/fetk/metadata.xml b/sci-libs/fetk/metadata.xml
index 6e0896b9aa27..bfdad23b4844 100644
--- a/sci-libs/fetk/metadata.xml
+++ b/sci-libs/fetk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 The Finite Element ToolKit (FETK) is a collaboratively developed, evolving 
 collection of adaptive finite element method (AFEM) software libraries and 
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 5221b542c560..05014e707205 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Fastest Fourier Transform in the West is a C subroutine library
   for computing the Discrete Fourier Transform (DFT) in one or more
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index 3b08417e4cab..cbfa314edd76 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   FLANN is a library for performing fast approximate nearest neighbor
   searches in high dimensional spaces. It contains a collection of
diff --git a/sci-libs/galib/metadata.xml b/sci-libs/galib/metadata.xml
index ec87df8ac6c2..85fa531ecbcf 100644
--- a/sci-libs/galib/metadata.xml
+++ b/sci-libs/galib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   GAlib contains a set of C++ genetic algorithm objects. The library
   includes tools for using genetic algorithms to do optimization in
diff --git a/sci-libs/gamer/metadata.xml b/sci-libs/gamer/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/gamer/metadata.xml
+++ b/sci-libs/gamer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/gaul-devel/metadata.xml b/sci-libs/gaul-devel/metadata.xml
index cce2626de2b1..fd6a0057576f 100644
--- a/sci-libs/gaul-devel/metadata.xml
+++ b/sci-libs/gaul-devel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Genetic Algorithm Utility Library is a
   flexible programming library designed to aid in the development of
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 943ca9393804..d8997a229219 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription>
 GDAL is the Geospatial Data Abstraction Library, a set of tools for
 converting between geospatial raster data formats (includes OGR for
diff --git a/sci-libs/geos/metadata.xml b/sci-libs/geos/metadata.xml
index c39dbd31f58e..3402964b2c17 100644
--- a/sci-libs/geos/metadata.xml
+++ b/sci-libs/geos/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
-  <herd>postgresql</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
+  <maintainer>
+    <email>pgsql-bugs@gentoo.org</email>
+    <name>PostgreSQL and Related Package Development</name>
+  </maintainer>
   <longdescription lang="en">
     Geometric Engine Open Source provides a spatial object model and
     fundamental geometric functions. It implements the geometry model
diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index 71694d7922bb..36155ac4744b 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Gerris Flow Solver is a software program for the solution of the partial
   differential equations describing fluid flow.
diff --git a/sci-libs/getdata/metadata.xml b/sci-libs/getdata/metadata.xml
index ac6fc3235bb0..929585bcc4a8 100644
--- a/sci-libs/getdata/metadata.xml
+++ b/sci-libs/getdata/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The GetData Project is the reference implementation of the Dirfile
   Standards, a filesystem-based, column-oriented database format for
diff --git a/sci-libs/gpp4/metadata.xml b/sci-libs/gpp4/metadata.xml
index b47b9c228f07..f4f030e73e2c 100644
--- a/sci-libs/gpp4/metadata.xml
+++ b/sci-libs/gpp4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gpp4</remote-id>
 	</upstream>
diff --git a/sci-libs/grib_api/metadata.xml b/sci-libs/grib_api/metadata.xml
index 390ff4487e6e..663e453c2944 100644
--- a/sci-libs/grib_api/metadata.xml
+++ b/sci-libs/grib_api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">  
   The European Centre for Medium-Range Weather Forecasts GRIdded
   Binary (GRIB) API is an application program interface accessible
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 7ab2ed03c52f..5f2873ff4e43 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The GNU Scientific Library (GSL) is a collection of routines for
   numerical analysis. The routines are written from scratch by the GSL
diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml
index 8b3d37b31790..e76fdaf330be 100644
--- a/sci-libs/gts/metadata.xml
+++ b/sci-libs/gts/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Gerris Flow Solver is a software program for the solution of the partial
   differential equations describing fluid flow.
diff --git a/sci-libs/hdf/metadata.xml b/sci-libs/hdf/metadata.xml
index 40b295a48396..d0203574035b 100644
--- a/sci-libs/hdf/metadata.xml
+++ b/sci-libs/hdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   The Hierarchical Data Format is a general purpose library and
   file format for storing scientific data.
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 1edb12ad3059..723a0627c5af 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   HDF5 is a file format and library for storing scientific data. HDF5
   was designed and implemented to address the deficiencies of HDF4.x. It
diff --git a/sci-libs/htslib/metadata.xml b/sci-libs/htslib/metadata.xml
index 74dc02bc9826..0a1dbde36484 100644
--- a/sci-libs/htslib/metadata.xml
+++ b/sci-libs/htslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">samtools</remote-id>
   </upstream>
diff --git a/sci-libs/hypre/metadata.xml b/sci-libs/hypre/metadata.xml
index a44d7feb10d7..c260cd7c51ed 100644
--- a/sci-libs/hypre/metadata.xml
+++ b/sci-libs/hypre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Hypre is a set of matrix preconditioning libraries to aid in the
   solution of large systems of linear equations.
diff --git a/sci-libs/idlmarkwardt/metadata.xml b/sci-libs/idlmarkwardt/metadata.xml
index 9df79792d4b5..502005fd3acf 100644
--- a/sci-libs/idlmarkwardt/metadata.xml
+++ b/sci-libs/idlmarkwardt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Library of IDL software procedures that Craig Markwardt is making
   available to the general public. It contains: 
diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
index a168ded5a2e9..f6ea33be57c3 100644
--- a/sci-libs/inchi/metadata.xml
+++ b/sci-libs/inchi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 Program v1.03 implementing IUPAC (Standard) InChI/InChIKey version 1.
 </longdescription>
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index 060befd94c1c..de1aa014eeb4 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">indi</remote-id>
 	</upstream>
diff --git a/sci-libs/io_lib/metadata.xml b/sci-libs/io_lib/metadata.xml
index 637e1320bb63..6f59aa290061 100644
--- a/sci-libs/io_lib/metadata.xml
+++ b/sci-libs/io_lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   io_lib is a library of file reading and writing code to provide a
   general purpose trace file (and Experiment File) reading interface. The
diff --git a/sci-libs/ipopt/metadata.xml b/sci-libs/ipopt/metadata.xml
index 9b75b46f459c..b8ac790d4085 100644
--- a/sci-libs/ipopt/metadata.xml
+++ b/sci-libs/ipopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Ipopt is a solver for large-scale nonlinear continuous
   optimization. It can be used from modeling environments, such as
diff --git a/sci-libs/ipp/metadata.xml b/sci-libs/ipp/metadata.xml
index b4c1f331a246..ef852f36d751 100644
--- a/sci-libs/ipp/metadata.xml
+++ b/sci-libs/ipp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Intel(R) Integrated Performance Primitives (Intel(R) IPP) is a
   library of multi-core-ready, optimized software functions for
diff --git a/sci-libs/itpp/metadata.xml b/sci-libs/itpp/metadata.xml
index c52430f8e962..0d6ced803524 100644
--- a/sci-libs/itpp/metadata.xml
+++ b/sci-libs/itpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   IT++ is a C++ library of mathematical, signal processing and
   communication classes and functions. Its main use is in simulation
diff --git a/sci-libs/jama/metadata.xml b/sci-libs/jama/metadata.xml
index 103f08e646a1..26bc2a3920d2 100644
--- a/sci-libs/jama/metadata.xml
+++ b/sci-libs/jama/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   JAMA/C++: a translation of the Java Matrix Library,  developed by the 
   Mathworks and NIST, into C++ . It includes the following routines:
diff --git a/sci-libs/jmol-acme/metadata.xml b/sci-libs/jmol-acme/metadata.xml
index 67f88fe8ce1f..c734707c4293 100644
--- a/sci-libs/jmol-acme/metadata.xml
+++ b/sci-libs/jmol-acme/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>je_fro@gentoo.org</email>
 		<name>Jeff Gardner</name>
 	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sci-libs/klu/metadata.xml b/sci-libs/klu/metadata.xml
index 485be7b6f45e..5fda3ff0b9eb 100644
--- a/sci-libs/klu/metadata.xml
+++ b/sci-libs/klu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   KLU is a sparse LU factorization algorithm well-suited for use in
   circuit simulation. It is also part of the University
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 41e8160d30cf..02d333aea46c 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 LAPACK is a comprehensive library that does linear algebra
 operations including matrix inversions, least squared solutions to
diff --git a/sci-libs/ldl/metadata.xml b/sci-libs/ldl/metadata.xml
index 16d693b4d0f1..6b4df47d8bfd 100644
--- a/sci-libs/ldl/metadata.xml
+++ b/sci-libs/ldl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   LDL is a set of concise routines for factorizing symmetric
   positive-definite sparse matrices, with some applicability to
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 9251a3bf18a4..92c65b4e456b 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
 <maintainer>
   <email>mmokrejs@gmail.com</email>
   <name>Martin Mokrejs</name>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   LEMON stands for Library for Efficient Modeling and Optimization in
   Networks. It is a C++ template library providing efficient
diff --git a/sci-libs/levmar/metadata.xml b/sci-libs/levmar/metadata.xml
index b0078f29f202..a406bd8be805 100644
--- a/sci-libs/levmar/metadata.xml
+++ b/sci-libs/levmar/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>3dprint</herd>
 <maintainer>
 	<email>amynka@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>3dprint@gentoo.org</email>
+	<name>Gentoo 3D print</name>
+</maintainer>
 <longdescription lang="en">
   levmar is a native ANSI C implementation of the Levenberg-Marquardt
   optimization algorithm.  Both unconstrained and constrained (under
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
index aae3622eeab6..348535154e14 100644
--- a/sci-libs/libbufr/metadata.xml
+++ b/sci-libs/libbufr/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
 	<maintainer>
 		<email>nerdboy@gentoo.org</email>
 		<name>Steve Arnold</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This is mainly just an open source BUFR library from ECMWF that comes with a few example tools (some of which are built and installed).
 	</longdescription>
diff --git a/sci-libs/libccp4/metadata.xml b/sci-libs/libccp4/metadata.xml
index e42d0af60f42..3953c89968a9 100644
--- a/sci-libs/libccp4/metadata.xml
+++ b/sci-libs/libccp4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libcerf/metadata.xml b/sci-libs/libcerf/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/libcerf/metadata.xml
+++ b/sci-libs/libcerf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/libcmatrix/metadata.xml
+++ b/sci-libs/libcmatrix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libcore/metadata.xml b/sci-libs/libcore/metadata.xml
index e55bb9c167e5..283e44fb9e63 100644
--- a/sci-libs/libcore/metadata.xml
+++ b/sci-libs/libcore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 <longdescription lang="en">  
   The Core Library is a collection of C/C++ classes for exact
   computation with real algebraic numbers.
diff --git a/sci-libs/libctl/metadata.xml b/sci-libs/libctl/metadata.xml
index 9bcae3a7754e..fb941a96d9b2 100644
--- a/sci-libs/libctl/metadata.xml
+++ b/sci-libs/libctl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   libctl is the Control Language library implementing a control file
   structure aimed at simplifying the control file writing in
diff --git a/sci-libs/libdap/metadata.xml b/sci-libs/libdap/metadata.xml
index ffb17615be3a..50a8671283d2 100644
--- a/sci-libs/libdap/metadata.xml
+++ b/sci-libs/libdap/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+<maintainer>
+	<email>sci-geosciences@gentoo.org</email>
+	<name>Gentoo Geosciences Project</name>
+</maintainer>
 <longdescription>
   libdap is a C++ implementation of OPeNDAP which allows access to
   data over the internet, from programs that weren't originally
diff --git a/sci-libs/libexcelformat/metadata.xml b/sci-libs/libexcelformat/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/sci-libs/libexcelformat/metadata.xml
+++ b/sci-libs/libexcelformat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libgenome/metadata.xml b/sci-libs/libgenome/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-libs/libgenome/metadata.xml
+++ b/sci-libs/libgenome/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libgeotiff/metadata.xml b/sci-libs/libgeotiff/metadata.xml
index 5f27678c1441..9ac429de7c04 100644
--- a/sci-libs/libgeotiff/metadata.xml
+++ b/sci-libs/libgeotiff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libghemical/metadata.xml b/sci-libs/libghemical/metadata.xml
index 26e9c2e63c5e..cecd3119184e 100644
--- a/sci-libs/libghemical/metadata.xml
+++ b/sci-libs/libghemical/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+  <email>sci-chemistry@gentoo.org</email>
+  <name>Gentoo Chemistry Project</name>
+</maintainer>
 <longdescription>
 Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models 
 and molecular mechanics models (there is an experimental Tripos 5.2-like force 
diff --git a/sci-libs/libint/metadata.xml b/sci-libs/libint/metadata.xml
index 1f2039c47812..e132b281abfc 100644
--- a/sci-libs/libint/metadata.xml
+++ b/sci-libs/libint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   libint is two things:
   1. a library of C/C++ functions for efficient evaluation of several
diff --git a/sci-libs/libmems/metadata.xml b/sci-libs/libmems/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-libs/libmems/metadata.xml
+++ b/sci-libs/libmems/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libmuscle/metadata.xml b/sci-libs/libmuscle/metadata.xml
index d4648212cbad..71d4974b6dda 100644
--- a/sci-libs/libmuscle/metadata.xml
+++ b/sci-libs/libmuscle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+	<maintainer>
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libnova/metadata.xml b/sci-libs/libnova/metadata.xml
index 2aeb4f9d9824..214d66b5073a 100644
--- a/sci-libs/libnova/metadata.xml
+++ b/sci-libs/libnova/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
   <longdescription lang="en">
   libnova is a general purpose, double precision, astronomical
   calculation library. The intended audience of libnova is C / C++ programmers,
diff --git a/sci-libs/liborigin/metadata.xml b/sci-libs/liborigin/metadata.xml
index b0d1cf12843c..ce901b5d4e4e 100644
--- a/sci-libs/liborigin/metadata.xml
+++ b/sci-libs/liborigin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     A library providing IO for Microcal Origin files.
   </longdescription>
diff --git a/sci-libs/libpdb++/metadata.xml b/sci-libs/libpdb++/metadata.xml
index d369d068ffb8..3317f1673908 100644
--- a/sci-libs/libpdb++/metadata.xml
+++ b/sci-libs/libpdb++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libpdb/metadata.xml b/sci-libs/libpdb/metadata.xml
index d369d068ffb8..3317f1673908 100644
--- a/sci-libs/libpdb/metadata.xml
+++ b/sci-libs/libpdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libqalculate/metadata.xml b/sci-libs/libqalculate/metadata.xml
index b3409acc001f..7f88c6cd99cc 100644
--- a/sci-libs/libqalculate/metadata.xml
+++ b/sci-libs/libqalculate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">.tar.gz</remote-id>
   </upstream>
diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index f1e6b40bd881..3bb5d3a0853c 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="ftdi">Enable drivers that need libftdi</flag>
  <flag name="parport">Enable drivers that are parallel (IEEE1284) based</flag>
diff --git a/sci-libs/libsigrokdecode/metadata.xml b/sci-libs/libsigrokdecode/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/sci-libs/libsigrokdecode/metadata.xml
+++ b/sci-libs/libsigrokdecode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libsvm/metadata.xml b/sci-libs/libsvm/metadata.xml
index 3c124a8104e4..f39d290ecd0d 100644
--- a/sci-libs/libsvm/metadata.xml
+++ b/sci-libs/libsvm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
  The LIBSVM library is used to calculate Support Vector Machine
  optimizations  with a great variety of options. It includes
diff --git a/sci-libs/libticables2/metadata.xml b/sci-libs/libticables2/metadata.xml
index 579feb0d08b3..1224315a1f28 100644
--- a/sci-libs/libticables2/metadata.xml
+++ b/sci-libs/libticables2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This library provides functions to use Texas Instruments link cables
   for TI calculators. It currently supports all cables on i386,
diff --git a/sci-libs/libticalcs2/metadata.xml b/sci-libs/libticalcs2/metadata.xml
index 020327555f5a..3d68e3104302 100644
--- a/sci-libs/libticalcs2/metadata.xml
+++ b/sci-libs/libticalcs2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The libticalcs provides a set of functions to communicate with Texas
   Instruments calculators. It implements the TI protocol for each type
diff --git a/sci-libs/libticonv/metadata.xml b/sci-libs/libticonv/metadata.xml
index e7727db066e1..086b72dd5827 100644
--- a/sci-libs/libticonv/metadata.xml
+++ b/sci-libs/libticonv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The libticonv package is a library which handles the various TI
   charsets and conversion to/from UTF-8/16 through a set of functions
diff --git a/sci-libs/libtifiles2/metadata.xml b/sci-libs/libtifiles2/metadata.xml
index 1ba180601ff8..4bf21b92d464 100644
--- a/sci-libs/libtifiles2/metadata.xml
+++ b/sci-libs/libtifiles2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The libtifiles is a library providing support for operations on Texas
   Instruments calculators files. All formats for all calculators are
diff --git a/sci-libs/linux-gpib/metadata.xml b/sci-libs/linux-gpib/metadata.xml
index 32646ae5b6ae..b810350ac831 100644
--- a/sci-libs/linux-gpib/metadata.xml
+++ b/sci-libs/linux-gpib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
   <maintainer>
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <maintainer>
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
   <use>
     <flag name="firmware">Install firmware</flag>
     <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
diff --git a/sci-libs/lis/metadata.xml b/sci-libs/lis/metadata.xml
index 95e0b1af2dd1..07fa55bbeb9e 100644
--- a/sci-libs/lis/metadata.xml
+++ b/sci-libs/lis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Lis, a Library of Iterative Solvers for linear systems, is a
   scalable parallel library for solving systems of linear equations
diff --git a/sci-libs/lrslib/metadata.xml b/sci-libs/lrslib/metadata.xml
index f8a5af1b110a..ab514f32bce1 100644
--- a/sci-libs/lrslib/metadata.xml
+++ b/sci-libs/lrslib/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>lrslib is a self-contained ANSI C implementation as a callable library of the
   reverse search algorithm for vertex enumeration/convex hull problems and comes with a choice of
   three arithmetic packages. Input file formats are compatible with Komei Fukuda's cdd package. All
diff --git a/sci-libs/magma/metadata.xml b/sci-libs/magma/metadata.xml
index 08979348e343..38480f7e4a3f 100644
--- a/sci-libs/magma/metadata.xml
+++ b/sci-libs/magma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Matrix Algebra on GPU and Multicore Architectures
   project aims to develop a dense linear algebra library
diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index c83d07407096..2193c3e7e825 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   MathGL is a library for:
   * making high-quality scientific graphics
diff --git a/sci-libs/matio/metadata.xml b/sci-libs/matio/metadata.xml
index 0b2480b9550d..48a0f48ae4d0 100644
--- a/sci-libs/matio/metadata.xml
+++ b/sci-libs/matio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   matio is an ISO C library (with a limited Fortran 90 interface) for
   reading and writing Matlab MAT files.
diff --git a/sci-libs/mc/metadata.xml b/sci-libs/mc/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/mc/metadata.xml
+++ b/sci-libs/mc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/metis/metadata.xml b/sci-libs/metis/metadata.xml
index d9a2c8da5731..c64d6296db16 100644
--- a/sci-libs/metis/metadata.xml
+++ b/sci-libs/metis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   METIS is a set of serial programs for partitioning graphs,
   partitioning finite element meshes, and producing fill reducing
diff --git a/sci-libs/minfx/metadata.xml b/sci-libs/minfx/metadata.xml
index d1801b6a5b81..a7c058a250ec 100644
--- a/sci-libs/minfx/metadata.xml
+++ b/sci-libs/minfx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription>
 	The minfx project is a python package for numerical optimisation, 
 	being a large collection of standard minimisation algorithms. The name minfx 
diff --git a/sci-libs/minuit/metadata.xml b/sci-libs/minuit/metadata.xml
index b4d71878b525..d4227f2553ea 100644
--- a/sci-libs/minuit/metadata.xml
+++ b/sci-libs/minuit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Minuit provides a C++ library for non-linear optimization,
   and parameter error estimation. Widely used in High Energy Physics,
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 5a16572811f3..53d148bf1f7d 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   The Intel(R) Math Kernel Library is a mathematical library mostly
   optimized for Intel processors (also works on AMDs). It contains BLAS
diff --git a/sci-libs/mmdb/metadata.xml b/sci-libs/mmdb/metadata.xml
index 19fd943195bb..efc1eee651df 100644
--- a/sci-libs/mmdb/metadata.xml
+++ b/sci-libs/mmdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">mmdb</remote-id>
   </upstream>
diff --git a/sci-libs/mmtk/metadata.xml b/sci-libs/mmtk/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/mmtk/metadata.xml
+++ b/sci-libs/mmtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/monomer-db/metadata.xml b/sci-libs/monomer-db/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/monomer-db/metadata.xml
+++ b/sci-libs/monomer-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/mpfi/metadata.xml b/sci-libs/mpfi/metadata.xml
index d726ba25d70f..70477c2a4b1d 100644
--- a/sci-libs/mpfi/metadata.xml
+++ b/sci-libs/mpfi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   MPFI is intended to be a portable library written in C for arbitrary
   precision interval arithmetic with intervals represented using MPFR
diff --git a/sci-libs/mpir/metadata.xml b/sci-libs/mpir/metadata.xml
index daf70f0500f8..a809fff831e0 100644
--- a/sci-libs/mpir/metadata.xml
+++ b/sci-libs/mpir/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription> 
 MPIR is an open source multiprecision integer (bignum) library forked
 from the GMP (GNU Multi Precision) project. It consists of much code
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index 477ae66cda30..f7a3b1c0bab2 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   MUltifrontal Massively Parallel sparse direct Solver implements a
   direct solver for large sparse linear systems, with a particular
diff --git a/sci-libs/neartree/metadata.xml b/sci-libs/neartree/metadata.xml
index 187a4e99374a..a6e2e51c8104 100644
--- a/sci-libs/neartree/metadata.xml
+++ b/sci-libs/neartree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">neartree</remote-id>
 	</upstream>
diff --git a/sci-libs/nemesis/metadata.xml b/sci-libs/nemesis/metadata.xml
index ae80af7a02ed..4978a54dcba3 100644
--- a/sci-libs/nemesis/metadata.xml
+++ b/sci-libs/nemesis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 NEMESIS is an enhancement to the EXODUSII finite element database
 model used to store and retrieve data for unstructured parallel finite
diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index 3a0a93bf3224..4e5eb8768b18 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
diff --git a/sci-libs/netcdf-fortran/metadata.xml b/sci-libs/netcdf-fortran/metadata.xml
index 1c9a839f9fb7..4248e3820bcc 100644
--- a/sci-libs/netcdf-fortran/metadata.xml
+++ b/sci-libs/netcdf-fortran/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index d78394eb9cd8..09a600527b8a 100644
--- a/sci-libs/netcdf/metadata.xml
+++ b/sci-libs/netcdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
diff --git a/sci-libs/nfft/metadata.xml b/sci-libs/nfft/metadata.xml
index 119d0fde1940..14166e8bf282 100644
--- a/sci-libs/nfft/metadata.xml
+++ b/sci-libs/nfft/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 41afd070ac46..e0e31950ad57 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   NLopt is a library for nonlinear optimization,
   providing a common interface for a number of different free
diff --git a/sci-libs/oc/metadata.xml b/sci-libs/oc/metadata.xml
index 9bacf03e2639..ec08e09a5999 100644
--- a/sci-libs/oc/metadata.xml
+++ b/sci-libs/oc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The New OPeNDAP C API (oc) is an OPeNDAP DAP 2.0 client implementation
   written in generic C. This new API allows for more funcionality and
diff --git a/sci-libs/ogdi/metadata.xml b/sci-libs/ogdi/metadata.xml
index 9a53e0e5b56d..679453772979 100644
--- a/sci-libs/ogdi/metadata.xml
+++ b/sci-libs/ogdi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">ogdi</remote-id>
   </upstream>
diff --git a/sci-libs/openfoam-bin/metadata.xml b/sci-libs/openfoam-bin/metadata.xml
index 283d23bb5561..880ee4764023 100644
--- a/sci-libs/openfoam-bin/metadata.xml
+++ b/sci-libs/openfoam-bin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
@@ -10,6 +9,10 @@
 		<email>oli.borm@web.de</email>
 		<name>Oliver Borm</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">foam</remote-id>
 	</upstream>
diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
index 3a8af9d60da7..054094e7fbc6 100644
--- a/sci-libs/openfoam/metadata.xml
+++ b/sci-libs/openfoam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
@@ -10,6 +9,10 @@
     <email>oli.borm@web.de</email>
     <name>Oliver Borm</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="opendx"> Install opendx visualisation tool</flag>
     <flag name="src"> Install source files</flag>
diff --git a/sci-libs/openlibm/metadata.xml b/sci-libs/openlibm/metadata.xml
index 7d7972a2f0f3..726732a68e39 100644
--- a/sci-libs/openlibm/metadata.xml
+++ b/sci-libs/openlibm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   OpenLibm is an effort to have a high quality standalone LIBM
   library. It is meant to be used standalone in applications and
diff --git a/sci-libs/parmetis/metadata.xml b/sci-libs/parmetis/metadata.xml
index 878c86dda5f2..b42ac6650bbb 100644
--- a/sci-libs/parmetis/metadata.xml
+++ b/sci-libs/parmetis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   ParMETIS is an MPI-based parallel library that implements a variety
   of algorithms for partitioning unstructured graphs and for computing
diff --git a/sci-libs/pgplot/metadata.xml b/sci-libs/pgplot/metadata.xml
index 7afe58a52a3f..5e4c1af128fa 100644
--- a/sci-libs/pgplot/metadata.xml
+++ b/sci-libs/pgplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   PGPLOT is a Fortran subroutine package for drawing graphs on a variety
   of display devices. The CPGPLOT library adds an intermediate level of
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index f5db23b28dc3..704591038eaa 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   PLplot is a library of functions that are useful for making scientific
   plots. It can be used from within compiled languages such as C, C++,
diff --git a/sci-libs/primegen/metadata.xml b/sci-libs/primegen/metadata.xml
index 9f23340da130..77b8b2143bf3 100644
--- a/sci-libs/primegen/metadata.xml
+++ b/sci-libs/primegen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   primegen is a small, fast library to generate prime numbers in
   order. It generates the 50847534 primes up to 1000000000 in just 8
diff --git a/sci-libs/profnet/metadata.xml b/sci-libs/profnet/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-libs/profnet/metadata.xml
+++ b/sci-libs/profnet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/profphd-utils/metadata.xml b/sci-libs/profphd-utils/metadata.xml
index f17a827e3101..8b0589b27213 100644
--- a/sci-libs/profphd-utils/metadata.xml
+++ b/sci-libs/profphd-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
+  <maintainer>
+    <email>sci-biology@gentoo.org</email>
+    <name>Gentoo Biology Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/proj/metadata.xml b/sci-libs/proj/metadata.xml
index 90bff93b11d9..4e9b86c09360 100644
--- a/sci-libs/proj/metadata.xml
+++ b/sci-libs/proj/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <longdescription>Proj.4 cartograpic projection code for forward and inverse 
 coordinate and projection transformations.</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/punc/metadata.xml b/sci-libs/punc/metadata.xml
index ecf5b7688972..60ded290a6de 100644
--- a/sci-libs/punc/metadata.xml
+++ b/sci-libs/punc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 	PUNC (Portable Understructure for Numerical Computing) is a small standard
 	collection of software libraries for numerical computing. The PUNC
diff --git a/sci-libs/pycifrw/metadata.xml b/sci-libs/pycifrw/metadata.xml
index 24aa81cd2674..afd51eac5537 100644
--- a/sci-libs/pycifrw/metadata.xml
+++ b/sci-libs/pycifrw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">PyCifRW</remote-id>
     <remote-id type="bitbucket">jamesrhester/pycifrw</remote-id>
diff --git a/sci-libs/pymmlib/metadata.xml b/sci-libs/pymmlib/metadata.xml
index 90592c47e80f..c6e2fa847ebf 100644
--- a/sci-libs/pymmlib/metadata.xml
+++ b/sci-libs/pymmlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pymmlib</remote-id>
   </upstream>
diff --git a/sci-libs/qd/metadata.xml b/sci-libs/qd/metadata.xml
index 58f5d57d3cda..e9ee9d170c5a 100644
--- a/sci-libs/qd/metadata.xml
+++ b/sci-libs/qd/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>Quad-double and double-double float arithmetics</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/qfits/metadata.xml b/sci-libs/qfits/metadata.xml
index 1152888bce1f..193dcbb90924 100644
--- a/sci-libs/qfits/metadata.xml
+++ b/sci-libs/qfits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
+<maintainer>
+	<email>sci-astronomy@gentoo.org</email>
+	<name>Gentoo Astronomy Project</name>
+</maintainer>
 <longdescription lang="en">
 qfits is a stand-alone library written in C to interact with files
 complying with the FITS format. It is fast and portable over any kind
diff --git a/sci-libs/qrupdate/metadata.xml b/sci-libs/qrupdate/metadata.xml
index a4214a64f6c8..66d28eaff3b5 100644
--- a/sci-libs/qrupdate/metadata.xml
+++ b/sci-libs/qrupdate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 	qrupdate is a library for fast updating of qr and cholesky decompositions.
 </longdescription>
diff --git a/sci-libs/rosetta-db/metadata.xml b/sci-libs/rosetta-db/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/rosetta-db/metadata.xml
+++ b/sci-libs/rosetta-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/rosetta-fragments/metadata.xml b/sci-libs/rosetta-fragments/metadata.xml
index 51fdedab1b38..0b7eb3b86e21 100644
--- a/sci-libs/rosetta-fragments/metadata.xml
+++ b/sci-libs/rosetta-fragments/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/scalapack/metadata.xml b/sci-libs/scalapack/metadata.xml
index baa3fe76fc17..5aa57cc187c7 100644
--- a/sci-libs/scalapack/metadata.xml
+++ b/sci-libs/scalapack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
   redesigned for distributed memory MIMD parallel computers. It is currently
diff --git a/sci-libs/scikits/metadata.xml b/sci-libs/scikits/metadata.xml
index 6fef9af01ab7..c3872a8b47fb 100644
--- a/sci-libs/scikits/metadata.xml
+++ b/sci-libs/scikits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">Meta package for the scikits. Include a standard example as well.</longdescription>
   <upstream>
     <remote-id type="pypi">scikits.example</remote-id>
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index b9bd04971575..65352f1ea326 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This SciKit (toolkit for SciPy) includes useful image processing
   algorithms for use with Python and NumPy. While SciPy’s ndimage
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index f6f2f71332bc..ec4d547f6b70 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   scikits.learn is a python library for machine learning. It aims to
   implement classic machine learning algorithms while remaining simple
diff --git a/sci-libs/scikits_optimization/metadata.xml b/sci-libs/scikits_optimization/metadata.xml
index e36d27b1bd98..eaa03be8dac6 100644
--- a/sci-libs/scikits_optimization/metadata.xml
+++ b/sci-libs/scikits_optimization/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   A Python module for numerical optimization.
 </longdescription>
diff --git a/sci-libs/scikits_timeseries/metadata.xml b/sci-libs/scikits_timeseries/metadata.xml
index 775e9e167d18..fe1c80aff265 100644
--- a/sci-libs/scikits_timeseries/metadata.xml
+++ b/sci-libs/scikits_timeseries/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   The scikits.timeseries module provides classes and functions for
   manipulating, reporting, and plotting time series of various
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index 7d6606f0d5e3..24a9ede83f88 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   SciPy is an open source library of scientific tools for Python. SciPy
   supplements the popular numpy module, gathering a variety of high level
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index 9101538cfd17..0f39324b2fb6 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>patrick@gentoo.org</email>
   <name>Patrick Lauer</name>
@@ -11,6 +9,14 @@
   <email>oli.borm@web.de</email>
   <name>Oliver Borm</name>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <use>
   <flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
   <flag name="tools">Build and install extra exec tools</flag>
diff --git a/sci-libs/shapelib/metadata.xml b/sci-libs/shapelib/metadata.xml
index 6ecd4996da1e..ac018fe82ba1 100644
--- a/sci-libs/shapelib/metadata.xml
+++ b/sci-libs/shapelib/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<longdescription>Shapelib is for working with ESRI shape files, a format used by the commercial ArcInfo GIS package.</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/shogun/metadata.xml b/sci-libs/shogun/metadata.xml
index d0c30a0c09fb..91e6646ba550 100644
--- a/sci-libs/shogun/metadata.xml
+++ b/sci-libs/shogun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   SHOGUN - is a new machine learning toolbox with focus on large
   scale kernel methods and especially on Support Vector Machines
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
index fa5dbb1c8d8c..17aa1e551512 100644
--- a/sci-libs/silo/metadata.xml
+++ b/sci-libs/silo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
   <longdescription>
     Silo is a library for reading and writing a wide variety of
     scientific data to binary, disk files. The files Silo produces and
@@ -15,4 +14,8 @@
   <maintainer>
     <email>slis@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/spooles/metadata.xml b/sci-libs/spooles/metadata.xml
index 0277d17bfebb..b20916806a9b 100644
--- a/sci-libs/spooles/metadata.xml
+++ b/sci-libs/spooles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   SPOOLES is a library for solving sparse real and complex linear
   systems of equations, written in the C language using object
diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index 0e64edacf696..9958cce50aef 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   SuiteSparseQR is an implementation of the multifrontal sparse QR
   factorization method. Parallelism is exploited both in the BLAS and
diff --git a/sci-libs/spr/metadata.xml b/sci-libs/spr/metadata.xml
index a4c1fdcaaea5..677ca63332b9 100644
--- a/sci-libs/spr/metadata.xml
+++ b/sci-libs/spr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
     The package implements a variety of tools for categorization of
     multivariate data such as boosted decision trees, bagging and
diff --git a/sci-libs/ssm/metadata.xml b/sci-libs/ssm/metadata.xml
index 089c2128c1d7..8a9641ff6a33 100644
--- a/sci-libs/ssm/metadata.xml
+++ b/sci-libs/ssm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="ccp4">Link superpose with libccp4</flag>
   </use>
diff --git a/sci-libs/starparse/metadata.xml b/sci-libs/starparse/metadata.xml
index e5a76f1154dc..c90be1c1d20d 100644
--- a/sci-libs/starparse/metadata.xml
+++ b/sci-libs/starparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">starparse</remote-id>
   </upstream>
diff --git a/sci-libs/suitesparse/metadata.xml b/sci-libs/suitesparse/metadata.xml
index 6b28fdfdb139..87fdb69b91de 100644
--- a/sci-libs/suitesparse/metadata.xml
+++ b/sci-libs/suitesparse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   SuiteSparse is a suite of sparse matrix libraries from University of
   Florida Computer Science Department. Currently, this includes:
diff --git a/sci-libs/suitesparseconfig/metadata.xml b/sci-libs/suitesparseconfig/metadata.xml
index eff9fe58d9d2..6b685715b5f6 100644
--- a/sci-libs/suitesparseconfig/metadata.xml
+++ b/sci-libs/suitesparseconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   SuiteSparse_config is a set of configuration files for the SuiteSparse matrix libraries
   from CISE at University of Florida. It contains some headers and makefiles.
diff --git a/sci-libs/superlu/metadata.xml b/sci-libs/superlu/metadata.xml
index e43161f47979..76cd72703024 100644
--- a/sci-libs/superlu/metadata.xml
+++ b/sci-libs/superlu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   SuperLU is a general purpose library for the direct solution of large,
   sparse, nonsymmetric systems of linear equations on high performance
diff --git a/sci-libs/szip/metadata.xml b/sci-libs/szip/metadata.xml
index a1d93197140d..5863d674177e 100644
--- a/sci-libs/szip/metadata.xml
+++ b/sci-libs/szip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The Consultative Committee on Space Data Systems (CCSDS) has adopted
   the extended-Rice algorithm for international standards for space
diff --git a/sci-libs/tamu_anova/metadata.xml b/sci-libs/tamu_anova/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/tamu_anova/metadata.xml
+++ b/sci-libs/tamu_anova/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/taucs/metadata.xml b/sci-libs/taucs/metadata.xml
index 88936f30d0b8..57112f6b8d23 100644
--- a/sci-libs/taucs/metadata.xml
+++ b/sci-libs/taucs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   TAUCS is a C library of sparse linear solvers.
   The current version of the library (1.0) includes the following
diff --git a/sci-libs/tnt/metadata.xml b/sci-libs/tnt/metadata.xml
index 9ccc7507adaa..8c0dfccbbaed 100644
--- a/sci-libs/tnt/metadata.xml
+++ b/sci-libs/tnt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The Template Numerical Toolkit (TNT) is a collection of interfaces and 
   reference implementations of numerical objects useful for scientific 
diff --git a/sci-libs/torch/metadata.xml b/sci-libs/torch/metadata.xml
index 954994e844ff..0f30f8420f8c 100644
--- a/sci-libs/torch/metadata.xml
+++ b/sci-libs/torch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   Torch is a machine-learning library, written in simple C++.
 </longdescription>
diff --git a/sci-libs/udunits/metadata.xml b/sci-libs/udunits/metadata.xml
index 2a1bd399d6d4..c632a6909c6e 100644
--- a/sci-libs/udunits/metadata.xml
+++ b/sci-libs/udunits/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
   This is the Unidata Units library, which supports conversion of unit
   specifications between formatted and binary forms, arithmetic
diff --git a/sci-libs/ufconfig/metadata.xml b/sci-libs/ufconfig/metadata.xml
index 51caebda07d3..d6c0dc378b4c 100644
--- a/sci-libs/ufconfig/metadata.xml
+++ b/sci-libs/ufconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 UFconfig is a set of configuration files for the SuiteSparse matrix libraries
 from CISE at University of Florida. It contains some headers and
diff --git a/sci-libs/umfpack/metadata.xml b/sci-libs/umfpack/metadata.xml
index 5900c94fd527..62ef0eda90f9 100644
--- a/sci-libs/umfpack/metadata.xml
+++ b/sci-libs/umfpack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   UMFPACK is a set of routines for solving unsymmetric sparse linear
   systems, Ax=b, using the Unsymmetric MultiFrontal method.
diff --git a/sci-libs/vecmath-objectclub/metadata.xml b/sci-libs/vecmath-objectclub/metadata.xml
index a65ad7dedbce..8855fdff0933 100644
--- a/sci-libs/vecmath-objectclub/metadata.xml
+++ b/sci-libs/vecmath-objectclub/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
 <maintainer>
   <email>je_fro@gentoo.org</email>
   <name>Jeff Gardner</name>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   This is unofficial implementation(java source code) of the
   javax.vecmath package specified in the Java(TM) 3D API 1.2
diff --git a/sci-libs/voro++/metadata.xml b/sci-libs/voro++/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/voro++/metadata.xml
+++ b/sci-libs/voro++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 761707b4038b..48b26ee0cb7c 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
 		<remote-id type="github">votca/tools</remote-id>
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index cda9e062450e..e81c2f87a0f5 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>java</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="all-modules">Build all modules</flag>
     <flag name="boost">Add support for boost</flag>
diff --git a/sci-libs/vtkdata/metadata.xml b/sci-libs/vtkdata/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/vtkdata/metadata.xml
+++ b/sci-libs/vtkdata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/xdmf2/metadata.xml b/sci-libs/xdmf2/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/sci-libs/xdmf2/metadata.xml
+++ b/sci-libs/xdmf2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/xdrfile/metadata.xml b/sci-libs/xdrfile/metadata.xml
index b2558d8c6282..ec3e234eaa34 100644
--- a/sci-libs/xdrfile/metadata.xml
+++ b/sci-libs/xdrfile/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/xgks-pmel/metadata.xml b/sci-libs/xgks-pmel/metadata.xml
index 07c81cc7a968..6cbbb67f34c8 100644
--- a/sci-libs/xgks-pmel/metadata.xml
+++ b/sci-libs/xgks-pmel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
 	<longdescription>
 XGKS is a level 2C implementation of the ANSI Graphical Kernel System (GKS) for 
 X-windows, with a C and Fortran interface.  This version has support for PMEL's
diff --git a/sci-libs/xkaapi/metadata.xml b/sci-libs/xkaapi/metadata.xml
index 33958dae42cd..7c826f631978 100644
--- a/sci-libs/xkaapi/metadata.xml
+++ b/sci-libs/xkaapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="blas">Kaapi BLAS tasks for PLASMA</flag>
     <flag name="gpu">Build library for gpu threading</flag>
diff --git a/sci-libs/xylib/metadata.xml b/sci-libs/xylib/metadata.xml
index 1280bae966fe..007f0e7c21c8 100644
--- a/sci-libs/xylib/metadata.xml
+++ b/sci-libs/xylib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   xylib is a portable C++ library for reading files that contain x-y
   data from powder diffraction, spectroscopy or other experimental
diff --git a/sci-mathematics/4ti2/metadata.xml b/sci-mathematics/4ti2/metadata.xml
index 2b81252f2c50..931ff0f3e703 100644
--- a/sci-mathematics/4ti2/metadata.xml
+++ b/sci-mathematics/4ti2/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 4ti2 is a software package for algebraic, geometric and combinatorial problems
 on linear spaces and for toric ideals too.
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index 3513de74db1a..22f6df6962b6 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <use>
     <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
   </use>
diff --git a/sci-mathematics/agda-executable/metadata.xml b/sci-mathematics/agda-executable/metadata.xml
index 58fbc0e32043..86098afb9987 100644
--- a/sci-mathematics/agda-executable/metadata.xml
+++ b/sci-mathematics/agda-executable/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/sci-mathematics/agda-lib-ffi/metadata.xml b/sci-mathematics/agda-lib-ffi/metadata.xml
index 1439b435aad6..daf248d57329 100644
--- a/sci-mathematics/agda-lib-ffi/metadata.xml
+++ b/sci-mathematics/agda-lib-ffi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/sci-mathematics/agda-stdlib/metadata.xml b/sci-mathematics/agda-stdlib/metadata.xml
index 91a8ae913e04..921e9f2bf182 100644
--- a/sci-mathematics/agda-stdlib/metadata.xml
+++ b/sci-mathematics/agda-stdlib/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <herd>haskell</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <maintainer>
+    <email>haskell@gentoo.org</email>
+    <name>Gentoo Haskell</name>
+  </maintainer>
   <longdescription lang="en">
   Agda standard library.
 </longdescription>
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 3be3c516b758..787b555ecae4 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <herd>haskell</herd>
+  <maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+  </maintainer>
+<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+  </maintainer>
 <longdescription lang="en">
   Agda is an interactive proof editor, or proof assistant. Its input language,
   called Agda language (or simply Agda), is based on a constructive type
diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml
index 2b0bd5314823..1dd1b8254a05 100644
--- a/sci-mathematics/axiom/metadata.xml
+++ b/sci-mathematics/axiom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/bertini/metadata.xml b/sci-mathematics/bertini/metadata.xml
index e79bcd17ddc7..cb9a1c3551cb 100644
--- a/sci-mathematics/bertini/metadata.xml
+++ b/sci-mathematics/bertini/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>tomka@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
 Bertini: Software for Numerical Algebraic Geometry
 
diff --git a/sci-mathematics/calc/metadata.xml b/sci-mathematics/calc/metadata.xml
index fc39076901b7..e2a03bb742a4 100644
--- a/sci-mathematics/calc/metadata.xml
+++ b/sci-mathematics/calc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Calc is an interactive calculator which provides for easy large
   numeric calculations, but which also can be easily programmed for
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index aa54a0b5987d..237d1ae3d14e 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Computational Geometry Algorithms Library is a collaborative
   open source library containing:
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 2fbebc05a0d7..1fbb01857394 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>ml@gentoo.org</email>
+    <name>Gentoo ML Project</name>
+  </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Developed in the LogiCal project, the Coq tool is a formal proof
   management system: a proof done with Coq is mechanically checked
diff --git a/sci-mathematics/cvc3/metadata.xml b/sci-mathematics/cvc3/metadata.xml
index 2f5473a5364f..484f9ab43230 100644
--- a/sci-mathematics/cvc3/metadata.xml
+++ b/sci-mathematics/cvc3/metadata.xml
@@ -5,7 +5,10 @@
   <email>gienah@gentoo.org</email>
   <name>Mark Wright</name>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
 CVC3 is an automatic theorem prover for Satisfiability Modulo Theories
 (SMT) problems. It can be used to prove the validity (or, dually, the
diff --git a/sci-mathematics/dataplot/metadata.xml b/sci-mathematics/dataplot/metadata.xml
index 3f98dafdd5f4..2c03c2e55bae 100644
--- a/sci-mathematics/dataplot/metadata.xml
+++ b/sci-mathematics/dataplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Dataplot is a software system for scientific visualization,
   statistical analysis, and non-linear modeling. The target Dataplot
diff --git a/sci-mathematics/diagrtb/metadata.xml b/sci-mathematics/diagrtb/metadata.xml
index 4d895a92e08d..8f69b4232e5b 100644
--- a/sci-mathematics/diagrtb/metadata.xml
+++ b/sci-mathematics/diagrtb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
 	<longdescription>
 A fortran program for the calculation of some eigenvectors of a large real, 
 symmetrical, matrix.
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
index 644b7bab5c8e..26b9837d6ca4 100644
--- a/sci-mathematics/drgeo/metadata.xml
+++ b/sci-mathematics/drgeo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
     Dr. Geo is a GTK2 interactive geometry software. It allows one to
     create geometric figure plus the interactive manipulation of
diff --git a/sci-mathematics/e/metadata.xml b/sci-mathematics/e/metadata.xml
index 775fe11dec03..42b3b7d725c9 100644
--- a/sci-mathematics/e/metadata.xml
+++ b/sci-mathematics/e/metadata.xml
@@ -5,7 +5,10 @@
   <email>gienah@gentoo.org</email>
   <name>Mark Wright</name>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
 E is a theorem prover for full first-order logic with equality. It
 accepts a problem specification, typically consisting of a number of
diff --git a/sci-mathematics/ent/metadata.xml b/sci-mathematics/ent/metadata.xml
index 66aa9fe427ff..e38851b6fa4c 100644
--- a/sci-mathematics/ent/metadata.xml
+++ b/sci-mathematics/ent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/euler/metadata.xml b/sci-mathematics/euler/metadata.xml
index 8e1f11be3629..0ecc85507d3d 100644
--- a/sci-mathematics/euler/metadata.xml
+++ b/sci-mathematics/euler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">euler</remote-id>
 	</upstream>
diff --git a/sci-mathematics/fann/metadata.xml b/sci-mathematics/fann/metadata.xml
index dd80fbec92e6..9f507d29bdde 100644
--- a/sci-mathematics/fann/metadata.xml
+++ b/sci-mathematics/fann/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
     Fast Artificial Neural Network Library implements multilayer artificial
     neural networks in C with support for both fully connected and sparsely
diff --git a/sci-mathematics/form/metadata.xml b/sci-mathematics/form/metadata.xml
index 05d73a9db6bb..e646335cae91 100644
--- a/sci-mathematics/form/metadata.xml
+++ b/sci-mathematics/form/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 A system which can efficiently manipulate huge formulas limited only by available disk space.
 </longdescription>
diff --git a/sci-mathematics/freemat/metadata.xml b/sci-mathematics/freemat/metadata.xml
index 380a6559bf46..38edfbfa2ae3 100644
--- a/sci-mathematics/freemat/metadata.xml
+++ b/sci-mathematics/freemat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   FreeMat is an open sources environment for rapid engineering and
   scientific prototyping and data processing. It is similar to
diff --git a/sci-mathematics/fricas/metadata.xml b/sci-mathematics/fricas/metadata.xml
index f10acfb41f9b..a92293e22232 100644
--- a/sci-mathematics/fricas/metadata.xml
+++ b/sci-mathematics/fricas/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 FriCAS is a fork of Axiom computer algebra system.
 </longdescription>
diff --git a/sci-mathematics/frobby/metadata.xml b/sci-mathematics/frobby/metadata.xml
index 4e93bbb7622c..76e4751307d7 100644
--- a/sci-mathematics/frobby/metadata.xml
+++ b/sci-mathematics/frobby/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tomka@gentoo.org</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Frobby is a software system and library for computations with monomial ideals. 
 </longdescription>
diff --git a/sci-mathematics/genius/metadata.xml b/sci-mathematics/genius/metadata.xml
index 6260aca8ea54..ca9107fdf6ab 100644
--- a/sci-mathematics/genius/metadata.xml
+++ b/sci-mathematics/genius/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>Genius is a calculator program which can work
 	  with arbitrary precision integers, multiple precision floats,
 	  rational numbers, complex numbers, linear algebra, number theory,
diff --git a/sci-mathematics/geomview/metadata.xml b/sci-mathematics/geomview/metadata.xml
index 3094fb6de487..5d06cf1d0277 100644
--- a/sci-mathematics/geomview/metadata.xml
+++ b/sci-mathematics/geomview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription>Geomview is an interactive geometry viewer and Object Oriented Graphics Library (OOGL).</longdescription>
 	<use>
 		<flag name="motionaveraging">Enable experimental motion averaging technique</flag>
diff --git a/sci-mathematics/gfan/metadata.xml b/sci-mathematics/gfan/metadata.xml
index 9c8024fff3cc..d03dd72fbc6a 100644
--- a/sci-mathematics/gfan/metadata.xml
+++ b/sci-mathematics/gfan/metadata.xml
@@ -5,8 +5,11 @@
   <email>tomka@gentoo.org</email>
   <name>Thomas Kahle</name>
 </maintainer>
-<herd>sci-mathematics</herd>
- <longdescription lang="en">
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+ </maintainer>
+<longdescription lang="en">
   gfan is a computer algebra tool to compute Groebner fans and tropical varieties.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/gimps/metadata.xml b/sci-mathematics/gimps/metadata.xml
index 81018d3a8353..b6288ad7103c 100644
--- a/sci-mathematics/gimps/metadata.xml
+++ b/sci-mathematics/gimps/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
+<maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/ginac/metadata.xml b/sci-mathematics/ginac/metadata.xml
index 307010c65aa3..718e335c89c2 100644
--- a/sci-mathematics/ginac/metadata.xml
+++ b/sci-mathematics/ginac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   GiNaC is an iterated and recursive acronym for GiNaC is Not a CAS,
   where CAS stands for Computer Algebra System. It is designed to allow
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index f58fdc6b640e..494397cc47b8 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   The GNU Linear Programming Kit package is intended for solving
   large-scale linear programming (LP), mixed integer programming
diff --git a/sci-mathematics/gretl/metadata.xml b/sci-mathematics/gretl/metadata.xml
index 98532cfda4e3..cdb090d42669 100644
--- a/sci-mathematics/gretl/metadata.xml
+++ b/sci-mathematics/gretl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   GNU Regression, Econometrics and Time-series Library provides
   a library which comprises various functions relating to econometric
diff --git a/sci-mathematics/gsl-shell/metadata.xml b/sci-mathematics/gsl-shell/metadata.xml
index d56d122c63c6..bc56359ee677 100644
--- a/sci-mathematics/gsl-shell/metadata.xml
+++ b/sci-mathematics/gsl-shell/metadata.xml
@@ -5,7 +5,10 @@
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 GSL shell offers an interactive command-line interface
 that gives access to GSL collection of mathematical functions.
diff --git a/sci-mathematics/isabelle/metadata.xml b/sci-mathematics/isabelle/metadata.xml
index 986ebca59252..b357ed34b89a 100644
--- a/sci-mathematics/isabelle/metadata.xml
+++ b/sci-mathematics/isabelle/metadata.xml
@@ -4,7 +4,10 @@
 <maintainer>
   <email>gienah@gentoo.org</email>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
 Isabelle is a generic proof assistant. It allows mathematical
 formulas to be expressed in a formal language and provides tools
diff --git a/sci-mathematics/jags/metadata.xml b/sci-mathematics/jags/metadata.xml
index 9a890cc0f1cc..f49a787d8e18 100644
--- a/sci-mathematics/jags/metadata.xml
+++ b/sci-mathematics/jags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   JAGS is Just Another Gibbs Sampler. It is a program for analysis of
   Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC)
diff --git a/sci-mathematics/kodkod/metadata.xml b/sci-mathematics/kodkod/metadata.xml
index ff1b15318b9c..77f4a8a03d3c 100644
--- a/sci-mathematics/kodkod/metadata.xml
+++ b/sci-mathematics/kodkod/metadata.xml
@@ -4,7 +4,10 @@
   <maintainer>
     <email>gienah@gentoo.org</email>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 Kodkod is an efficient SAT-based constraint solver for first order
 logic with relations, transitive closure, bit-vector arithmetic, and
diff --git a/sci-mathematics/kodkodi/metadata.xml b/sci-mathematics/kodkodi/metadata.xml
index 4ad0f7751ab1..b5df56cec90f 100644
--- a/sci-mathematics/kodkodi/metadata.xml
+++ b/sci-mathematics/kodkodi/metadata.xml
@@ -5,7 +5,10 @@
   <email>gienah@gentoo.org</email>
   <name>Mark Wright</name>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
 A text front-end for the Kodkod Java library.
 </longdescription>
diff --git a/sci-mathematics/lpsolve/metadata.xml b/sci-mathematics/lpsolve/metadata.xml
index c295c6a43ee8..97951bf419e9 100644
--- a/sci-mathematics/lpsolve/metadata.xml
+++ b/sci-mathematics/lpsolve/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lpsolve</remote-id>
 	</upstream>
diff --git a/sci-mathematics/lybniz/metadata.xml b/sci-mathematics/lybniz/metadata.xml
index 449ff735d563..8b2e9f7bf495 100644
--- a/sci-mathematics/lybniz/metadata.xml
+++ b/sci-mathematics/lybniz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Lybniz is an easy to use mathematical function graph plotter using
   PyGTK.
diff --git a/sci-mathematics/mathomatic/metadata.xml b/sci-mathematics/mathomatic/metadata.xml
index 40d859436f67..d8211781e2c0 100644
--- a/sci-mathematics/mathomatic/metadata.xml
+++ b/sci-mathematics/mathomatic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription>
     Mathomatic is a small, portable symbolic math program that can
     automatically solve, simplify, differentiate, combine, and compare
diff --git a/sci-mathematics/maxima/metadata.xml b/sci-mathematics/maxima/metadata.xml
index bf57b7ffa334..509d8ee022ce 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Computer Algebra system, descendent of Macsyma.
   Maxima is a system for the manipulation of symbolic and 
diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 92faa4ea37c6..6b9c9432bfa2 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+<email>sci@gentoo.org</email>
+<name>Gentoo Science Project</name>
+</maintainer>
 <use>
 <flag name="extended-solver">Build extended version of SAT solver with
  additional features.</flag>
diff --git a/sci-mathematics/mlpy/metadata.xml b/sci-mathematics/mlpy/metadata.xml
index 253b13795de2..d7ff97481d30 100644
--- a/sci-mathematics/mlpy/metadata.xml
+++ b/sci-mathematics/mlpy/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>dberkholz@gentoo.org</email>
     <name>Donnie Berkholz</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   mlpy provides a wide range of state-of-the-art machine learning
   methods for supervised and unsupervised problems and it is aimed at
diff --git a/sci-mathematics/nauty/metadata.xml b/sci-mathematics/nauty/metadata.xml
index 186d7a91db3c..3318fc12b8dd 100644
--- a/sci-mathematics/nauty/metadata.xml
+++ b/sci-mathematics/nauty/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 nauty is a program for computing automorphism groups of graphs and digraphs. It can also produce a
 canonical labelling.
diff --git a/sci-mathematics/nestedsums/metadata.xml b/sci-mathematics/nestedsums/metadata.xml
index 9f85bfb1b277..4ab060cca977 100644
--- a/sci-mathematics/nestedsums/metadata.xml
+++ b/sci-mathematics/nestedsums/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
 <maintainer>
   <email>grozin@gentoo.org</email>
   <name>Andrey Grozin</name>
 </maintainer>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
 A GiNaC-based library for symbolic expansion of certain transcendental functions.
 </longdescription>
diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
index 6b793e001efd..844414799c35 100644
--- a/sci-mathematics/normaliz/metadata.xml
+++ b/sci-mathematics/normaliz/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <use>
     <flag name="extras"> Install <pkg>sci-mathematics/Macaulay2</pkg> and <pkg>sci-mathematics/singular</pkg> 
 	packages as shipped by upstream</flag>
diff --git a/sci-mathematics/num-utils/metadata.xml b/sci-mathematics/num-utils/metadata.xml
index 2b0bd5314823..1dd1b8254a05 100644
--- a/sci-mathematics/num-utils/metadata.xml
+++ b/sci-mathematics/num-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/nusmv/metadata.xml b/sci-mathematics/nusmv/metadata.xml
index da589122a2f5..0664e5765618 100644
--- a/sci-mathematics/nusmv/metadata.xml
+++ b/sci-mathematics/nusmv/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<use>
 		<flag name="minisat">Enable support for MiniSat</flag>
 	</use>
diff --git a/sci-mathematics/octave-epstk/metadata.xml b/sci-mathematics/octave-epstk/metadata.xml
index ca8760727097..2876f12c790c 100644
--- a/sci-mathematics/octave-epstk/metadata.xml
+++ b/sci-mathematics/octave-epstk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   The epsTk package provides, via a set of functions for octave, a
   toolkit to create powerful encapsulated postscript (.eps) graphs. Most 2D
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index b135f553475f..28ad1c557a69 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Octave is a high-level language, primarily intended for numerical
   computations.  It provides a convenient command line interface for
diff --git a/sci-mathematics/otter/metadata.xml b/sci-mathematics/otter/metadata.xml
index d369d068ffb8..3317f1673908 100644
--- a/sci-mathematics/otter/metadata.xml
+++ b/sci-mathematics/otter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/p9m4/metadata.xml b/sci-mathematics/p9m4/metadata.xml
index fca084776b1f..0a189139b5de 100644
--- a/sci-mathematics/p9m4/metadata.xml
+++ b/sci-mathematics/p9m4/metadata.xml
@@ -4,7 +4,10 @@
 <maintainer>
   <email>gienah@gentoo.org</email>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   This is a Graphical User Interface for Prover9 and Mace4.
   Prover9 is an automated theorem prover for first-order and
diff --git a/sci-mathematics/pari-data/metadata.xml b/sci-mathematics/pari-data/metadata.xml
index 05b8117db0af..250d90b54f9a 100644
--- a/sci-mathematics/pari-data/metadata.xml
+++ b/sci-mathematics/pari-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   The extra data for PARI consists of:
   * elldata is PARI/GP version of J. E. Cremona Elliptic Curve Data,
diff --git a/sci-mathematics/pari/metadata.xml b/sci-mathematics/pari/metadata.xml
index 3f62c7c76948..da72bbd3e16d 100644
--- a/sci-mathematics/pari/metadata.xml
+++ b/sci-mathematics/pari/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   PARI is a widely used computer algebra system designed for fast
   computations in number theory (factorizations, algebraic number
diff --git a/sci-mathematics/polymake/metadata.xml b/sci-mathematics/polymake/metadata.xml
index 2e7b4a5deb47..4fd1b00e7caf 100644
--- a/sci-mathematics/polymake/metadata.xml
+++ b/sci-mathematics/polymake/metadata.xml
@@ -5,7 +5,10 @@
 <email>tomka@gentoo.org</email>
 <name>Thomas Kahle</name>
 </maintainer>
-<herd>sci-mathematics</herd>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <use>
   <flag name="cdd">Enable sci-libs/cddlib interface for convex hull
   computations (Should be kept enabled).</flag>
diff --git a/sci-mathematics/prng/metadata.xml b/sci-mathematics/prng/metadata.xml
index 49b2825cfbec..f8e3d6e5a313 100644
--- a/sci-mathematics/prng/metadata.xml
+++ b/sci-mathematics/prng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   The Pseudo-Random Number Generator library is a portable,
   high-performance ANSI-C implementations of pseudorandom number
diff --git a/sci-mathematics/prover9/metadata.xml b/sci-mathematics/prover9/metadata.xml
index 719fd32dcf90..7db1243cb175 100644
--- a/sci-mathematics/prover9/metadata.xml
+++ b/sci-mathematics/prover9/metadata.xml
@@ -5,7 +5,10 @@
     <email>gienah@gentoo.org</email>
     <name>Mark Wright</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Prover9 and Mace4 Prover9 is an automated theorem prover for
   first-order and equational logic, and Mace4 searches for finite
diff --git a/sci-mathematics/pspp/metadata.xml b/sci-mathematics/pspp/metadata.xml
index d62366a4d9b2..aabedf6497b6 100644
--- a/sci-mathematics/pspp/metadata.xml
+++ b/sci-mathematics/pspp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   PSPP is a program for statistical analysis of sampled data. It
   interprets commands in the SPSS language and produces tabular and
diff --git a/sci-mathematics/qtoctave/metadata.xml b/sci-mathematics/qtoctave/metadata.xml
index e6e60964f914..9e49a4de8601 100644
--- a/sci-mathematics/qtoctave/metadata.xml
+++ b/sci-mathematics/qtoctave/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+<maintainer>
+	<email>sci-mathematics@gentoo.org</email>
+	<name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Besides offering an attractive front-end to GNU Octave, an
   environment for numerical computation highly compatible with MATLAB,
diff --git a/sci-mathematics/reduce/metadata.xml b/sci-mathematics/reduce/metadata.xml
index 2a54944facce..f996d147ac03 100644
--- a/sci-mathematics/reduce/metadata.xml
+++ b/sci-mathematics/reduce/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 A general-purpose computer algebra system.
 Powerful, mature and efficient.
diff --git a/sci-mathematics/relational/metadata.xml b/sci-mathematics/relational/metadata.xml
index 76975b5fa135..d5286874af2d 100644
--- a/sci-mathematics/relational/metadata.xml
+++ b/sci-mathematics/relational/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/rkward/metadata.xml b/sci-mathematics/rkward/metadata.xml
index c63c29a5b639..4be6d6be0b1b 100644
--- a/sci-mathematics/rkward/metadata.xml
+++ b/sci-mathematics/rkward/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 RKWard aims to become an easy to use frontend to R. RKWard is still in
 development status. Right now it is most useful as an IDE to users
diff --git a/sci-mathematics/rngstreams/metadata.xml b/sci-mathematics/rngstreams/metadata.xml
index f2f1196ee510..ec2296833145 100644
--- a/sci-mathematics/rngstreams/metadata.xml
+++ b/sci-mathematics/rngstreams/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   RngStreams is a C implementation of a high quality uniform random
   number generator that supports multiple "independent" streams of
diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
index 6d7ddb62d92b..d1f6c1511f6e 100644
--- a/sci-mathematics/rw/metadata.xml
+++ b/sci-mathematics/rw/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <herd>sci</herd>
-
   <maintainer>
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
@@ -14,6 +11,16 @@
     <name>François Bissey</name>
   </maintainer>
 
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+
   <longdescription lang="en">
     rw is a program that calculates rank-width and rank-decompositions.
     It is based on ideas from "Computing rank-width exactly" by Sang-il Oum,
diff --git a/sci-mathematics/sha1-polyml/metadata.xml b/sci-mathematics/sha1-polyml/metadata.xml
index 50a414f56b23..dc2f4dc370ac 100644
--- a/sci-mathematics/sha1-polyml/metadata.xml
+++ b/sci-mathematics/sha1-polyml/metadata.xml
@@ -5,7 +5,10 @@
     <email>gienah@gentoo.org</email>
     <name>Mark Wright</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 sci-mathematics/sha1-polyml is the implementation of SHA1 taken from
 the GNU coreutils package as described in the sci-mathematics/sha1-polyml
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 2a047b6737c1..ff08909b7c94 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -5,7 +5,10 @@
     <email>tomka@gentoo.org</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <use>
     <flag name="boost">Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag>
   </use>
diff --git a/sci-mathematics/snns/metadata.xml b/sci-mathematics/snns/metadata.xml
index 6dbaed3b90fc..05bcb19539b5 100644
--- a/sci-mathematics/snns/metadata.xml
+++ b/sci-mathematics/snns/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
 	<maintainer>
 		<email>axs@gentoo.org</email>
 		<name>Ian Stakenvicius</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">snns</remote-id>
 	</upstream>
diff --git a/sci-mathematics/spass/metadata.xml b/sci-mathematics/spass/metadata.xml
index c836a3b70c4d..783dd804c3e8 100644
--- a/sci-mathematics/spass/metadata.xml
+++ b/sci-mathematics/spass/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>gienah@gentoo.org</email>
 	</maintainer>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
 SPASS: An Automated Theorem Prover for First-Order Logic with Equality.
 </longdescription>
diff --git a/sci-mathematics/topcom/metadata.xml b/sci-mathematics/topcom/metadata.xml
index 623d96beb1cf..db767e431fc9 100644
--- a/sci-mathematics/topcom/metadata.xml
+++ b/sci-mathematics/topcom/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tomka@gentoo.org</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 TOPCOM is a package for computing Triangulations Of Point Configurations and Oriented Matroids
 </longdescription>
diff --git a/sci-mathematics/unuran/metadata.xml b/sci-mathematics/unuran/metadata.xml
index 2901b3b649b9..03d396bf115a 100644
--- a/sci-mathematics/unuran/metadata.xml
+++ b/sci-mathematics/unuran/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   UNU.RAN  is an ANSI C library licensed under GPL. 
   It contains universal (also called automatic or black-box) algorithms
diff --git a/sci-mathematics/wxmaxima/metadata.xml b/sci-mathematics/wxmaxima/metadata.xml
index 60b646350479..fba905590e05 100644
--- a/sci-mathematics/wxmaxima/metadata.xml
+++ b/sci-mathematics/wxmaxima/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
 wxMaxima is a wxWidgets GUI for the computer algebra system maxima.
 Most of maxima functions are accessible through menus, some have
diff --git a/sci-mathematics/xmds/metadata.xml b/sci-mathematics/xmds/metadata.xml
index 607ce9407204..7bd67e2eaf8a 100644
--- a/sci-mathematics/xmds/metadata.xml
+++ b/sci-mathematics/xmds/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>tomka@gentoo.org</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 XMDS is a code generator that integrates differential equations (ODEs, PDEs and
 SDEs are all supported).  The system of equations to be integrated is specified
diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index f234ff99442e..ee46eba4bc44 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Yacas (Yet Another Computer Algebra System) is a small and highly
   flexible general-purpose computer algebra language. The syntax uses a
diff --git a/sci-misc/apertium/metadata.xml b/sci-misc/apertium/metadata.xml
index 4b8ef8827ae3..7ec1b0fd97fc 100644
--- a/sci-misc/apertium/metadata.xml
+++ b/sci-misc/apertium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Apertium is an open-source shallow-transfer machine translation
   engine and toolbox.
diff --git a/sci-misc/boinc/metadata.xml b/sci-misc/boinc/metadata.xml
index 587dfa1190b9..6a5978bfb3f1 100644
--- a/sci-misc/boinc/metadata.xml
+++ b/sci-misc/boinc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   BOINC (Berkeley Open Infrastructure for Network Computing) is a software
   platform for distributed computing using volunteered computer resources.
diff --git a/sci-misc/fitsverify/metadata.xml b/sci-misc/fitsverify/metadata.xml
index ea6495c9302c..142e237bfff9 100644
--- a/sci-misc/fitsverify/metadata.xml
+++ b/sci-misc/fitsverify/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   fitsverify is a computer program that rigorously checks whether a
   FITS format data file conforms to all the requirements defined in
diff --git a/sci-misc/flashdot/metadata.xml b/sci-misc/flashdot/metadata.xml
index dfc0a9a765e1..28cffd20550b 100644
--- a/sci-misc/flashdot/metadata.xml
+++ b/sci-misc/flashdot/metadata.xml
@@ -5,7 +5,10 @@
 		<email>tomka@gentoo.org</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal
 precision.
diff --git a/sci-misc/gato/metadata.xml b/sci-misc/gato/metadata.xml
index bc70ae41110c..5bf977748d08 100644
--- a/sci-misc/gato/metadata.xml
+++ b/sci-misc/gato/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Gato - the Graph Animation Toolbox - is a software which visualizes
   algorithms on mathematical graphs.
diff --git a/sci-misc/gt-itm/metadata.xml b/sci-misc/gt-itm/metadata.xml
index b229aec85b8f..f7bb205b238d 100644
--- a/sci-misc/gt-itm/metadata.xml
+++ b/sci-misc/gt-itm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-misc/h5utils/metadata.xml b/sci-misc/h5utils/metadata.xml
index 3b1e1069c1a3..08ebb7af1e8c 100644
--- a/sci-misc/h5utils/metadata.xml
+++ b/sci-misc/h5utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   h5utils is a set of utilities for visualization and conversion of
   scientific data in the free, portable HDF5 format.
diff --git a/sci-misc/lttoolbox/metadata.xml b/sci-misc/lttoolbox/metadata.xml
index 052d44463a30..6eaec2be8f50 100644
--- a/sci-misc/lttoolbox/metadata.xml
+++ b/sci-misc/lttoolbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   lttoolbox is a toolbox for lexical processing, morphological analysis and
   generation of words
diff --git a/sci-misc/nco/metadata.xml b/sci-misc/nco/metadata.xml
index d3f07d7282f0..860f5f311c08 100644
--- a/sci-misc/nco/metadata.xml
+++ b/sci-misc/nco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Command-line operators to analyze netCDF files
   NetCDF Operator is a suite of programs known as operators. The
diff --git a/sci-misc/ncview/metadata.xml b/sci-misc/ncview/metadata.xml
index a4c406ecfd48..88e9c42e1cb3 100644
--- a/sci-misc/ncview/metadata.xml
+++ b/sci-misc/ncview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Ncview is a visual browser for netCDF format files.  Typically you
   would use ncview to get a quick push-button look at your netCDF
diff --git a/sci-misc/oww/metadata.xml b/sci-misc/oww/metadata.xml
index 40818b6aa6b4..a025ad95e8d0 100644
--- a/sci-misc/oww/metadata.xml
+++ b/sci-misc/oww/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">oww</remote-id>
   </upstream>
diff --git a/sci-misc/vitables/metadata.xml b/sci-misc/vitables/metadata.xml
index 12cad61721d7..c2dfd86e9343 100644
--- a/sci-misc/vitables/metadata.xml
+++ b/sci-misc/vitables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>
   ViTables is a component of the PyTables family. It is a GUI for
   browsing and editing files in both PyTables and HDF5 formats. It is
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 6c25c6b5e58a..c00261b49ca5 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Bullet is a professional open source multi-threaded 
   3D Collision Detection and Rigid Body Dynamics Library
diff --git a/sci-physics/cernlib-montecarlo/metadata.xml b/sci-physics/cernlib-montecarlo/metadata.xml
index 3c0279be07c7..73386a7fa26f 100644
--- a/sci-physics/cernlib-montecarlo/metadata.xml
+++ b/sci-physics/cernlib-montecarlo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   This metapackage provides various Monte Carlo libraries included in
   Cernlib (both shared and static). Likely only physicists will be
diff --git a/sci-physics/cernlib/metadata.xml b/sci-physics/cernlib/metadata.xml
index 9db83d0ca7a4..e0f15d84e2e7 100644
--- a/sci-physics/cernlib/metadata.xml
+++ b/sci-physics/cernlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   The CERN Program Library is a large collection of general purpose
   libraries and modules maintained and offered in both source and
diff --git a/sci-physics/clhep/metadata.xml b/sci-physics/clhep/metadata.xml
index cc9e48460d31..d8d6a63f8387 100644
--- a/sci-physics/clhep/metadata.xml
+++ b/sci-physics/clhep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   A Class Library for High Energy Physics is intended to be a set of
   HEP-specific foundation and utility classes such as random
diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index 35cad878fd2e..464c46b65a45 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">espressopp/espressopp</remote-id>
 	</upstream>
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 1ef3470bdd04..eb7c29dde12f 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <use>
     <flag name="cuda">Enable cuda support</flag>
     <flag name="examples">Installs the examples</flag>
diff --git a/sci-physics/fastjet/metadata.xml b/sci-physics/fastjet/metadata.xml
index 21ba005f8078..03e4201045e4 100644
--- a/sci-physics/fastjet/metadata.xml
+++ b/sci-physics/fastjet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   The FastJet package provides a fast implementation of the
   longitudinally invariant kt longitudinally invariant inclusive
diff --git a/sci-physics/geant-data/metadata.xml b/sci-physics/geant-data/metadata.xml
index da64a592e0ee..b0970e488a60 100644
--- a/sci-physics/geant-data/metadata.xml
+++ b/sci-physics/geant-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   For specific, optional physics processes, Geant4 uses extra data
   which are being installed with this package.
diff --git a/sci-physics/geant-python/metadata.xml b/sci-physics/geant-python/metadata.xml
index 182d59e5d7a2..143a9a07a117 100644
--- a/sci-physics/geant-python/metadata.xml
+++ b/sci-physics/geant-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   Python binding to Geant 4.
 </longdescription>
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index ca29ad63b253..45119a581456 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Geant simulates the passage of subatomic particles through matter, for
   instance, particle detectors. Geant 3 simulations are performed by
diff --git a/sci-physics/harminv/metadata.xml b/sci-physics/harminv/metadata.xml
index 1d4bdde16401..828f49ed978f 100644
--- a/sci-physics/harminv/metadata.xml
+++ b/sci-physics/harminv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Harminv is a program to solve the problem of harmonic inversion,
   given a discrete-time, finite-length signal that consists of a sum of
diff --git a/sci-physics/hepmc/metadata.xml b/sci-physics/hepmc/metadata.xml
index 8b0128afb9b5..618f1edf350f 100644
--- a/sci-physics/hepmc/metadata.xml
+++ b/sci-physics/hepmc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   The HepMC package is an object oriented event record written in C++
   for High Energy Physics Monte Carlo Generators. Many extensions from
diff --git a/sci-physics/heppdt/metadata.xml b/sci-physics/heppdt/metadata.xml
index 89a8cc95903e..52fd5803b6d6 100644
--- a/sci-physics/heppdt/metadata.xml
+++ b/sci-physics/heppdt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   HepPDT contains the fixed data about each particle type. In other
   words, it contains the data that can be found in the Review of
diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index 708013510a25..5e96f705e8fe 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription>
   Herwig++ is a completely new event generator, written in C++.
   It is built on the experience gained with the well-known
diff --git a/sci-physics/herwig/metadata.xml b/sci-physics/herwig/metadata.xml
index b7bdf4825b68..03dcd799742a 100644
--- a/sci-physics/herwig/metadata.xml
+++ b/sci-physics/herwig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   HERWIG is a Monte Carlo package for simulating Hadron Emission
   Reactions With Interfering Gluons.
diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
index ace26cbf8399..2e63f4625231 100644
--- a/sci-physics/hoomd-blue/metadata.xml
+++ b/sci-physics/hoomd-blue/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <use>
     <flag name="cuda">Enable cuda non-bonded kernels</flag>
   </use>
diff --git a/sci-physics/jaxodraw/metadata.xml b/sci-physics/jaxodraw/metadata.xml
index 8a6842dea3b6..f863cf4846eb 100644
--- a/sci-physics/jaxodraw/metadata.xml
+++ b/sci-physics/jaxodraw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jaxodraw</remote-id>
 	</upstream>
diff --git a/sci-physics/lammps/metadata.xml b/sci-physics/lammps/metadata.xml
index bd12f29ae375..beb967f76aff 100644
--- a/sci-physics/lammps/metadata.xml
+++ b/sci-physics/lammps/metadata.xml
@@ -20,9 +20,12 @@
 			call instead of malloc() when large chunks or memory are allocated
 			by LAMMPS. Aliengnment is on 16 byte boundaries.</flag>
   </use>
-  <herd>sci-physics</herd>
   <maintainer>
     <email>nicolasbock@gentoo.org</email>
 	<name>Nicolas Bock</name>
   </maintainer>
+<maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-physics/lhapdf/metadata.xml b/sci-physics/lhapdf/metadata.xml
index 52920e3e368e..3acd68bea656 100644
--- a/sci-physics/lhapdf/metadata.xml
+++ b/sci-physics/lhapdf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   Les Houches Parton Density Function (LHAPDF)
   provides a unified and easy to use interface to modern PDF
diff --git a/sci-physics/lightspeed/metadata.xml b/sci-physics/lightspeed/metadata.xml
index bbdc6a250095..2d919f2910cc 100644
--- a/sci-physics/lightspeed/metadata.xml
+++ b/sci-physics/lightspeed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Light Speed! is an OpenGL-based program developed to illustrate the
   effects of special relativity on the appearance of moving
diff --git a/sci-physics/looptools/metadata.xml b/sci-physics/looptools/metadata.xml
index 12b8dbc392c8..36e87f733587 100644
--- a/sci-physics/looptools/metadata.xml
+++ b/sci-physics/looptools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription>
   A package for evaluation of scalar and tensor one-loop integrals 
   based on the FF package by G.J. van Oldenborgh.
diff --git a/sci-physics/meep/metadata.xml b/sci-physics/meep/metadata.xml
index 867251312e30..a2226ba629a3 100644
--- a/sci-physics/meep/metadata.xml
+++ b/sci-physics/meep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   The MIT Electromagnetic Equation Propagation (MEEP) is a
   finite-difference time-domain (FDTD) simulation software package
diff --git a/sci-physics/mpb/metadata.xml b/sci-physics/mpb/metadata.xml
index 1b9dacc2cdfa..18dd78c7e3e0 100644
--- a/sci-physics/mpb/metadata.xml
+++ b/sci-physics/mpb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   The MIT Photonic-Bands (MPB) package is a program for computing
   the band structures (dispersion relations) and electromagnetic modes of
diff --git a/sci-physics/paw/metadata.xml b/sci-physics/paw/metadata.xml
index 9450758ff229..25c1501f5ff0 100644
--- a/sci-physics/paw/metadata.xml
+++ b/sci-physics/paw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   PAW is an interactive program providing interactive graphical
   presentation and statistical and mathematical analysis tools. It is
diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
index a0a2a6ec97b9..0baeadbc595d 100644
--- a/sci-physics/pythia/metadata.xml
+++ b/sci-physics/pythia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   PYTHIA is a program for the generation of high-energy physics
   events, i.e. for the description of collisions at high energies
diff --git a/sci-physics/reduze/metadata.xml b/sci-physics/reduze/metadata.xml
index ae17f7db132d..e855657106e9 100644
--- a/sci-physics/reduze/metadata.xml
+++ b/sci-physics/reduze/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
 <maintainer>
   <email>grozin@gentoo.org</email>
   <name>Andrey Grozin</name>
 </maintainer>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   A program for reducing Feynman integrals
 </longdescription>
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
index 306be1ac5d04..2c58e145f1f1 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription>
   The Rivet project (Robust Independent Validation of Experiment and
   Theory) is a toolkit for validation of Monte Carlo event
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index d8e9e6fa2227..415aed6892d2 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -5,7 +5,10 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
diff --git a/sci-physics/siscone/metadata.xml b/sci-physics/siscone/metadata.xml
index eeceb52716c5..f735d9fc46e0 100644
--- a/sci-physics/siscone/metadata.xml
+++ b/sci-physics/siscone/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   SISCone implements a seedless infrared (IR) safe cone jet algorithm, it takes
   N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 35a029dea9d2..509082040465 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
 <maintainer>
   <email>jauhien@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription>
   Toolkit for High Energy Physics Event Generation.
   ThePEG has been broken out from the PYTHIA7 program
diff --git a/sci-physics/xfoil/metadata.xml b/sci-physics/xfoil/metadata.xml
index c6130c99cea3..c7dc6be06442 100644
--- a/sci-physics/xfoil/metadata.xml
+++ b/sci-physics/xfoil/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
 	<longdescription lang="en">
   XFOIL is an interactive program for the design and analysis of subsonic isolated airfoils.
   It consists of a collection of menu-driven routines which perform various useful functions such as:
diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml
index 04e893cde1f3..2c2edbc687f9 100644
--- a/sci-physics/yoda/metadata.xml
+++ b/sci-physics/yoda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription>
   Yet more Objects for Data Analysis is a small set of data analysis
   (specifically histogramming) classes being developed by MCnet
diff --git a/sci-visualization/circos/metadata.xml b/sci-visualization/circos/metadata.xml
index 97aca918f628..8d22f77ddd41 100644
--- a/sci-visualization/circos/metadata.xml
+++ b/sci-visualization/circos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
+<maintainer>
+	<email>sci-biology@gentoo.org</email>
+	<name>Gentoo Biology Project</name>
+</maintainer>
 <longdescription>
   Circos visualizes data in a circular layout — this makes Circos
   ideal for exploring relationships between objects or
diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml
index 1e8d734a8d9f..b97149fd1caa 100644
--- a/sci-visualization/epix/metadata.xml
+++ b/sci-visualization/epix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   ePiX creates mathematically accurate figures, plots, and
   movies using easy-to-learn syntax. The output is expressly suitable
diff --git a/sci-visualization/extrema/metadata.xml b/sci-visualization/extrema/metadata.xml
index 56acf5b51a05..f3c3b32b4eca 100644
--- a/sci-visualization/extrema/metadata.xml
+++ b/sci-visualization/extrema/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   Extrema is a powerful visualization and data analysis tool that
   enables researchers to quickly distill their large, complex data sets
diff --git a/sci-visualization/fig2sxd/metadata.xml b/sci-visualization/fig2sxd/metadata.xml
index 95ebf7ed3d76..d41d1c98f45a 100644
--- a/sci-visualization/fig2sxd/metadata.xml
+++ b/sci-visualization/fig2sxd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   This program converts a file in XFig format into a .sxd file for
   OpenOffice.org Draw.
diff --git a/sci-visualization/fityk/metadata.xml b/sci-visualization/fityk/metadata.xml
index 46f8f9cf5dfd..8f66e55dab07 100644
--- a/sci-visualization/fityk/metadata.xml
+++ b/sci-visualization/fityk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Fityk is a program for nonlinear fitting of analytical functions
   (especially peak-shaped) to data. It can also be used to display
diff --git a/sci-visualization/g3data/metadata.xml b/sci-visualization/g3data/metadata.xml
index a6da46e24f5b..80f103dd7642 100644
--- a/sci-visualization/g3data/metadata.xml
+++ b/sci-visualization/g3data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   g3data is used for extracting data from graphs. In publications graphs are
   often included, but the actual data is not. g3data makes the extraction
diff --git a/sci-visualization/gcalc/metadata.xml b/sci-visualization/gcalc/metadata.xml
index 7c075e6e4efa..93fe5fbc8b95 100644
--- a/sci-visualization/gcalc/metadata.xml
+++ b/sci-visualization/gcalc/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>sci</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sci-visualization/gfsview/metadata.xml b/sci-visualization/gfsview/metadata.xml
index af5db25cab84..43f12b344157 100644
--- a/sci-visualization/gfsview/metadata.xml
+++ b/sci-visualization/gfsview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   GfsView is a graphical viewer for Gerris simulation files.
   </longdescription>
diff --git a/sci-visualization/ggobi/metadata.xml b/sci-visualization/ggobi/metadata.xml
index 0c302c1e0140..9b672fe01372 100644
--- a/sci-visualization/ggobi/metadata.xml
+++ b/sci-visualization/ggobi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   GGobi is an open source visualization program for exploring
   high-dimensional data. It provides highly dynamic and interactive
diff --git a/sci-visualization/gle/metadata.xml b/sci-visualization/gle/metadata.xml
index c4293022a181..245406a4f9dc 100644
--- a/sci-visualization/gle/metadata.xml
+++ b/sci-visualization/gle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   GLE (Graphics Layout Engine) is a high-quality graphics package for
   scientists, combining a user-friendly scripting language with a full
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index eef87b58c4eb..70959b86a6f1 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>ulm@gentoo.org</email>
     <name>Ulrich Müller</name>
@@ -10,6 +9,10 @@
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   Gnuplot is a command-driven interactive function plotting program.
   It can be used to plot functions and data points in both two- and
diff --git a/sci-visualization/grace/metadata.xml b/sci-visualization/grace/metadata.xml
index 8aa335d964d1..c0d89b1d1149 100644
--- a/sci-visualization/grace/metadata.xml
+++ b/sci-visualization/grace/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>graphics</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer>
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Grace is a point-and-click tool that allows the user to draw X-Y
   plots. This is the program formerly known as Xmgr.
diff --git a/sci-visualization/gri/metadata.xml b/sci-visualization/gri/metadata.xml
index afedbe7220bc..c5bddd3dc4d6 100644
--- a/sci-visualization/gri/metadata.xml
+++ b/sci-visualization/gri/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Gri is a language for scientific graphics programming. The word
   "language" is important: Gri is command-driven, not
diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml
index 2079a95b89c8..21af0a8b7e9d 100644
--- a/sci-visualization/gwyddion/metadata.xml
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Gwyddion is a modular program for SPM data analysis. Primarily it is
   supposed to be used for analysis of height fields obtained by means of
diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml
index 63f681ccbe65..e3289c3ed13c 100644
--- a/sci-visualization/kst/metadata.xml
+++ b/sci-visualization/kst/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">kst</remote-id>
     <bugs-to>https://bugs.kde.org/</bugs-to>
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 7fd6fa820d17..4151c4730313 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>kde</herd>
   <maintainer>
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+<maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml
index 54bc70ee9f0d..cde58b42a23e 100644
--- a/sci-visualization/mayavi/metadata.xml
+++ b/sci-visualization/mayavi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   Mayavi2 is a general purpose, cross-platform tool for 3-D scientific
   data visualization. Its features include:
diff --git a/sci-visualization/nonolith-connect/metadata.xml b/sci-visualization/nonolith-connect/metadata.xml
index f14f39732531..cfbe4c5d9f5d 100644
--- a/sci-visualization/nonolith-connect/metadata.xml
+++ b/sci-visualization/nonolith-connect/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml
index 412959479603..be058a814d3b 100644
--- a/sci-visualization/opendx-samples/metadata.xml
+++ b/sci-visualization/opendx-samples/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   This package contains examples of scripts and networks for the
   OpenDX Data Explorer. They are referenced in the OpenDX tutorial,
diff --git a/sci-visualization/opendx/metadata.xml b/sci-visualization/opendx/metadata.xml
index 9090326bdc7b..7f002fcdc26b 100644
--- a/sci-visualization/opendx/metadata.xml
+++ b/sci-visualization/opendx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   The Open Data Explorer brings together dynamic computational
   and rendering tools in a dynamic, programmable framework that
diff --git a/sci-visualization/pythonprop/metadata.xml b/sci-visualization/pythonprop/metadata.xml
index bafe77814a16..8595741d3407 100644
--- a/sci-visualization/pythonprop/metadata.xml
+++ b/sci-visualization/pythonprop/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pythonprop</remote-id>
 	</upstream>
diff --git a/sci-visualization/pyxplot/metadata.xml b/sci-visualization/pyxplot/metadata.xml
index 6659594ec46f..33ef09a57300 100644
--- a/sci-visualization/pyxplot/metadata.xml
+++ b/sci-visualization/pyxplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   PyXPlot is a command-line graphing package with a simple interface
   that produces publication-quality output. Its command line interface is very
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
index 51a10f76451c..c2b291c1e923 100644
--- a/sci-visualization/qtiplot/metadata.xml
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 	Data analysis and scientific plotting package. This is a clone of the
 	popular Origin software available on another well known platform implemented
diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml
index ccaedd7cfc1b..5883ad9bd8b9 100644
--- a/sci-visualization/quickplot/metadata.xml
+++ b/sci-visualization/quickplot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   Quickplot is a fast interactive 2D plotter with infinite zooming, value
   picking, pipe input, and unlimited plots displayed.  Quickplot is meant for
diff --git a/sci-visualization/spectromatic/metadata.xml b/sci-visualization/spectromatic/metadata.xml
index df3ad6ba7d06..c85f8295a910 100644
--- a/sci-visualization/spectromatic/metadata.xml
+++ b/sci-visualization/spectromatic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   Spectromatic is a program for generating spectrograms from audio
   files. Spectrograms are a form of simple time-frequency analysis which
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
index 7c60390db52e..43dfa1c74b2a 100644
--- a/sci-visualization/veusz/metadata.xml
+++ b/sci-visualization/veusz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   A Qt based scientific plotting package written in Python using PyQt. It is
   designed to produce publication ready Postscript output. It provides a GUI,
diff --git a/sci-visualization/xd3d/metadata.xml b/sci-visualization/xd3d/metadata.xml
index 31da504e2cc6..db352d7583bb 100644
--- a/sci-visualization/xd3d/metadata.xml
+++ b/sci-visualization/xd3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
   xd3d is a simple scientific visualization tool designed to be easy to learn. 
   It can plot 2d and 3d meshes, with shadowing, contour plots, vector fields, 
diff --git a/sci-visualization/xds-viewer/metadata.xml b/sci-visualization/xds-viewer/metadata.xml
index b260d92eaabe..4f84560179ac 100644
--- a/sci-visualization/xds-viewer/metadata.xml
+++ b/sci-visualization/xds-viewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
   <longdescription lang="en">
   XDS-Viewer is a program for viewing X-ray diffraction and control
   images in the context of data processing by the XDS Program Package
diff --git a/sci-visualization/xgraph/metadata.xml b/sci-visualization/xgraph/metadata.xml
index 96df77f1e460..e6b972d6a171 100644
--- a/sci-visualization/xgraph/metadata.xml
+++ b/sci-visualization/xgraph/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
     Accepts data files or stdin in a form similar to the unix program
     graph and displays line graphs, scatter plots, or bar charts on an
diff --git a/sci-visualization/xyscan/metadata.xml b/sci-visualization/xyscan/metadata.xml
index 627b48457810..141261d2e7b3 100644
--- a/sci-visualization/xyscan/metadata.xml
+++ b/sci-visualization/xyscan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
 <longdescription lang="en">
   xyscan is a tool for scientist in the need to extract data points,
   i.e. numeric values, from a plot. It allows to scan the plots and
diff --git a/sci-visualization/yt/metadata.xml b/sci-visualization/yt/metadata.xml
index ebd98f7b52ea..c0a792215642 100644
--- a/sci-visualization/yt/metadata.xml
+++ b/sci-visualization/yt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>yt is an analysis and visualization system written in Python,
 		designed for use with Astrophysical Simulation codes. yt can process data in a
 		myriad of ways and make a variety of visualizations. It is designed to be portable
diff --git a/sci-visualization/zhu3d/metadata.xml b/sci-visualization/zhu3d/metadata.xml
index 07ba1a46b48d..539fbd0d7054 100644
--- a/sci-visualization/zhu3d/metadata.xml
+++ b/sci-visualization/zhu3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription lang="en">
   Zhu3D allows you to interactively view and animate mathematical
   functions, isosurfaces and a further independent parametric system.
diff --git a/sec-policy/apparmor-profiles/metadata.xml b/sec-policy/apparmor-profiles/metadata.xml
index f60a2bbf973d..0b14b7a31476 100644
--- a/sec-policy/apparmor-profiles/metadata.xml
+++ b/sec-policy/apparmor-profiles/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
 	</upstream>
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 863d6473f89d..4bfa808e5334 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 0b6d87b08f44..34160af9a83a 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="nfs">add support for NFS acls</flag>
 </use>
diff --git a/sys-apps/adjtime/metadata.xml b/sys-apps/adjtime/metadata.xml
index 316fde480cf2..4d8883bfc7d3 100644
--- a/sys-apps/adjtime/metadata.xml
+++ b/sys-apps/adjtime/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 <longdescription>A perl script to adjust the tick on the Kurobox and 
  LinkStation hardware clock (required to keep an accurate clock).
  Should work on most hardware platforms.
diff --git a/sys-apps/aix-miscutils/metadata.xml b/sys-apps/aix-miscutils/metadata.xml
index 0a2c0a13150a..e0e65a3e3804 100644
--- a/sys-apps/aix-miscutils/metadata.xml
+++ b/sys-apps/aix-miscutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
 <maintainer>
   <email>haubi@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>prefix@gentoo.org</email>
+  <name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml
index f60a2bbf973d..0b14b7a31476 100644
--- a/sys-apps/apparmor-utils/metadata.xml
+++ b/sys-apps/apparmor-utils/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
 	</upstream>
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index f60a2bbf973d..0b14b7a31476 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
 	</upstream>
diff --git a/sys-apps/arrayprobe/metadata.xml b/sys-apps/arrayprobe/metadata.xml
index f73c417076a0..c1f2849ca010 100644
--- a/sys-apps/arrayprobe/metadata.xml
+++ b/sys-apps/arrayprobe/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/sys-apps/baobab/metadata.xml
+++ b/sys-apps/baobab/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/bar/metadata.xml b/sys-apps/bar/metadata.xml
index d3cb34b9ca6e..d907356c301d 100644
--- a/sys-apps/bar/metadata.xml
+++ b/sys-apps/bar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">clpbar</remote-id>
 	</upstream>
diff --git a/sys-apps/baselayout-java/metadata.xml b/sys-apps/baselayout-java/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/sys-apps/baselayout-java/metadata.xml
+++ b/sys-apps/baselayout-java/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index b61e26392d00..490f950ca527 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>mattsch@gmail.com</email>
 	<name>Matthew Schultz</name>
@@ -11,4 +10,8 @@
 	<email>pacho@gentoo.org</email>
 	<description>Proxy maintainer, CC him in bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index a781804fc2b8..d62d0c1c72e7 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+<email>embedded@gentoo.org</email>
+<name>Embedded Gentoo</name>
+</maintainer>
 <use>
 <flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
 <flag name="math">Enable math support in gawk (requires libm)</flag>
diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
index 9652057d92c3..cedf7bbe2ad9 100644
--- a/sys-apps/byld/metadata.xml
+++ b/sys-apps/byld/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">byld</remote-id>
 </upstream>
diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
index c69ecae19d8c..bb08d34d20c5 100644
--- a/sys-apps/cciss_vol_status/metadata.xml
+++ b/sys-apps/cciss_vol_status/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">cciss</remote-id>
 </upstream>
diff --git a/sys-apps/collectl/metadata.xml b/sys-apps/collectl/metadata.xml
index bace82278d2a..a2b7c24837dd 100644
--- a/sys-apps/collectl/metadata.xml
+++ b/sys-apps/collectl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">collectl</remote-id>
 </upstream>
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index b9f0e009cda1..544359e16d29 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="hostname">Build the hostname program</flag>
 	<flag name="kill">Build the kill program</flag>
diff --git a/sys-apps/cpint/metadata.xml b/sys-apps/cpint/metadata.xml
index 045daae69a4e..f74e36708ce1 100644
--- a/sys-apps/cpint/metadata.xml
+++ b/sys-apps/cpint/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>s390</herd>
+<maintainer>
+	<email>s390@gentoo.org</email>
+	<name>Gentoo Linux s390 Development</name>
+</maintainer>
 <longdescription>Linux/390 Interface to z/VM's Control Program</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 95143822cca7..f09fa5733d61 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">cracklib</remote-id>
 	<remote-id type="github">cracklib/cracklib</remote-id>
diff --git a/sys-apps/darwin-miscutils/metadata.xml b/sys-apps/darwin-miscutils/metadata.xml
index 4561e552bd04..4609b17cbb97 100644
--- a/sys-apps/darwin-miscutils/metadata.xml
+++ b/sys-apps/darwin-miscutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 6562398994a5..644367aa0648 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-apps/dcfldd/metadata.xml b/sys-apps/dcfldd/metadata.xml
index 961146344a8d..abd8600ae730 100644
--- a/sys-apps/dcfldd/metadata.xml
+++ b/sys-apps/dcfldd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dcfldd</remote-id>
 	</upstream>
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/dmapi/metadata.xml
+++ b/sys-apps/dmapi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dmidecode/metadata.xml b/sys-apps/dmidecode/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/dmidecode/metadata.xml
+++ b/sys-apps/dmidecode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dmtcp/metadata.xml b/sys-apps/dmtcp/metadata.xml
index 154329b9ce83..d630cd18a69b 100644
--- a/sys-apps/dmtcp/metadata.xml
+++ b/sys-apps/dmtcp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-tools</herd>
 	<use>
 		<flag name="fast">Enable experimental performance options such as mmap allocator.</flag>
 		<flag name="trace">Enable ptrace support (only valid with debug enabled).</flag>
diff --git a/sys-apps/dnotify/metadata.xml b/sys-apps/dnotify/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/dnotify/metadata.xml
+++ b/sys-apps/dnotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dog/metadata.xml b/sys-apps/dog/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/sys-apps/dog/metadata.xml
+++ b/sys-apps/dog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index ccba990cce68..d7bd5974c9e3 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc64</herd>
 <maintainer>
 	<email>lu_zero@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/elfix/metadata.xml b/sys-apps/elfix/metadata.xml
index 00af8020b079..84c2119c9db6 100644
--- a/sys-apps/elfix/metadata.xml
+++ b/sys-apps/elfix/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<use>
 		<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
 		<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 5977c7f15c18..0e85fbef1680 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	ethtool is a Linux utility for controlling network drivers and hardware,
 	particularly for wired Ethernet devices. It can be used to:
diff --git a/sys-apps/fakechroot/metadata.xml b/sys-apps/fakechroot/metadata.xml
index 4f3f7b2bd973..2ae24da6066b 100644
--- a/sys-apps/fakechroot/metadata.xml
+++ b/sys-apps/fakechroot/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>anthoine.bourgeois@gmail.com</email>
 		<description>Maintainer, assign bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
index 0841cba5b9ee..f5e2aeb8bd40 100644
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ b/sys-apps/fakeroot-ng/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>anthoine.bourgeois@gmail.com</email>
     <description>Maintainer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fakerootng</remote-id>
   </upstream>
diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/fakeroot/metadata.xml
+++ b/sys-apps/fakeroot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/fbset/metadata.xml
+++ b/sys-apps/fbset/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index d05cbc00cc09..7e6490f473ff 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<bugs-to>http://bugs.gw.com/</bugs-to>
 </upstream>
diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index b51f27ac8e78..c64af58c5cae 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
 </upstream>
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 6c05e6d39c04..9031ce9380f1 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
@@ -10,6 +9,10 @@
 		<email>peter@stuge.se</email>
 		<description>Please CC on all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
 		<flag name="atapromise">Support for Promise PDC2026x (FastTrak/Ultra)</flag>
diff --git a/sys-apps/flock/metadata.xml b/sys-apps/flock/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-apps/flock/metadata.xml
+++ b/sys-apps/flock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/fwcrv/metadata.xml b/sys-apps/fwcrv/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/fwcrv/metadata.xml
+++ b/sys-apps/fwcrv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index e88fa58c8b90..1da8c5745614 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag>
 </use>
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index 39f028c585ae..90f461d063dd 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>williamh@gentoo.org</email>
 </maintainer>
 <maintainer>
 	<email>blueness@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	This package contains base shell functions which are required by
 	all Gentoo systems.
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 35d2907b8622..015ae9d71086 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="fat">Include FAT16/FAT32 support
 		(<pkg>sys-fs/dosfstools</pkg>)</flag>
diff --git a/sys-apps/gradm/metadata.xml b/sys-apps/gradm/metadata.xml
index e217c3733475..724bcb3aaefa 100644
--- a/sys-apps/gradm/metadata.xml
+++ b/sys-apps/gradm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index 0343844b82f2..4b7312499473 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
 </upstream>
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
index 4972d3e5fa97..b75ea6d48dfc 100644
--- a/sys-apps/gscanbus/metadata.xml
+++ b/sys-apps/gscanbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">gscanbus.berlios</remote-id>
 </upstream>
diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
index 9d109ee85cd1..111ecadf749c 100644
--- a/sys-apps/gsmartcontrol/metadata.xml
+++ b/sys-apps/gsmartcontrol/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gsmartcontrol</remote-id>
 	</upstream>
diff --git a/sys-apps/haveged/metadata.xml b/sys-apps/haveged/metadata.xml
index 8f0080c57726..464439108db0 100644
--- a/sys-apps/haveged/metadata.xml
+++ b/sys-apps/haveged/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sysadmin</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
index fd5f3b8c07ff..353ca336a74b 100644
--- a/sys-apps/hbaapi/metadata.xml
+++ b/sys-apps/hbaapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">hbaapi</remote-id>
 </upstream>
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index 8adcecd9fc9f..2e0fb1fd483f 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">hdparm</remote-id>
 </upstream>
diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/help2man/metadata.xml
+++ b/sys-apps/help2man/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/hprofile/metadata.xml b/sys-apps/hprofile/metadata.xml
index b0be56990d5f..838d69e88d35 100644
--- a/sys-apps/hprofile/metadata.xml
+++ b/sys-apps/hprofile/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">tokiclover/hprofile</remote-id>
 </upstream>
diff --git a/sys-apps/hwdata-gentoo/metadata.xml b/sys-apps/hwdata-gentoo/metadata.xml
index 1ac2ea9fcffb..bc8c92e36a5a 100644
--- a/sys-apps/hwdata-gentoo/metadata.xml
+++ b/sys-apps/hwdata-gentoo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 <use>
 	<flag name="binary-drivers">Adds support for ATI/NVIDIA binary
 		drivers</flag>
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index be6e3795baad..6d23734d42dd 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>flameeyes@gentoo.org</email>
 </maintainer>
@@ -11,6 +10,10 @@
 <maintainer>
 	<email>floppym@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="net">Install the oui.txt and iab.txt databases</flag>
 	<flag name="pci">Install the pci.ids database</flag>
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index fbf6b304adfd..b151b17d84ea 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+  <email>cluster@gentoo.org</email>
+  <name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription> 
   The Portable Hardware Locality (hwloc) software package provides a portable abstraction 
   (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, 
diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/sys-apps/hwsetup/metadata.xml
+++ b/sys-apps/hwsetup/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ibm-powerpc-utils-papr/metadata.xml b/sys-apps/ibm-powerpc-utils-papr/metadata.xml
index f9a5b22fcbec..8278b9b25ff2 100644
--- a/sys-apps/ibm-powerpc-utils-papr/metadata.xml
+++ b/sys-apps/ibm-powerpc-utils-papr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc64</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ibm-powerpc-utils/metadata.xml b/sys-apps/ibm-powerpc-utils/metadata.xml
index 6035c92dff18..14a17cab64c9 100644
--- a/sys-apps/ibm-powerpc-utils/metadata.xml
+++ b/sys-apps/ibm-powerpc-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<use>
 		<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
 	</use>
diff --git a/sys-apps/ifd-gempc/metadata.xml b/sys-apps/ifd-gempc/metadata.xml
index 555d15559b19..74956f7da64a 100644
--- a/sys-apps/ifd-gempc/metadata.xml
+++ b/sys-apps/ifd-gempc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 <longdescription>
 	This library provides PC/SC IFD handler implementation for Gemplus GemCore based
 	serial and USB smart cards readers.
diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index f3597af28c8c..dd7cc549bafc 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	Brings up/down ethernet ports automatically with cable detection
 </longdescription>
diff --git a/sys-apps/install-xattr/metadata.xml b/sys-apps/install-xattr/metadata.xml
index 8221a72b8777..23116adc2b46 100644
--- a/sys-apps/install-xattr/metadata.xml
+++ b/sys-apps/install-xattr/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>blueness@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/intel-performance-counter-monitor/metadata.xml b/sys-apps/intel-performance-counter-monitor/metadata.xml
index c63b19ffc98e..ae3a1c041b3c 100644
--- a/sys-apps/intel-performance-counter-monitor/metadata.xml
+++ b/sys-apps/intel-performance-counter-monitor/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan 'undersys' Horan</name>
 		<description>Primary Maintainer, Assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index b8bcac27255f..15bab03b17c5 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <use>
     <flag name="openipmi">Use the system OpenIPMI implementation.</flag>
     <!-- <flag name='freeipmi'>Use the system FreeIPMI implementation.</flag> -->
diff --git a/sys-apps/ipmiutil/metadata.xml b/sys-apps/ipmiutil/metadata.xml
index 80daff455531..2757ee6b1514 100644
--- a/sys-apps/ipmiutil/metadata.xml
+++ b/sys-apps/ipmiutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sysadmin</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ipmiutil</remote-id>
 	</upstream>
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 3a1e60d4b613..e6b2a740b669 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
 	<flag name="iptables">include support for iptables filtering</flag>
diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 2d6ba73d5ccc..d2a75d7f38e4 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="numa">Support balancing IRQs across NUMA nodes</flag>
 </use>
diff --git a/sys-apps/isapnptools/metadata.xml b/sys-apps/isapnptools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/isapnptools/metadata.xml
+++ b/sys-apps/isapnptools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/iucode_tool/metadata.xml b/sys-apps/iucode_tool/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/iucode_tool/metadata.xml
+++ b/sys-apps/iucode_tool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index f862d255f204..86b66790986d 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="freshmeat">kbd</remote-id>
 </upstream>
diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml
index 6aa7d215c338..dd032aa61058 100644
--- a/sys-apps/kexec-tools/metadata.xml
+++ b/sys-apps/kexec-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <use>
     <flag name="lzma">Enables support for LZMA compressed kernel images</flag>
     <flag name="booke">Include support for Book-E memory management</flag>
diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 115f26ac8711..082c7ae4c6b9 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 879bcfc7eac3..0656e2e9edac 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>udev-bugs@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="lzma">Enable support for XZ compressed modules</flag>
 	<flag name="tools">Install module loading/unloading tools.</flag>
diff --git a/sys-apps/lcdsplash/metadata.xml b/sys-apps/lcdsplash/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/lcdsplash/metadata.xml
+++ b/sys-apps/lcdsplash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml
index 69fdf497f634..7d6261f688b7 100644
--- a/sys-apps/lcdtest/metadata.xml
+++ b/sys-apps/lcdtest/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
 <maintainer>
 	<email>nikoli@gmx.us</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 391e43567a6c..8237fee11b2a 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
 	<maintainer>
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
index d41a15e9ead3..043386114d91 100644
--- a/sys-apps/likwid/metadata.xml
+++ b/sys-apps/likwid/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>brendan@horan.hk</email>
 		<name>Brendan Horan</name>
 		<description>Proxy - Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rrze-likwid/likwid</remote-id>
 	</upstream>
diff --git a/sys-apps/lkcdutils/metadata.xml b/sys-apps/lkcdutils/metadata.xml
index fc290a9782b3..7e1cefa1e7be 100644
--- a/sys-apps/lkcdutils/metadata.xml
+++ b/sys-apps/lkcdutils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>s390</herd>
 	<maintainer>
 		<email>s390@gentoo.org</email>
 	</maintainer>
diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
index 7ece2d9da040..f8a0f573530f 100644
--- a/sys-apps/logwatch/metadata.xml
+++ b/sys-apps/logwatch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">logwatch</remote-id>
 </upstream>
diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml
index 56244816bc20..ed27c1ccfa2d 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>blshkv@pentoo.ch</email>
 	<name>Anton Bolshakov</name>
 	<description>Proxy maintainer. Assign bugs to him</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lsadb/metadata.xml b/sys-apps/lsadb/metadata.xml
index e75d5a5857f0..c8871ebc60c6 100644
--- a/sys-apps/lsadb/metadata.xml
+++ b/sys-apps/lsadb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/lshw/metadata.xml
+++ b/sys-apps/lshw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/lssbus/metadata.xml b/sys-apps/lssbus/metadata.xml
index 343785db6261..0ced116759c7 100644
--- a/sys-apps/lssbus/metadata.xml
+++ b/sys-apps/lssbus/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sparc</herd>
 <maintainer>
   <email>sparc@gentoo.org</email>
   <name>Sparc Team</name>
diff --git a/sys-apps/makedev/metadata.xml b/sys-apps/makedev/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/makedev/metadata.xml
+++ b/sys-apps/makedev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml
index 77ec25b3f534..00896cce4503 100644
--- a/sys-apps/man-db/metadata.xml
+++ b/sys-apps/man-db/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="manpager">Enable manpager wrapper for colorizing output</flag>
 </use>
diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/man-pages-posix/metadata.xml
+++ b/sys-apps/man-pages-posix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/man-pages/metadata.xml
+++ b/sys-apps/man-pages/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/man/metadata.xml
+++ b/sys-apps/man/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index b7d0c5d90ac5..f59af2bdd5ee 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="serial">Compile with serial console support</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml
index 501bf344889c..68c3f8af3d3f 100644
--- a/sys-apps/memtest86/metadata.xml
+++ b/sys-apps/memtest86/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="serial">Compile with serial console support</flag>
 </use>
diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/memtester/metadata.xml
+++ b/sys-apps/memtester/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/microcode-ctl/metadata.xml b/sys-apps/microcode-ctl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/microcode-ctl/metadata.xml
+++ b/sys-apps/microcode-ctl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/microcode-data/metadata.xml b/sys-apps/microcode-data/metadata.xml
index 31da8f566128..7ae77b8746ea 100644
--- a/sys-apps/microcode-data/metadata.xml
+++ b/sys-apps/microcode-data/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
 	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
diff --git a/sys-apps/minised/metadata.xml b/sys-apps/minised/metadata.xml
index 80f59b50e3e5..652642c3e7f0 100644
--- a/sys-apps/minised/metadata.xml
+++ b/sys-apps/minised/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
-<herd>base-system</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/miscfiles/metadata.xml
+++ b/sys-apps/miscfiles/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mlocate/metadata.xml b/sys-apps/mlocate/metadata.xml
index a6e25f02c16e..74bfcb4844c5 100644
--- a/sys-apps/mlocate/metadata.xml
+++ b/sys-apps/mlocate/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>fauli@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/modutils/metadata.xml
+++ b/sys-apps/modutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/most/metadata.xml b/sys-apps/most/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/sys-apps/most/metadata.xml
+++ b/sys-apps/most/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mount-gtk/metadata.xml b/sys-apps/mount-gtk/metadata.xml
index e734d7e194fd..b973f5fe77ea 100644
--- a/sys-apps/mount-gtk/metadata.xml
+++ b/sys-apps/mount-gtk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mount-gtk</remote-id>
 	</upstream>
diff --git a/sys-apps/mouseemu/metadata.xml b/sys-apps/mouseemu/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-apps/mouseemu/metadata.xml
+++ b/sys-apps/mouseemu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 8823935a52f3..82c345f228d6 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">archiecobbs/mtree-port</remote-id>
 </upstream>
diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
index 1db5b5c14e5f..b864b3737325 100644
--- a/sys-apps/nawk/metadata.xml
+++ b/sys-apps/nawk/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>ottxor@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 870f1d0493ee..b046567ad8ea 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
 	<flag name="hostname">build the hostname and dnsdomainname tools</flag>
diff --git a/sys-apps/netboot-base/metadata.xml b/sys-apps/netboot-base/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/netboot-base/metadata.xml
+++ b/sys-apps/netboot-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/netkit-base/metadata.xml b/sys-apps/netkit-base/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/netkit-base/metadata.xml
+++ b/sys-apps/netkit-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/netloc/metadata.xml b/sys-apps/netloc/metadata.xml
index 91d88c8a551c..9c0b89c81f47 100644
--- a/sys-apps/netloc/metadata.xml
+++ b/sys-apps/netloc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription> 
 	The Portable Network Locality (netloc) software package provides network topology discovery tools, and an abstract representation of those networks topologies for a range of network types and configurations. It is provided as a companion to the Portable Hardware Locality (hwloc) package. These two software packages work together to provide a comprehensive view of the HPC system topology, spanning from the processor cores in one server to the cores in another – including the complex network(s) in between.
 </longdescription>
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index fd42ddba1a6b..8bee419abd54 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openrc</herd>
+	<maintainer>
+		<email>openrc@gentoo.org</email>
+		<name>Gentoo OpenRC Project</name>
+	</maintainer>
 	<use>
 		<flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
 		<flag name="newnet">enable the new network stack (experimental)</flag>
diff --git a/sys-apps/paxctl/metadata.xml b/sys-apps/paxctl/metadata.xml
index e217c3733475..724bcb3aaefa 100644
--- a/sys-apps/paxctl/metadata.xml
+++ b/sys-apps/paxctl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/paxctld/metadata.xml b/sys-apps/paxctld/metadata.xml
index e217c3733475..724bcb3aaefa 100644
--- a/sys-apps/paxctld/metadata.xml
+++ b/sys-apps/paxctld/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index b1fff3cac2d7..c6e268874365 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
 	<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index b7272f79812b..e76beb23749b 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <longdescription>
     PC/SC Architecture smartcard middleware library
   </longdescription>
diff --git a/sys-apps/pcsc-slb-rf72-drv/metadata.xml b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/sys-apps/pcsc-slb-rf72-drv/metadata.xml
+++ b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml
index b36423b9e2f7..87a1158f4899 100644
--- a/sys-apps/pcsc-tools/metadata.xml
+++ b/sys-apps/pcsc-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <longdescription>User tools for PC/SC SmartCard access (including pcsc_scan and the gscriptor GUI).</longdescription>
 
   <use>
diff --git a/sys-apps/pmount-gui/metadata.xml b/sys-apps/pmount-gui/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/sys-apps/pmount-gui/metadata.xml
+++ b/sys-apps/pmount-gui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/powerpc-utils/metadata.xml b/sys-apps/powerpc-utils/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-apps/powerpc-utils/metadata.xml
+++ b/sys-apps/powerpc-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index dc84e004c37a..3062e284528e 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ia64</herd>
+	<maintainer>
+		<email>ia64@gentoo.org</email>
+		<name>Gentoo Linux IA-64 Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">prctl</remote-id>
 	</upstream>
diff --git a/sys-apps/prefix-chain-utils/metadata.xml b/sys-apps/prefix-chain-utils/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/sys-apps/prefix-chain-utils/metadata.xml
+++ b/sys-apps/prefix-chain-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/qcontrol/metadata.xml b/sys-apps/qcontrol/metadata.xml
index 56901798a2dd..a593b252a27b 100644
--- a/sys-apps/qcontrol/metadata.xml
+++ b/sys-apps/qcontrol/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
-<herd>embedded</herd>
 <maintainer>
   <email>armin76@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>arm@gentoo.org</email>
+  <name>Gentoo Linux ARM Development</name>
+</maintainer>
+<maintainer>
+  <email>embedded@gentoo.org</email>
+  <name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/qdiskusage/metadata.xml b/sys-apps/qdiskusage/metadata.xml
index 76975b5fa135..d5286874af2d 100644
--- a/sys-apps/qdiskusage/metadata.xml
+++ b/sys-apps/qdiskusage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index 9a95f0454614..f2c2e5ed6701 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="consolekit">Enable native consolekit support</flag>
 	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
diff --git a/sys-apps/readahead-list/metadata.xml b/sys-apps/readahead-list/metadata.xml
index b314bee0daf5..0b1d246b3f10 100644
--- a/sys-apps/readahead-list/metadata.xml
+++ b/sys-apps/readahead-list/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 	<description>Upstream author as well as maintainer for Gentoo.</description>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/rename/metadata.xml b/sys-apps/rename/metadata.xml
index a3f7d00f6d45..19802805f3d9 100644
--- a/sys-apps/rename/metadata.xml
+++ b/sys-apps/rename/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">rename</remote-id>
 </upstream>
diff --git a/sys-apps/rescan-scsi-bus/metadata.xml b/sys-apps/rescan-scsi-bus/metadata.xml
index 115f26ac8711..082c7ae4c6b9 100644
--- a/sys-apps/rescan-scsi-bus/metadata.xml
+++ b/sys-apps/rescan-scsi-bus/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 511982349964..dc5a10a59e99 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>idella4@gentoo.org</email>
 </maintainer>
@@ -11,6 +9,14 @@
 	<name>Gokturk Yuksek</name>
 	<description>Proxy maintainer, CC him on bugs.</description>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">gkernel</remote-id>
 </upstream>
diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml
index d89f5d95cc75..6e3b5010bd70 100644
--- a/sys-apps/roccat-tools/metadata.xml
+++ b/sys-apps/roccat-tools/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>dpisklov@gmail.com</email>
 		<name>Dmitry Pisklov</name>
 		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="lua">Build support for Lua scripting for RyosMKPro ripple effects</flag>
 		<flag name="lua51">Build support for Lua scripting for RyosMKPro ripple effects - support lua 5.1</flag>
diff --git a/sys-apps/rsbac-admin/metadata.xml b/sys-apps/rsbac-admin/metadata.xml
index cb485827c1ce..d4f673008b14 100644
--- a/sys-apps/rsbac-admin/metadata.xml
+++ b/sys-apps/rsbac-admin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription lang="en">
 		Administrative tool for RSBAC system
 	</longdescription>
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 87e1df2ef2d4..e925a75b0d31 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>s390</herd>
 	<maintainer>
 		<email>s390@gentoo.org</email>
 	</maintainer>
diff --git a/sys-apps/salinfo/metadata.xml b/sys-apps/salinfo/metadata.xml
index fe15722775f2..6d143f6923f7 100644
--- a/sys-apps/salinfo/metadata.xml
+++ b/sys-apps/salinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ia64</herd>
+<maintainer>
+	<email>ia64@gentoo.org</email>
+	<name>Gentoo Linux IA-64 Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
index a9c5573a17e6..e3d1184f9683 100644
--- a/sys-apps/sdparm/metadata.xml
+++ b/sys-apps/sdparm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	Utility to output and modify parameters on a SCSI device, like hdparm.
 </longdescription>
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index 2dbbb3b4d156..49350b102cb2 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
diff --git a/sys-apps/servicelog/metadata.xml b/sys-apps/servicelog/metadata.xml
index 09b995174c26..55b6e6055e09 100644
--- a/sys-apps/servicelog/metadata.xml
+++ b/sys-apps/servicelog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linux-diag</remote-id>
 	</upstream>
diff --git a/sys-apps/setserial/metadata.xml b/sys-apps/setserial/metadata.xml
index 0ad0b26d0ffe..12aeff74c15d 100644
--- a/sys-apps/setserial/metadata.xml
+++ b/sys-apps/setserial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">setserial</remote-id>
 </upstream>
diff --git a/sys-apps/sg3_utils/metadata.xml b/sys-apps/sg3_utils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/sg3_utils/metadata.xml
+++ b/sys-apps/sg3_utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index aed121abca07..c7715d5c95d5 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>pam</herd> <!-- only for USE=pam -->
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+ </maintainer> <maintainer>
+	<email>pam-bugs@gentoo.org</email>
+	<name>Pluggable Authentication Method maintenance</name>
+ </maintainer> <!-- only for USE=pam -->
 <upstream>
 	<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
 </upstream>
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 451606b9ff97..e7dcd3d81bcf 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
 </use>
diff --git a/sys-apps/sparc-utils/metadata.xml b/sys-apps/sparc-utils/metadata.xml
index 3c434d165f08..5c7104058f41 100644
--- a/sys-apps/sparc-utils/metadata.xml
+++ b/sys-apps/sparc-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sparc</herd>
 <maintainer>
   <email>sparc@gentoo.org</email>
   <name>Sparc Team</name>
diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
index 66d681f02bc7..bf648a9d1094 100644
--- a/sys-apps/syscriptor/metadata.xml
+++ b/sys-apps/syscriptor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">syscriptor</remote-id>
 </upstream>
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
index 354c39064a79..2a7f05b577cb 100644
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ b/sys-apps/tcp-wrappers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="netgroups">
 		Support matching NIS (host) netgroup names via the @netgroup syntax
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
index 4886a60a3499..0606541e73a9 100644
--- a/sys-apps/timer_entropyd/metadata.xml
+++ b/sys-apps/timer_entropyd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pavel.stratil-jun@fenix.cz</email>
     <description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="debug">Enable printf debugging and logging to the syslog at DEBUG level</flag>
   </use>
diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
index 5f216ff5119e..daaf46630de7 100644
--- a/sys-apps/tuxonice-userui/metadata.xml
+++ b/sys-apps/tuxonice-userui/metadata.xml
@@ -5,7 +5,10 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="fbsplash">Add support for framebuffer splash</flag>
 	</use>
diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index 2b14dbd77d85..51054a1158f8 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 This package contains a proxy program that passes data back and forth
 between two connections set up by a UCSPI server and a UCSPI client.
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index adbdc3c6c190..00b8b7ec98e5 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>powerman-asdf@yandex.ru</email>
                 <description>Primary maintainer</description>
                 <name>Alex Efros</name>
 	</maintainer>
+<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+	</maintainer>
 <longdescription>sslserver and sslclient are command-line tools for building SSL
 client-server applications. They conform to the UNIX Client-Server Program
 Interface, UCSPI.</longdescription>
diff --git a/sys-apps/ucspi-tcp/metadata.xml b/sys-apps/ucspi-tcp/metadata.xml
index 692f0c880548..10f6de70b88f 100644
--- a/sys-apps/ucspi-tcp/metadata.xml
+++ b/sys-apps/ucspi-tcp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		ucspi-tcp is a replacement for inetd. It consists of tcpserver and
 		tcpclient. tcpserver can listen on sockets and start programs in an
diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
index ada679eb0fd6..44436e1e6a76 100644
--- a/sys-apps/ucspi-unix/metadata.xml
+++ b/sys-apps/ucspi-unix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 This package contains UNIX domain socket client and server programs that
 conform to UCSPI, the UNIX Client-Server Program Interface.
diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml
index 0bd37e4f04e2..05e6770b3252 100644
--- a/sys-apps/udevil/metadata.xml
+++ b/sys-apps/udevil/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>zlg@gentoo.org</email>
 		<name>Daniel Campbell</name>
@@ -10,6 +9,10 @@
 		<email>ThyArmageddon+Gentoo@Gmail.com</email>
 		<name>Elijah El Lazkani</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">IgnorantGuru/udevil</remote-id>
 	</upstream>
diff --git a/sys-apps/uevt/metadata.xml b/sys-apps/uevt/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/sys-apps/uevt/metadata.xml
+++ b/sys-apps/uevt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/unscd/metadata.xml b/sys-apps/unscd/metadata.xml
index 686dc818edb9..0c0a20a0e663 100644
--- a/sys-apps/unscd/metadata.xml
+++ b/sys-apps/unscd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/usb_modeswitch/metadata.xml b/sys-apps/usb_modeswitch/metadata.xml
index af365e2b752e..642ffbcaceac 100644
--- a/sys-apps/usb_modeswitch/metadata.xml
+++ b/sys-apps/usb_modeswitch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <use>
     <flag name="jimtcl">Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
   </use>
@@ -9,4 +8,8 @@
     <email>rafaelmartins@gentoo.org</email>
     <name>Rafael G. Martins</name>
   </maintainer>
+<maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/usbredir/metadata.xml b/sys-apps/usbredir/metadata.xml
index 87124c273692..6aff4ed98b09 100644
--- a/sys-apps/usbredir/metadata.xml
+++ b/sys-apps/usbredir/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>qemu</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>qemu@gentoo.org</email>
+	<name>Gentoo QEMU Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
index c781cc1359a6..ffdfc891be83 100644
--- a/sys-apps/usbutils/metadata.xml
+++ b/sys-apps/usbutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">linux-usb</remote-id>
 </upstream>
diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
index 23c2cea3bcd7..609938156747 100644
--- a/sys-apps/utempter/metadata.xml
+++ b/sys-apps/utempter/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index bb3913818020..837c4d3d30c8 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
 	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
diff --git a/sys-apps/vbetool/metadata.xml b/sys-apps/vbetool/metadata.xml
index ad3f22a0b39f..8609336f0081 100644
--- a/sys-apps/vbetool/metadata.xml
+++ b/sys-apps/vbetool/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
index 01cea5d9c19b..e51e059ab047 100644
--- a/sys-apps/watchdog/metadata.xml
+++ b/sys-apps/watchdog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="nfs">enable support for checking nfs mounts</flag>
 </use>
diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/which/metadata.xml
+++ b/sys-apps/which/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 115f26ac8711..082c7ae4c6b9 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 62a2acae78da..ec7918a4040d 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="rpc">support RPC services</flag>
 	</use>
diff --git a/sys-apps/xmbmon/metadata.xml b/sys-apps/xmbmon/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-apps/xmbmon/metadata.xml
+++ b/sys-apps/xmbmon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/zorroutils/metadata.xml b/sys-apps/zorroutils/metadata.xml
index 53b13c9739c3..03b81fce82fe 100644
--- a/sys-apps/zorroutils/metadata.xml
+++ b/sys-apps/zorroutils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>m68k@gentoo.org</email>
 </maintainer>
@@ -9,4 +8,8 @@
 	<email>gentoo@kolla.no</email>
 	<name>Kolbjørn Barmen</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/keystone/metadata.xml b/sys-auth/keystone/metadata.xml
index 02cace46cf77..bfaf2ee9fc80 100644
--- a/sys-auth/keystone/metadata.xml
+++ b/sys-auth/keystone/metadata.xml
@@ -5,11 +5,14 @@
     <flag name="memcached">Installs dependencies needed for using memcached as a backend</flag>
     <flag name="mongo">Installs dependencies needed for using mongo as a backend</flag>
   </use>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Keystone is the Openstack authentication, authorization, and service
 	catalog written in Python.
diff --git a/sys-auth/libnss-mysql/metadata.xml b/sys-auth/libnss-mysql/metadata.xml
index ddc62a95e825..d26b5c63ff9a 100644
--- a/sys-auth/libnss-mysql/metadata.xml
+++ b/sys-auth/libnss-mysql/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
 	<maintainer>
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libnss-mysql</remote-id>
 	</upstream>
diff --git a/sys-auth/libnss-pgsql/metadata.xml b/sys-auth/libnss-pgsql/metadata.xml
index 309b51e9a965..64b4ee529f95 100644
--- a/sys-auth/libnss-pgsql/metadata.xml
+++ b/sys-auth/libnss-pgsql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>postgresql</herd>
+<maintainer>
+	<email>pgsql-bugs@gentoo.org</email>
+	<name>PostgreSQL and Related Package Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/libyubikey/metadata.xml b/sys-auth/libyubikey/metadata.xml
index 86aee3bb63dc..c4be2836e1a5 100644
--- a/sys-auth/libyubikey/metadata.xml
+++ b/sys-auth/libyubikey/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brant@gurganus.name</email>
     <name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
     <name>Diego Elio Pettenò</name>
     <description>Proxy maintainer, CC him on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">yubico-c</remote-id>
     <remote-id type="github">Yubico/yubico-c</remote-id>
diff --git a/sys-auth/munge/metadata.xml b/sys-auth/munge/metadata.xml
index 428b63069550..559c6dcb543e 100644
--- a/sys-auth/munge/metadata.xml
+++ b/sys-auth/munge/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Use libgcrypt instead of openssl</flag>
 	</use>
diff --git a/sys-auth/nss-myhostname/metadata.xml b/sys-auth/nss-myhostname/metadata.xml
index 1aba3db38f01..1503754c204b 100644
--- a/sys-auth/nss-myhostname/metadata.xml
+++ b/sys-auth/nss-myhostname/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
+<maintainer>
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
 <longdescription lang="en">
 nss-myhostname is a plugin for the GNU Name Service Switch (NSS) functionality
 of the GNU C Library (glibc) providing host name resolution for the locally
diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml
index c09b1c0e5c83..3f271d7b7fbe 100644
--- a/sys-auth/oath-toolkit/metadata.xml
+++ b/sys-auth/oath-toolkit/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<herd>sysadmin</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 	<use>
 		<flag name="pskc">Build tools &amp; library for the Portable Symmetric Key Container (PSKC) format per RFC6030</flag>
 		<flag name="pam">Build PAM module for pluggable login authentication for OATH</flag>
diff --git a/sys-auth/openpam/metadata.xml b/sys-auth/openpam/metadata.xml
index 35d02a20bf1c..8ff192ce5050 100644
--- a/sys-auth/openpam/metadata.xml
+++ b/sys-auth/openpam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>bsd</herd>
+	<maintainer>
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openpam</remote-id>
 	</upstream>
diff --git a/sys-auth/pam-afs-session/metadata.xml b/sys-auth/pam-afs-session/metadata.xml
index 81ada335fc94..4b454fe6789b 100644
--- a/sys-auth/pam-afs-session/metadata.xml
+++ b/sys-auth/pam-afs-session/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
+<maintainer>
+	<email>pam-bugs@gentoo.org</email>
+	<name>Pluggable Authentication Method maintenance</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam-pgsql/metadata.xml b/sys-auth/pam-pgsql/metadata.xml
index 4b531216ac27..c7ba5af8d42a 100644
--- a/sys-auth/pam-pgsql/metadata.xml
+++ b/sys-auth/pam-pgsql/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pam</herd>
 	<maintainer>
 		<email>pam-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/pam_abl/metadata.xml b/sys-auth/pam_abl/metadata.xml
index b0b1e5478f5a..4b39b68981f0 100644
--- a/sys-auth/pam_abl/metadata.xml
+++ b/sys-auth/pam_abl/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>swapon@gmail.com</email>
     <name>Alessio Cassibba</name>
   </maintainer>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 PAM module that provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts.
 Once a host is blacklisted it is guaranteed to fail authentication even if the correct credentials are provided.
diff --git a/sys-auth/pam_blue/metadata.xml b/sys-auth/pam_blue/metadata.xml
index faf0bf05443f..374ab48f0013 100644
--- a/sys-auth/pam_blue/metadata.xml
+++ b/sys-auth/pam_blue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <longdescription lang="en">
     Bluepam is an extension for the common pam modules, give the user the
     ability for authenticaten via a bluetooth compatible device like a cell
diff --git a/sys-auth/pam_chroot/metadata.xml b/sys-auth/pam_chroot/metadata.xml
index 24210a5eee45..ec253c8703b6 100644
--- a/sys-auth/pam_chroot/metadata.xml
+++ b/sys-auth/pam_chroot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pam-chroot</remote-id>
   </upstream>
diff --git a/sys-auth/pam_dotfile/metadata.xml b/sys-auth/pam_dotfile/metadata.xml
index 55ce0267ecc6..ecfbc0ef5238 100644
--- a/sys-auth/pam_dotfile/metadata.xml
+++ b/sys-auth/pam_dotfile/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pam</herd>
 	<maintainer>
 		<email>pam-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/pam_keystore/metadata.xml b/sys-auth/pam_keystore/metadata.xml
index 81ada335fc94..4b454fe6789b 100644
--- a/sys-auth/pam_keystore/metadata.xml
+++ b/sys-auth/pam_keystore/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
+<maintainer>
+	<email>pam-bugs@gentoo.org</email>
+	<name>Pluggable Authentication Method maintenance</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam_krb5/metadata.xml b/sys-auth/pam_krb5/metadata.xml
index e8a4773c1a0d..e46024cbbff4 100644
--- a/sys-auth/pam_krb5/metadata.xml
+++ b/sys-auth/pam_krb5/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kerberos</herd>
   <maintainer>
     <email>pam-bugs@gentoo.org</email>
   </maintainer>
@@ -9,4 +8,8 @@
     <email>eras@gentoo.org</email>
     <name>Eray Aslan</name>
   </maintainer>
+<maintainer>
+    <email>kerberos@gentoo.org</email>
+    <name>Kerberos</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam_ldap/metadata.xml b/sys-auth/pam_ldap/metadata.xml
index b3bf86cd59b4..43430c17aeeb 100644
--- a/sys-auth/pam_ldap/metadata.xml
+++ b/sys-auth/pam_ldap/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
 <maintainer>
 <email>pam-bugs@gentoo.org</email>
 </maintainer>
diff --git a/sys-auth/pam_mktemp/metadata.xml b/sys-auth/pam_mktemp/metadata.xml
index 1cafb2c2d13d..e8a84d6583a1 100644
--- a/sys-auth/pam_mktemp/metadata.xml
+++ b/sys-auth/pam_mktemp/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
 <maintainer>
 <email>swegener@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>pam-bugs@gentoo.org</email>
+<name>Pluggable Authentication Method maintenance</name>
+</maintainer>
 <use>
 <flag name="prevent-removal">If supported, set EXT2_APPEND_FL on /tmp/.private to prevent temporary directories from being removed</flag>
 </use>
diff --git a/sys-auth/pam_mysql/metadata.xml b/sys-auth/pam_mysql/metadata.xml
index 54820a93fe8c..c5e0a3ac183e 100644
--- a/sys-auth/pam_mysql/metadata.xml
+++ b/sys-auth/pam_mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<use>
 		<flag name="openssl">Use OpenSSL for md5 and sha1 support</flag>
 	</use>
diff --git a/sys-auth/pam_p11/metadata.xml b/sys-auth/pam_p11/metadata.xml
index 241f5bf2327c..5b74bc1b4411 100644
--- a/sys-auth/pam_p11/metadata.xml
+++ b/sys-auth/pam_p11/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
-  <herd>pam</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">opensc</remote-id>
     <remote-id type="github">opensc/pam_p11</remote-id>
diff --git a/sys-auth/pam_passwdqc/metadata.xml b/sys-auth/pam_passwdqc/metadata.xml
index 21d4ed40d84b..cbadff0b3140 100644
--- a/sys-auth/pam_passwdqc/metadata.xml
+++ b/sys-auth/pam_passwdqc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
 <maintainer>
 <email>pam-bugs@gentoo.org</email>
 </maintainer>
diff --git a/sys-auth/pam_pkcs11/metadata.xml b/sys-auth/pam_pkcs11/metadata.xml
index 4b954a4e72f0..714dd5a4bf97 100644
--- a/sys-auth/pam_pkcs11/metadata.xml
+++ b/sys-auth/pam_pkcs11/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
-  <herd>pam</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <use>
     <flag name="pcsc-lite">
       Build the card_eventmanager binary used to detect card removal and lock the sessions. This
diff --git a/sys-auth/pam_radius/metadata.xml b/sys-auth/pam_radius/metadata.xml
index 5cd8bc96fe07..6dcb08bd0760 100644
--- a/sys-auth/pam_radius/metadata.xml
+++ b/sys-auth/pam_radius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <longdescription>
     This is the PAM to RADIUS authentication module. It allows any
     PAM-capable machine to become a RADIUS client for authentication
diff --git a/sys-auth/pam_skey/metadata.xml b/sys-auth/pam_skey/metadata.xml
index f6bcd7962899..ce8bbd0250cb 100644
--- a/sys-auth/pam_skey/metadata.xml
+++ b/sys-auth/pam_skey/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
   <maintainer>
     <email>ulm@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>pam-bugs@gentoo.org</email>
+    <name>Pluggable Authentication Method maintenance</name>
+  </maintainer>
   <upstream>
     <remote-id type="freshmeat">pam_skey</remote-id>
   </upstream>
diff --git a/sys-auth/pam_ssh/metadata.xml b/sys-auth/pam_ssh/metadata.xml
index 66fb0a248b3b..c1b76ff9e16f 100644
--- a/sys-auth/pam_ssh/metadata.xml
+++ b/sys-auth/pam_ssh/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pam</herd>
 	<maintainer>
 		<email>pam-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/pam_ssh_agent_auth/metadata.xml b/sys-auth/pam_ssh_agent_auth/metadata.xml
index aba6c2cb4c1b..c500fa9eafd5 100644
--- a/sys-auth/pam_ssh_agent_auth/metadata.xml
+++ b/sys-auth/pam_ssh_agent_auth/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pam</herd>
 	<maintainer>
 		<email>pam-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/pam_usb/metadata.xml b/sys-auth/pam_usb/metadata.xml
index 9ea5fa40735f..cb5507e979b9 100644
--- a/sys-auth/pam_usb/metadata.xml
+++ b/sys-auth/pam_usb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pam</herd>
+	<maintainer>
+		<email>pam-bugs@gentoo.org</email>
+		<name>Pluggable Authentication Method maintenance</name>
+	</maintainer>
 	<longdescription>
 A PAM module that enables authentication using a USB-Storage device (such as a USB Pen) through DSA private/public keys.
 </longdescription>
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 97d83d57b2d5..6d3b73e7b9e3 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
   <maintainer>
     <email>pam-bugs@gentoo.org</email>
   </maintainer>
diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml
index 23134a29e134..984c90d1e727 100644
--- a/sys-auth/passwdqc/metadata.xml
+++ b/sys-auth/passwdqc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
 <maintainer>
 	<email>pam-bugs@gentoo.org</email>
 </maintainer>
diff --git a/sys-auth/polkit-kde-agent/metadata.xml b/sys-auth/polkit-kde-agent/metadata.xml
index ab3442450edb..3c79bef46a99 100644
--- a/sys-auth/polkit-kde-agent/metadata.xml
+++ b/sys-auth/polkit-kde-agent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/sys-auth/polkit-pkla-compat/metadata.xml b/sys-auth/polkit-pkla-compat/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/sys-auth/polkit-pkla-compat/metadata.xml
+++ b/sys-auth/polkit-pkla-compat/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/polkit-qt/metadata.xml b/sys-auth/polkit-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sys-auth/polkit-qt/metadata.xml
+++ b/sys-auth/polkit-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index 8e318bf1533d..8231229d43d4 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-auth/realtime-base/metadata.xml b/sys-auth/realtime-base/metadata.xml
index af0275e2998a..7ae4362bbf0f 100644
--- a/sys-auth/realtime-base/metadata.xml
+++ b/sys-auth/realtime-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proaudio</herd>
+  <maintainer>
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-auth/thinkfinger/metadata.xml b/sys-auth/thinkfinger/metadata.xml
index b641a547771f..6d9f25ed0d65 100644
--- a/sys-auth/thinkfinger/metadata.xml
+++ b/sys-auth/thinkfinger/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>victor.quicksilver@gmail.com</email>
 	<name>Víctor Enríquez Miguel</name>
@@ -11,6 +10,10 @@
 	<name>Michael Weber</name>
 	<description>Proxy Maintainer</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">ThinkFinger</remote-id>
 </upstream>
diff --git a/sys-auth/ykclient/metadata.xml b/sys-auth/ykclient/metadata.xml
index 7f3c0757e2ad..9f7b97fedbf0 100644
--- a/sys-auth/ykclient/metadata.xml
+++ b/sys-auth/ykclient/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brant@gurganus.name</email>
     <name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
     <name>Diego Elio Pettenò</name>
     <description>Proxy maintainer, CC him on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">yubico-c-client</remote-id>
     <remote-id type="github">Yubico/yubico-c-client</remote-id>
diff --git a/sys-auth/ykpers/metadata.xml b/sys-auth/ykpers/metadata.xml
index 3a896d143b24..29d5977cd59d 100644
--- a/sys-auth/ykpers/metadata.xml
+++ b/sys-auth/ykpers/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>brant@gurganus.name</email>
     <name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
     <name>Diego Elio Pettenò</name>
     <description>Proxy maintainer, CC him on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Yubico/yubikey-personalization</remote-id>
     <bugs-to>https://github.com/Yubico/yubikey-personalization/issues</bugs-to>
diff --git a/sys-block/aoetools/metadata.xml b/sys-block/aoetools/metadata.xml
index 58108bc70edc..7f6fabc18a5a 100644
--- a/sys-block/aoetools/metadata.xml
+++ b/sys-block/aoetools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">aoetools</remote-id>
 </upstream>
diff --git a/sys-block/buffer/metadata.xml b/sys-block/buffer/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/buffer/metadata.xml
+++ b/sys-block/buffer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/devio/metadata.xml b/sys-block/devio/metadata.xml
index b147a1c47f71..4d28393b457f 100644
--- a/sys-block/devio/metadata.xml
+++ b/sys-block/devio/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">devio</remote-id>
 	</upstream>
diff --git a/sys-block/di/metadata.xml b/sys-block/di/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/di/metadata.xml
+++ b/sys-block/di/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/disktype/metadata.xml b/sys-block/disktype/metadata.xml
index f27b7d146f9d..06aa2685c371 100644
--- a/sys-block/disktype/metadata.xml
+++ b/sys-block/disktype/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>forensics</herd>
+  <maintainer>
+    <email>forensics@gentoo.org</email>
+    <name>Gentoo Forensics Project</name>
+  </maintainer>
   <longdescription>
 The purpose of disktype is to detect the content format of a disk or disk image. It knows about common file systems, 
 partition tables, and boot codes.
diff --git a/sys-block/eject-bsd/metadata.xml b/sys-block/eject-bsd/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-block/eject-bsd/metadata.xml
+++ b/sys-block/eject-bsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/eject/metadata.xml b/sys-block/eject/metadata.xml
index 4025f1e9873a..4c1126c7a285 100644
--- a/sys-block/eject/metadata.xml
+++ b/sys-block/eject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">eject</remote-id>
 </upstream>
diff --git a/sys-block/endpoint/metadata.xml b/sys-block/endpoint/metadata.xml
index 6cce6056708c..729b5868319b 100644
--- a/sys-block/endpoint/metadata.xml
+++ b/sys-block/endpoint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	Endpoint turns a Linux machine with one or more firewire cards into an SBP-2
 	device. The advantage is that you can use any file or device the linux
diff --git a/sys-block/fwdl/metadata.xml b/sys-block/fwdl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/fwdl/metadata.xml
+++ b/sys-block/fwdl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/gpart/metadata.xml
+++ b/sys-block/gpart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index e06bfd6639f4..71b3e40b76dc 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>eva@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 	GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
 	copy various filesystems.
diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml
index 21701595e2c8..30e6e49238e4 100644
--- a/sys-block/iscsitarget/metadata.xml
+++ b/sys-block/iscsitarget/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>ryao@gentoo.org</email>
 	<description>Primary maintainer</description>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">iscsitarget</remote-id>
 </upstream>
diff --git a/sys-block/kvpm/metadata.xml b/sys-block/kvpm/metadata.xml
index deeb517dba44..3cc6f16d972e 100644
--- a/sys-block/kvpm/metadata.xml
+++ b/sys-block/kvpm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kvpm</remote-id>
 	</upstream>
diff --git a/sys-block/lio-utils/metadata.xml b/sys-block/lio-utils/metadata.xml
index ed404319e336..89a312bfd0ee 100644
--- a/sys-block/lio-utils/metadata.xml
+++ b/sys-block/lio-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 	Tools for controlling target_core_mod/ConfigFS
 </longdescription>
diff --git a/sys-block/mbuffer/metadata.xml b/sys-block/mbuffer/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/mbuffer/metadata.xml
+++ b/sys-block/mbuffer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/megacli/metadata.xml b/sys-block/megacli/metadata.xml
index 62d09cfb13cf..77921ba5ea20 100644
--- a/sys-block/megacli/metadata.xml
+++ b/sys-block/megacli/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- used by infra, please do not non-maintainer drop -->
-	<herd>sysadmin</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/megactl/metadata.xml b/sys-block/megactl/metadata.xml
index 3591081b02d5..f8e4ad1df5ca 100644
--- a/sys-block/megactl/metadata.xml
+++ b/sys-block/megactl/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- used by infra, please do not non-maintainer drop -->
-	<herd>sysadmin</herd>
+	<maintainer>
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
 	<longdescription>
 This project is a small collection of programs for examining configuration and
 status of LSI megaraid adapters, especially Dell PERC RAID adapters, and
diff --git a/sys-block/mtx/metadata.xml b/sys-block/mtx/metadata.xml
index 982d2043d014..a4f7f5ce1b0d 100644
--- a/sys-block/mtx/metadata.xml
+++ b/sys-block/mtx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">mtx</remote-id>
 </upstream>
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index 3c1ceb90a4ab..7213db31f2a1 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">nbd</remote-id>
 </upstream>
diff --git a/sys-block/noflushd/metadata.xml b/sys-block/noflushd/metadata.xml
index 2cca6b170227..5482cc48bc12 100644
--- a/sys-block/noflushd/metadata.xml
+++ b/sys-block/noflushd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">noflushd</remote-id>
 </upstream>
diff --git a/sys-block/nwutil/metadata.xml b/sys-block/nwutil/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/sys-block/nwutil/metadata.xml
+++ b/sys-block/nwutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 54903f1e1aa0..57a200909c3e 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>livecd</herd>
+	<maintainer>
+		<email>livecd@gentoo.org</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
 	<use>
 		<flag name="device-mapper">
 	Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml
index 330915a57d4d..d692971444e0 100644
--- a/sys-block/partimage/metadata.xml
+++ b/sys-block/partimage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="nologin">Do not include login support when connecting partimaged</flag>
 </use>
diff --git a/sys-block/partitionmanager/metadata.xml b/sys-block/partitionmanager/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sys-block/partitionmanager/metadata.xml
+++ b/sys-block/partitionmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/qla-fc-firmware/metadata.xml b/sys-block/qla-fc-firmware/metadata.xml
index 28df89f0eb13..85c537cb0c96 100644
--- a/sys-block/qla-fc-firmware/metadata.xml
+++ b/sys-block/qla-fc-firmware/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards.
 	This package contains snapshots of firmware releases from the QLogic FTP server. 
diff --git a/sys-block/rtsadmin/metadata.xml b/sys-block/rtsadmin/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/sys-block/rtsadmin/metadata.xml
+++ b/sys-block/rtsadmin/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/smp_utils/metadata.xml b/sys-block/smp_utils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/smp_utils/metadata.xml
+++ b/sys-block/smp_utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/tapecat/metadata.xml b/sys-block/tapecat/metadata.xml
index a1bcb6b31d1d..082c7ae4c6b9 100644
--- a/sys-block/tapecat/metadata.xml
+++ b/sys-block/tapecat/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>app-backup</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-block/targetcli/metadata.xml b/sys-block/targetcli/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/sys-block/targetcli/metadata.xml
+++ b/sys-block/targetcli/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/tgt/metadata.xml b/sys-block/tgt/metadata.xml
index d6e2f863b2c1..49ad26b7ff5e 100644
--- a/sys-block/tgt/metadata.xml
+++ b/sys-block/tgt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 iSCSI Target daemon with rdma support
 	</longdescription>
diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index 80a86e792f04..b9d85cfb6f67 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 A suite of tools for thin provisioning on Linux.
 </longdescription>
diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
index 58108bc70edc..7f6fabc18a5a 100644
--- a/sys-block/vblade/metadata.xml
+++ b/sys-block/vblade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">aoetools</remote-id>
 </upstream>
diff --git a/sys-block/whdd/metadata.xml b/sys-block/whdd/metadata.xml
index 514413068c26..309ffd594d7d 100644
--- a/sys-block/whdd/metadata.xml
+++ b/sys-block/whdd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andrey.krieger.utkin@gmail.com</email>
 		<name>Andrey Utkin</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">krieger-od/whdd</remote-id>
 	</upstream>
diff --git a/sys-boot/aboot/metadata.xml b/sys-boot/aboot/metadata.xml
index 02243bfb3b21..3ad79bf23015 100644
--- a/sys-boot/aboot/metadata.xml
+++ b/sys-boot/aboot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>alpha</herd>
+	<maintainer>
+		<email>alpha@gentoo.org</email>
+		<name>Gentoo Linux Alpha Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aboot</remote-id>
 	</upstream>
diff --git a/sys-boot/arcload/metadata.xml b/sys-boot/arcload/metadata.xml
index 497ed4ea27c6..6dc51953e678 100644
--- a/sys-boot/arcload/metadata.xml
+++ b/sys-boot/arcload/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
+	<maintainer>
+		<email>mips@gentoo.org</email>
+		<name>Gentoo/MIPS Port</name>
+	</maintainer>
 	<longdescription>
 		ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems.
 	</longdescription>
diff --git a/sys-boot/bootcreator/metadata.xml b/sys-boot/bootcreator/metadata.xml
index e75d5a5857f0..c8871ebc60c6 100644
--- a/sys-boot/bootcreator/metadata.xml
+++ b/sys-boot/bootcreator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/colo/metadata.xml b/sys-boot/colo/metadata.xml
index 5d6bc772d93c..798709d7bec3 100644
--- a/sys-boot/colo/metadata.xml
+++ b/sys-boot/colo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
 	<maintainer>
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
diff --git a/sys-boot/cromwell-bin/metadata.xml b/sys-boot/cromwell-bin/metadata.xml
index d4df99f68ee2..8271b107d8d8 100644
--- a/sys-boot/cromwell-bin/metadata.xml
+++ b/sys-boot/cromwell-bin/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Xbox boot loader (prebuilt binary)</longdescription>
   <upstream>
     <remote-id type="sourceforge">xbox-linux</remote-id>
diff --git a/sys-boot/cromwell/metadata.xml b/sys-boot/cromwell/metadata.xml
index f09a62b665f7..365681ca8bbe 100644
--- a/sys-boot/cromwell/metadata.xml
+++ b/sys-boot/cromwell/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Xbox boot loader</longdescription>
 </pkgmetadata>
diff --git a/sys-boot/dvhtool/metadata.xml b/sys-boot/dvhtool/metadata.xml
index 9b9d8d219fd3..4f356b3244fd 100644
--- a/sys-boot/dvhtool/metadata.xml
+++ b/sys-boot/dvhtool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mips</herd>
+<maintainer>
+	<email>mips@gentoo.org</email>
+	<name>Gentoo/MIPS Port</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml
index 9b47aaca752f..5fe0cfadf558 100644
--- a/sys-boot/elilo/metadata.xml
+++ b/sys-boot/elilo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ia64</herd>
+	<maintainer>
+		<email>ia64@gentoo.org</email>
+		<name>Gentoo Linux IA-64 Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elilo</remote-id>
 	</upstream>
diff --git a/sys-boot/getdvhoff/metadata.xml b/sys-boot/getdvhoff/metadata.xml
index f10ea09c06f3..8e2400582efb 100644
--- a/sys-boot/getdvhoff/metadata.xml
+++ b/sys-boot/getdvhoff/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
 	<maintainer>
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
diff --git a/sys-boot/gnu-efi/metadata.xml b/sys-boot/gnu-efi/metadata.xml
index 010fc670dacc..2ead529f65f1 100644
--- a/sys-boot/gnu-efi/metadata.xml
+++ b/sys-boot/gnu-efi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ia64</herd>
+	<maintainer>
+		<email>ia64@gentoo.org</email>
+		<name>Gentoo Linux IA-64 Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnu-efi</remote-id>
 	</upstream>
diff --git a/sys-boot/grub-static/metadata.xml b/sys-boot/grub-static/metadata.xml
index 96677fad3cfb..f3ee9135a7bd 100644
--- a/sys-boot/grub-static/metadata.xml
+++ b/sys-boot/grub-static/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>amd64</herd>
+<maintainer>
+	<email>amd64@gentoo.org</email>
+	<name>AMD64 Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 5bf866f402d2..0ff0e77956cd 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer restrict="&gt;=sys-boot/grub-2">
 	<email>floppym@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="device-mapper">
 		Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg>
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index e8bab65c7742..8e3973b30d20 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
 	<flag name="minimal">Do not install the dolilo helper script</flag>
diff --git a/sys-boot/mbr-gpt/metadata.xml b/sys-boot/mbr-gpt/metadata.xml
index 115f26ac8711..082c7ae4c6b9 100644
--- a/sys-boot/mbr-gpt/metadata.xml
+++ b/sys-boot/mbr-gpt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/milo/metadata.xml b/sys-boot/milo/metadata.xml
index 1b9d222defaf..e68d1874442a 100644
--- a/sys-boot/milo/metadata.xml
+++ b/sys-boot/milo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>alpha</herd>
+	<maintainer>
+		<email>alpha@gentoo.org</email>
+		<name>Gentoo Linux Alpha Development</name>
+	</maintainer>
 	<longdescription lang="en">
 		On Intel based PC systems, the BIOS firmware sets up the system and
 		then loads the image to be run from the boot block of a DOS file
diff --git a/sys-boot/nettrom/metadata.xml b/sys-boot/nettrom/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/sys-boot/nettrom/metadata.xml
+++ b/sys-boot/nettrom/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/os-prober/metadata.xml b/sys-boot/os-prober/metadata.xml
index b61c946ee6fa..bffd94783850 100644
--- a/sys-boot/os-prober/metadata.xml
+++ b/sys-boot/os-prober/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>wizzleby@gmail.com</email>
   <name>Locke Shinseiko</name>
@@ -11,4 +10,8 @@
   <name>Jonathan Callen</name>
   <description>Proxy maintainer (CC bugs)</description>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/palo/metadata.xml b/sys-boot/palo/metadata.xml
index ed2a9d8b7fb8..b0b6360013e0 100644
--- a/sys-boot/palo/metadata.xml
+++ b/sys-boot/palo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>hppa</herd>
+<maintainer>
+	<email>hppa@gentoo.org</email>
+	<name>Gentoo Linux HPPA Development</name>
+</maintainer>
 <longdescription>
 The PArisc Linux Loader
 </longdescription>
diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
index 094f65df04d1..853604a761aa 100644
--- a/sys-boot/plymouth/metadata.xml
+++ b/sys-boot/plymouth/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>enrico.tagliavini@gmail.com</email>
 	<name>Enrico Tagliavini</name>
 </maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="gdm">Enables smooth transition to GDM</flag>
 		<flag name="libkms">Provides abstraction to the DRM drivers (intel,
diff --git a/sys-boot/quik/metadata.xml b/sys-boot/quik/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-boot/quik/metadata.xml
+++ b/sys-boot/quik/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/raincoat/metadata.xml b/sys-boot/raincoat/metadata.xml
index 2ee5fe31458f..4dec04161212 100644
--- a/sys-boot/raincoat/metadata.xml
+++ b/sys-boot/raincoat/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Flash the Xbox boot chip</longdescription>
   <upstream>
     <remote-id type="sourceforge">xbox-linux</remote-id>
diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 2f602d1b6ea4..71a92113cf46 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
@@ -12,6 +11,10 @@
                 <name>Stephane Veyret</name>
 		<description>Proxy - Maintainer.CC on bugs</description>
         </maintainer>
+	<maintainer>
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">EFI Boot Manager</longdescription>
 	<longdescription lang="fr">Gestionnaire d'amorçage EFI</longdescription>
 	<use lang="en">
diff --git a/sys-boot/sgibootcd/metadata.xml b/sys-boot/sgibootcd/metadata.xml
index 2ca83237432e..79040895de01 100644
--- a/sys-boot/sgibootcd/metadata.xml
+++ b/sys-boot/sgibootcd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
 	<maintainer>
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
diff --git a/sys-boot/shlilo-lantank/metadata.xml b/sys-boot/shlilo-lantank/metadata.xml
index b9b9fd717504..8cce8d32eb95 100644
--- a/sys-boot/shlilo-lantank/metadata.xml
+++ b/sys-boot/shlilo-lantank/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sh</herd>
+<maintainer>
+	<email>sh@gentoo.org</email>
+	<name>Gentoo Linux SuperH Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/silo/metadata.xml b/sys-boot/silo/metadata.xml
index b9bd3256ea89..4e9cf876a4b2 100644
--- a/sys-boot/silo/metadata.xml
+++ b/sys-boot/silo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sparc</herd>
+<maintainer>
+	<email>sparc@gentoo.org</email>
+	<name>Gentoo Linux SPARC Development</name>
+</maintainer>
 <longdescription>
 SILO is the SPARC/UltraSPARC Improved Loader, a boot loader for sparc similar to LILO.
 </longdescription>
diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index 1f7983c2496f..803b37524c51 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>chithanh@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/yaboot-static/metadata.xml b/sys-boot/yaboot-static/metadata.xml
index f9a5b22fcbec..8278b9b25ff2 100644
--- a/sys-boot/yaboot-static/metadata.xml
+++ b/sys-boot/yaboot-static/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc64</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/yaboot/metadata.xml b/sys-boot/yaboot/metadata.xml
index 271567a4cc7d..6dea01a08918 100644
--- a/sys-boot/yaboot/metadata.xml
+++ b/sys-boot/yaboot/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
-<herd>ppc64</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ampi/metadata.xml b/sys-cluster/ampi/metadata.xml
index 58ee15ee5ec2..8f2678534467 100644
--- a/sys-cluster/ampi/metadata.xml
+++ b/sys-cluster/ampi/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/c3/metadata.xml b/sys-cluster/c3/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/c3/metadata.xml
+++ b/sys-cluster/c3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ccs/metadata.xml b/sys-cluster/ccs/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/ccs/metadata.xml
+++ b/sys-cluster/ccs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 3d82223b3644..ffe5e693ecbc 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
   <maintainer>
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
@@ -12,6 +11,10 @@
     <name>Yixun Lan</name>
     <description>Co Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability.
 </longdescription>
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 21c49dafe746..cc363f3d5494 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<use>
 		<flag name="ampi">Build implementation of MPI on top of Charm++</flag>
 		<flag name="charmdebug">Enable the charm debugger</flag>
diff --git a/sys-cluster/charmdebug/metadata.xml b/sys-cluster/charmdebug/metadata.xml
index 6b1c94c9f6e6..2d3b216a5efa 100644
--- a/sys-cluster/charmdebug/metadata.xml
+++ b/sys-cluster/charmdebug/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/classads/metadata.xml b/sys-cluster/classads/metadata.xml
index 67a96e6a98a2..2cfe744b70eb 100644
--- a/sys-cluster/classads/metadata.xml
+++ b/sys-cluster/classads/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
 <maintainer>
   <email>bicatali@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>cluster@gentoo.org</email>
+  <name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription lang="en">
   Classified Advertisements (classads) are the lingua franca of
   Condor. They are used for describing jobs, workstations, and other
diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index 09a6c407e1c1..4c58e12fbb1e 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
 	<use>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
diff --git a/sys-cluster/cman-lib/metadata.xml b/sys-cluster/cman-lib/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/cman-lib/metadata.xml
+++ b/sys-cluster/cman-lib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/cman/metadata.xml b/sys-cluster/cman/metadata.xml
index 13ca99f343a2..1b0c74dc8d91 100644
--- a/sys-cluster/cman/metadata.xml
+++ b/sys-cluster/cman/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Manager</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml
index 28abf004bf72..e071a0b42e26 100644
--- a/sys-cluster/corosync/metadata.xml
+++ b/sys-cluster/corosync/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin Johnson</name>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="infiniband">Enable Infiniband RDMA transport support</flag>
 	</use>
diff --git a/sys-cluster/crmsh/metadata.xml b/sys-cluster/crmsh/metadata.xml
index 3aadfb53ff27..da5689d9f098 100644
--- a/sys-cluster/crmsh/metadata.xml
+++ b/sys-cluster/crmsh/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">crmsh/crmsh</remote-id>
   </upstream>
diff --git a/sys-cluster/csync2/metadata.xml b/sys-cluster/csync2/metadata.xml
index 55dd68aadc97..d3fa01923c85 100644
--- a/sys-cluster/csync2/metadata.xml
+++ b/sys-cluster/csync2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/dlm-lib/metadata.xml b/sys-cluster/dlm-lib/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/dlm-lib/metadata.xml
+++ b/sys-cluster/dlm-lib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/dlm/metadata.xml b/sys-cluster/dlm/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/dlm/metadata.xml
+++ b/sys-cluster/dlm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/drbd-kernel/metadata.xml b/sys-cluster/drbd-kernel/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/drbd-kernel/metadata.xml
+++ b/sys-cluster/drbd-kernel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 5c77092344f3..4554b695c1e8 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+  		<email>cluster@gentoo.org</email>
+  		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
   		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
index 5c77092344f3..4554b695c1e8 100644
--- a/sys-cluster/drbd/metadata.xml
+++ b/sys-cluster/drbd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+  		<email>cluster@gentoo.org</email>
+  		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
   		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
diff --git a/sys-cluster/fake/metadata.xml b/sys-cluster/fake/metadata.xml
index 0d325191f88a..9dc0266d4895 100644
--- a/sys-cluster/fake/metadata.xml
+++ b/sys-cluster/fake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 Fake has been designed to switch in backup servers on a LAN. In particular it has 
 been designed to backup Mail, Web and Proxy servers during periods of both 
diff --git a/sys-cluster/feedbackd-agent/metadata.xml b/sys-cluster/feedbackd-agent/metadata.xml
index dfc0fe502816..c08e23b18817 100644
--- a/sys-cluster/feedbackd-agent/metadata.xml
+++ b/sys-cluster/feedbackd-agent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">feedbackd</remote-id>
 	</upstream>
diff --git a/sys-cluster/feedbackd-master/metadata.xml b/sys-cluster/feedbackd-master/metadata.xml
index 17c73f3b8f21..3e71fa85b600 100644
--- a/sys-cluster/feedbackd-master/metadata.xml
+++ b/sys-cluster/feedbackd-master/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
     Feedbackd is an add-on to the Linux Virtual Server project (LVS) to provide dynamic feedback of server health.
   </longdescription>
diff --git a/sys-cluster/fence-agents/metadata.xml b/sys-cluster/fence-agents/metadata.xml
index 392a5958b59d..9634da50be61 100644
--- a/sys-cluster/fence-agents/metadata.xml
+++ b/sys-cluster/fence-agents/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>Cluster Fencing Agents</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/galera/metadata.xml b/sys-cluster/galera/metadata.xml
index b4af621f040a..f7a7363751dc 100644
--- a/sys-cluster/galera/metadata.xml
+++ b/sys-cluster/galera/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>mysql</herd>
+  <maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
   <use>
     <flag name="garbd">Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
   </use>
diff --git a/sys-cluster/ganglia-web/metadata.xml b/sys-cluster/ganglia-web/metadata.xml
index e6685629582f..31aa20b3f611 100644
--- a/sys-cluster/ganglia-web/metadata.xml
+++ b/sys-cluster/ganglia-web/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ganglia</remote-id>
 	</upstream>
diff --git a/sys-cluster/ganglia/metadata.xml b/sys-cluster/ganglia/metadata.xml
index e6685629582f..31aa20b3f611 100644
--- a/sys-cluster/ganglia/metadata.xml
+++ b/sys-cluster/ganglia/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ganglia</remote-id>
 	</upstream>
diff --git a/sys-cluster/gearmand/metadata.xml b/sys-cluster/gearmand/metadata.xml
index 9efee3599098..a868a195914d 100644
--- a/sys-cluster/gearmand/metadata.xml
+++ b/sys-cluster/gearmand/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pavel.stratil-jun@fenix.cz</email>
     <description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="memcache">
       Support memcache daemon (via <pkg>dev-libs/libmemcached</pkg>)
diff --git a/sys-cluster/gfs-kernel/metadata.xml b/sys-cluster/gfs-kernel/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/gfs-kernel/metadata.xml
+++ b/sys-cluster/gfs-kernel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index f994b7843b52..b019e330c0b7 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription lang="en">
 		GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance.
 	</longdescription>
diff --git a/sys-cluster/heartbeat/metadata.xml b/sys-cluster/heartbeat/metadata.xml
index 25095c392e31..fadde285ed95 100644
--- a/sys-cluster/heartbeat/metadata.xml
+++ b/sys-cluster/heartbeat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   
   <longdescription>
     Heartbeat is a cluster manager to handle failover of 2 nodes.
diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index 081af556e9a2..5acd99b6e51f 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ipvsadm/metadata.xml b/sys-cluster/ipvsadm/metadata.xml
index c59d5f8c5323..72bf81c9e4f6 100644
--- a/sys-cluster/ipvsadm/metadata.xml
+++ b/sys-cluster/ipvsadm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   
   <longdescription>
     Administration tools for linux virtual server clusters
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 9baee71ae0a4..6e755d45fd43 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 		VRRP2 implementation. Used for setting up high availability clusters.
 	</longdescription>
diff --git a/sys-cluster/knem/metadata.xml b/sys-cluster/knem/metadata.xml
index a64f2d240d92..d693a88780ae 100644
--- a/sys-cluster/knem/metadata.xml
+++ b/sys-cluster/knem/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/libccs-perl/metadata.xml b/sys-cluster/libccs-perl/metadata.xml
index 8f013ae296ea..6b2a6a9cd90f 100644
--- a/sys-cluster/libccs-perl/metadata.xml
+++ b/sys-cluster/libccs-perl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Configuration System Library Perl-Bindings</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/libccs/metadata.xml b/sys-cluster/libccs/metadata.xml
index 70d5e9131e5e..7a8f11d39405 100644
--- a/sys-cluster/libccs/metadata.xml
+++ b/sys-cluster/libccs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Configuration System Library</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/libcircle/metadata.xml b/sys-cluster/libcircle/metadata.xml
index b3a83b96a3a2..34f1854db142 100644
--- a/sys-cluster/libcircle/metadata.xml
+++ b/sys-cluster/libcircle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hpc/libcircle</remote-id>
 	</upstream>
diff --git a/sys-cluster/libcman/metadata.xml b/sys-cluster/libcman/metadata.xml
index db8831ecb877..1fdd6dfecf03 100644
--- a/sys-cluster/libcman/metadata.xml
+++ b/sys-cluster/libcman/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Manager Library</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/libdlm/metadata.xml b/sys-cluster/libdlm/metadata.xml
index 3bc3e23c0cf2..34c0891dbff4 100644
--- a/sys-cluster/libdlm/metadata.xml
+++ b/sys-cluster/libdlm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>General-purpose Distributed Lock Manager Library</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/libfence/metadata.xml b/sys-cluster/libfence/metadata.xml
index 306b9dcf4bcd..68975f5a71ce 100644
--- a/sys-cluster/libfence/metadata.xml
+++ b/sys-cluster/libfence/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Cluster Fencing Library</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/liblogthread/metadata.xml b/sys-cluster/liblogthread/metadata.xml
index cb158c07e52f..bf4419e79505 100644
--- a/sys-cluster/liblogthread/metadata.xml
+++ b/sys-cluster/liblogthread/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Thread-Safe Syslog Logging Library</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/libqb/metadata.xml b/sys-cluster/libqb/metadata.xml
index c856cec9fa6a..45147b714d34 100644
--- a/sys-cluster/libqb/metadata.xml
+++ b/sys-cluster/libqb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">asalkeld/libqb</remote-id>
 	</upstream>
diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 119d0fde1940..14166e8bf282 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/lspbs/metadata.xml b/sys-cluster/lspbs/metadata.xml
index 54532ab0d9db..1e5683fe9024 100644
--- a/sys-cluster/lspbs/metadata.xml
+++ b/sys-cluster/lspbs/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>j.spadavecchia@ed.ac.uk</email>
     <name>Joseph Spadavecchia</name>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Lspbs is a lightweight alternative to the xpbsmon utility, which
     is part of the OpenPBS package.  It uses the color xterm to
diff --git a/sys-cluster/maui/metadata.xml b/sys-cluster/maui/metadata.xml
index 2d85b047fcca..9530f7630848 100644
--- a/sys-cluster/maui/metadata.xml
+++ b/sys-cluster/maui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="pbs">Enable pbs integration</flag>
     <flag name="slurm">Enable slurm integration</flag>
diff --git a/sys-cluster/moosefs/metadata.xml b/sys-cluster/moosefs/metadata.xml
index a30ead46985e..e96cd8de2170 100644
--- a/sys-cluster/moosefs/metadata.xml
+++ b/sys-cluster/moosefs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>MooseFS is a fault tolerant, network distributed file system.
 	It spreads data over several physical servers which are visible to the user as one resource.
 	For standard file operations MooseFS acts as other Unix-alike file systems
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
index 15c9c45ab1a5..f71de39ba67d 100644
--- a/sys-cluster/mpe2/metadata.xml
+++ b/sys-cluster/mpe2/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
 	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 1738cc60e6e8..8a8f0c342616 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
@@ -11,6 +10,10 @@
 		<name>Pavan Balaji</name>
 		<description>Upstream Contact</description>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name="romio">Build the ROMIO MPI-IO component</flag>
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 9d7273bf3684..fa69d682eddc 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="romio">Enable romio, a high-performance portable MPI-IO
 	implementation</flag>
diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
index 90e009179ab6..ec7db4199ca8 100644
--- a/sys-cluster/mvapich2/metadata.xml
+++ b/sys-cluster/mvapich2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
 </longdescription>
diff --git a/sys-cluster/native-mpi/metadata.xml b/sys-cluster/native-mpi/metadata.xml
index a70357e10dd8..d36a63b26814 100644
--- a/sys-cluster/native-mpi/metadata.xml
+++ b/sys-cluster/native-mpi/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-	<maintainer>
+<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml
index 8854aa52bc87..93b3c17cda7e 100644
--- a/sys-cluster/neutron/metadata.xml
+++ b/sys-cluster/neutron/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Just like OpenStack Nova provides an API to dynamically request and
 	configure virtual servers, Neutron provides an API to dynamically request
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index fe91ad55627d..ea6a44be18ad 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Nova is a cloud computing fabric controller
 	(the main part of an IaaS system). It is written in Python.
diff --git a/sys-cluster/ocfs/metadata.xml b/sys-cluster/ocfs/metadata.xml
index 4c8ea30a627d..594ad2f6aa7e 100644
--- a/sys-cluster/ocfs/metadata.xml
+++ b/sys-cluster/ocfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <use>
 	<flag name="aio">Add aio support</flag>
 </use>
diff --git a/sys-cluster/onesis/metadata.xml b/sys-cluster/onesis/metadata.xml
index e7c33620d4d9..6b3a37ccfeb2 100644
--- a/sys-cluster/onesis/metadata.xml
+++ b/sys-cluster/onesis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">onesis</remote-id>
 	</upstream>
diff --git a/sys-cluster/open-mx/metadata.xml b/sys-cluster/open-mx/metadata.xml
index a64f2d240d92..d693a88780ae 100644
--- a/sys-cluster/open-mx/metadata.xml
+++ b/sys-cluster/open-mx/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/openais/metadata.xml b/sys-cluster/openais/metadata.xml
index e1b15c2588a1..d4dfb99e5828 100644
--- a/sys-cluster/openais/metadata.xml
+++ b/sys-cluster/openais/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 		The OpenAIS Standards Based Cluster Framework is an OSI Certified implementation of 
 		the Service Availability Forum Application Interface Specification (AIS). 
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 3206bddea907..42cfaecfa5b0 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
 		<flag name="cuda">Add GPU direct support</flag>
diff --git a/sys-cluster/osc-mpiexec/metadata.xml b/sys-cluster/osc-mpiexec/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/osc-mpiexec/metadata.xml
+++ b/sys-cluster/osc-mpiexec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/pacemaker-gui/metadata.xml b/sys-cluster/pacemaker-gui/metadata.xml
index 44a5e4b0e806..ff7d9839002c 100644
--- a/sys-cluster/pacemaker-gui/metadata.xml
+++ b/sys-cluster/pacemaker-gui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Pacemaker python GUI and management daemon</longdescription>
 	<use>
 		<flag name="heartbeat">Enable support for heartbeat based <pkg>sys-cluster/pacemaker</pkg>.</flag>
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index a841b6df7fb2..136eaf4e80ac 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>Pacemaker is a cluster resource manager.
 	  It achieves maximum availability for your cluster services (aka. resources) by detecting and 
 	  recovering from node and resource-level failures by making use of the messaging and membership 
diff --git a/sys-cluster/pbs-python/metadata.xml b/sys-cluster/pbs-python/metadata.xml
index 55dd68aadc97..d3fa01923c85 100644
--- a/sys-cluster/pbs-python/metadata.xml
+++ b/sys-cluster/pbs-python/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/pconsole/metadata.xml b/sys-cluster/pconsole/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/pconsole/metadata.xml
+++ b/sys-cluster/pconsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ploop/metadata.xml b/sys-cluster/ploop/metadata.xml
index 308c5433cf06..40b5591764ed 100644
--- a/sys-cluster/ploop/metadata.xml
+++ b/sys-cluster/ploop/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
 		<description>Primary maintainer, assign bugs to him</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/projections/metadata.xml b/sys-cluster/projections/metadata.xml
index 6b1c94c9f6e6..2d3b216a5efa 100644
--- a/sys-cluster/projections/metadata.xml
+++ b/sys-cluster/projections/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/resource-agents/metadata.xml b/sys-cluster/resource-agents/metadata.xml
index a631e7b4490a..96439df09c7d 100644
--- a/sys-cluster/resource-agents/metadata.xml
+++ b/sys-cluster/resource-agents/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 		Resource agents are a standardized interfaces for a cluster resource. 
 		They translate a standard set of operations into steps specific to 
diff --git a/sys-cluster/rgmanager-agents/metadata.xml b/sys-cluster/rgmanager-agents/metadata.xml
index 9ffcc486c306..d9b64212d275 100644
--- a/sys-cluster/rgmanager-agents/metadata.xml
+++ b/sys-cluster/rgmanager-agents/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>Resource Manager Agents</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/rgmanager/metadata.xml b/sys-cluster/rgmanager/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/rgmanager/metadata.xml
+++ b/sys-cluster/rgmanager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index eecc13020b15..7475197da3b3 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="maui">Enable maui scheduler support</flag>
 		<flag name="munge">Enable authentication via munge</flag>
diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml
index 9f7df66f121e..4691f7e229ef 100644
--- a/sys-cluster/swift/metadata.xml
+++ b/sys-cluster/swift/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
   <use>
     <flag name="account">adds swift account support</flag>
     <flag name="container">adds swift container support</flag>
@@ -13,6 +12,10 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Swift is a highly available, distributed, eventually consistent object/blob
 	store.
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index 703f1e22fac4..bef10f5c1e53 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
   <maintainer>
     <email>jsbronder@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
     <flag name="drmaa">Enable the Distributed Resource Management Application API</flag>
diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml
index 0f3a8f8937ef..80ad91114264 100644
--- a/sys-cluster/vzctl/metadata.xml
+++ b/sys-cluster/vzctl/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
 		<description>Primary maintainer, assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ploop">Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag>
 		<flag name="vzmigrate">Add support for container migration</flag>
diff --git a/sys-cluster/xgridagent/metadata.xml b/sys-cluster/xgridagent/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-cluster/xgridagent/metadata.xml
+++ b/sys-cluster/xgridagent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/autoconf-archive/metadata.xml b/sys-devel/autoconf-archive/metadata.xml
index dbe8ae6a05f3..2546d96d3ffd 100644
--- a/sys-devel/autoconf-archive/metadata.xml
+++ b/sys-devel/autoconf-archive/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>binki@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/autoconf-wrapper/metadata.xml
+++ b/sys-devel/autoconf-wrapper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
index 266cecc39b7c..80d8f3b30c7f 100644
--- a/sys-devel/autoconf/metadata.xml
+++ b/sys-devel/autoconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="multislot">Allow for multiple versions to be installed at once</flag>
 </use>
diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index 382f96aeefec..b6f09cc72c7d 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
  <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
 </use>
diff --git a/sys-devel/automake-wrapper/metadata.xml b/sys-devel/automake-wrapper/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/automake-wrapper/metadata.xml
+++ b/sys-devel/automake-wrapper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/automake/metadata.xml
+++ b/sys-devel/automake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/bc/metadata.xml
+++ b/sys-devel/bc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index 169096d92977..8921609a83e0 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <!--
 	If anyone from base-system wants to be secondary, by all means just add
 	yourself, and send me (boo) a mail telling me that you've done so.
diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index 6b093e5ee839..9a1d0993d197 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 	<use>
 		<flag name="lto">Add support for Link-Time Optimization with LLVM</flag>
 		<flag name="libcxx">Add support for libcxx</flag>
diff --git a/sys-devel/binutils-config/metadata.xml b/sys-devel/binutils-config/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/sys-devel/binutils-config/metadata.xml
+++ b/sys-devel/binutils-config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/binutils-hppa64/metadata.xml b/sys-devel/binutils-hppa64/metadata.xml
index 5707572e2125..2e129ab5ed88 100644
--- a/sys-devel/binutils-hppa64/metadata.xml
+++ b/sys-devel/binutils-hppa64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>hppa</herd>
+<maintainer>
+	<email>hppa@gentoo.org</email>
+	<name>Gentoo Linux HPPA Development</name>
+</maintainer>
 <longdescription>
 binutils for 64bit kernel on hppa.
 </longdescription>
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
index 358908406eaf..251fea11b66a 100644
--- a/sys-devel/binutils/metadata.xml
+++ b/sys-devel/binutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
 <flag name="multislot">Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag>
 <flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag>
diff --git a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/bison/metadata.xml
+++ b/sys-devel/bison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/bmake/metadata.xml b/sys-devel/bmake/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-devel/bmake/metadata.xml
+++ b/sys-devel/bmake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/cons/metadata.xml b/sys-devel/cons/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/cons/metadata.xml
+++ b/sys-devel/cons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index 33d712344513..af0092947413 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
-<herd>toolchain</herd>
 <maintainer>
 <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>embedded@gentoo.org</email>
+<name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 3dcc309a3965..263335b51e40 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Distcc is a program to distribute compilation of C code across several
 		machines on a network.
diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index 19a94b849b32..4b2af91a651e 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">flex</remote-id>
 </upstream>
diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
index 0ab7bb4b1919..022a86ea2950 100644
--- a/sys-devel/gcc-apple/metadata.xml
+++ b/sys-devel/gcc-apple/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prefix</herd>
+  <maintainer>
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
   <use>
     <flag name="multislot">Allow for SLOTs to include minor version (3.3.4
       instead of just 3.3)</flag>
diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index cc551238e2f0..9de83e9816ba 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <use>
     <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
       (AWT) peer support on top of GTK+</flag>
diff --git a/sys-devel/gdb-apple/metadata.xml b/sys-devel/gdb-apple/metadata.xml
index 4561e552bd04..4609b17cbb97 100644
--- a/sys-devel/gdb-apple/metadata.xml
+++ b/sys-devel/gdb-apple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index 13175e49795c..6bbd2d46fa1c 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
  <flag name="client">Install the main "gdb" program (most people want this)</flag>
  <flag name="lzma">Support lzma compression in ELF debug info</flag>
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 41b365812e18..16dfb64057b2 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="cvs">
 		When running `autopoint`, use cvs to store the internal development files;
diff --git a/sys-devel/gnuconfig/metadata.xml b/sys-devel/gnuconfig/metadata.xml
index d07918bf1603..b80edf63f188 100644
--- a/sys-devel/gnuconfig/metadata.xml
+++ b/sys-devel/gnuconfig/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 Updated config.{sub,guess} files from upstream cvs to properly detect various system types.
 </longdescription>
diff --git a/sys-devel/icecream/metadata.xml b/sys-devel/icecream/metadata.xml
index 64c49c8ac03e..8070ee3cdb86 100644
--- a/sys-devel/icecream/metadata.xml
+++ b/sys-devel/icecream/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<herd>suse</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<maintainer>
+		<email>suse@gentoo.org</email>
+		<name>SUSE</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">icecc/icecream</remote-id>
 	</upstream>
diff --git a/sys-devel/kgcc64/metadata.xml b/sys-devel/kgcc64/metadata.xml
index fdf55d40f23c..4bfafd3152ee 100644
--- a/sys-devel/kgcc64/metadata.xml
+++ b/sys-devel/kgcc64/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
 <flag name="multislot">Allow for SLOTs to include minor version (eg. 3.3.4 instead
 of just 3.3)</flag>
diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/libtool/metadata.xml
+++ b/sys-devel/libtool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/make/metadata.xml
+++ b/sys-devel/make/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/native-cctools/metadata.xml b/sys-devel/native-cctools/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/sys-devel/native-cctools/metadata.xml
+++ b/sys-devel/native-cctools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-devel/patch/metadata.xml
+++ b/sys-devel/patch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/pmake/metadata.xml b/sys-devel/pmake/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-devel/pmake/metadata.xml
+++ b/sys-devel/pmake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/prelink/metadata.xml b/sys-devel/prelink/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/sys-devel/prelink/metadata.xml
+++ b/sys-devel/prelink/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml
index 40a2d8a58931..a8f008449999 100644
--- a/sys-devel/remake/metadata.xml
+++ b/sys-devel/remake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">bashdb</remote-id>
 </upstream>
diff --git a/sys-devel/smatch/metadata.xml b/sys-devel/smatch/metadata.xml
index 1ac6ac5142d4..bd1a11b2f394 100644
--- a/sys-devel/smatch/metadata.xml
+++ b/sys-devel/smatch/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">smatch</remote-id>
 	</upstream>
diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index acfc7ff94c83..902c3f19cee4 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
-  <herd>toolchain</herd>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <use>
     <flag name="gtk">
       Build the test-inspect utility (requires
diff --git a/sys-devel/ucpp/metadata.xml b/sys-devel/ucpp/metadata.xml
index 2319632d6e2f..2398f27ad8e9 100644
--- a/sys-devel/ucpp/metadata.xml
+++ b/sys-devel/ucpp/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
-	<herd>sci</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/alsa-firmware/metadata.xml b/sys-firmware/alsa-firmware/metadata.xml
index 8987e55f2c06..f16125d4f480 100644
--- a/sys-firmware/alsa-firmware/metadata.xml
+++ b/sys-firmware/alsa-firmware/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>alsa</herd>
 <maintainer>
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
diff --git a/sys-firmware/amdgpu-ucode/metadata.xml b/sys-firmware/amdgpu-ucode/metadata.xml
index 5229625eab8b..21e95370563e 100644
--- a/sys-firmware/amdgpu-ucode/metadata.xml
+++ b/sys-firmware/amdgpu-ucode/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="legacy">Install firmware for older chipsets which are optionally supported by AMDGPU</flag>
 	</use>
diff --git a/sys-firmware/ivtv-firmware/metadata.xml b/sys-firmware/ivtv-firmware/metadata.xml
index fd181aef8957..0146ca0366e3 100644
--- a/sys-firmware/ivtv-firmware/metadata.xml
+++ b/sys-firmware/ivtv-firmware/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/radeon-ucode/metadata.xml b/sys-firmware/radeon-ucode/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/sys-firmware/radeon-ucode/metadata.xml
+++ b/sys-firmware/radeon-ucode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
index 0c7c58588c2e..cbe72bbc87bd 100644
--- a/sys-firmware/seabios/metadata.xml
+++ b/sys-firmware/seabios/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qemu</herd>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Use official upstream pre-built binaries</flag>
 		<flag name="seavgabios">Include SeaVGABIOS binaries (replacement for vgabios)</flag>
diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
index ab3fa2a01e23..ef17a29ac51c 100644
--- a/sys-firmware/sgabios/metadata.xml
+++ b/sys-firmware/sgabios/metadata.xml
@@ -5,5 +5,8 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>qemu</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
index 2f1e0cd35a24..d0c81e19848b 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
+++ b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="binary">Use official upstream pre-built binaries</flag>
 </use>
diff --git a/sys-firmware/tt-s2-6400-firmware/metadata.xml b/sys-firmware/tt-s2-6400-firmware/metadata.xml
index 94d2eca26f15..18bf54be7ee8 100644
--- a/sys-firmware/tt-s2-6400-firmware/metadata.xml
+++ b/sys-firmware/tt-s2-6400-firmware/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
index c15323fe0db0..2fa6ec138bcb 100644
--- a/sys-firmware/vgabios/metadata.xml
+++ b/sys-firmware/vgabios/metadata.xml
@@ -5,7 +5,10 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>qemu</herd>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Use official upstream pre-built binaries (only default and cirrus images)</flag>
 	</use>
diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml
index 3c2bff971e2e..23c5c4c70de1 100644
--- a/sys-freebsd/boot0/metadata.xml
+++ b/sys-freebsd/boot0/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="tftp">Enable PXE/TFTP boot support.</flag>
     <flag name="zfs">Enable booting on ZFS filesystems.</flag>
diff --git a/sys-freebsd/freebsd-bin/metadata.xml b/sys-freebsd/freebsd-bin/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-bin/metadata.xml
+++ b/sys-freebsd/freebsd-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-cddl/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-cddl/metadata.xml
+++ b/sys-freebsd/freebsd-cddl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-contrib/metadata.xml b/sys-freebsd/freebsd-contrib/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-contrib/metadata.xml
+++ b/sys-freebsd/freebsd-contrib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml
index a8bb7458f048..3ab634b7d391 100644
--- a/sys-freebsd/freebsd-lib/metadata.xml
+++ b/sys-freebsd/freebsd-lib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="hesiod">Enable support for net-dns/hesiod</flag>
     <flag name="netware">
diff --git a/sys-freebsd/freebsd-libexec/metadata.xml b/sys-freebsd/freebsd-libexec/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-libexec/metadata.xml
+++ b/sys-freebsd/freebsd-libexec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-mk-defs/metadata.xml b/sys-freebsd/freebsd-mk-defs/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-mk-defs/metadata.xml
+++ b/sys-freebsd/freebsd-mk-defs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-pam-modules/metadata.xml b/sys-freebsd/freebsd-pam-modules/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-pam-modules/metadata.xml
+++ b/sys-freebsd/freebsd-pam-modules/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-pf/metadata.xml b/sys-freebsd/freebsd-pf/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-freebsd/freebsd-pf/metadata.xml
+++ b/sys-freebsd/freebsd-pf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml
index d292982b40de..1030da7d4247 100644
--- a/sys-freebsd/freebsd-rescue/metadata.xml
+++ b/sys-freebsd/freebsd-rescue/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="zfs">Enable ZFS support.</flag>
     <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag>
diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
index 0c76683c7ad5..5378f2002a69 100644
--- a/sys-freebsd/freebsd-sbin/metadata.xml
+++ b/sys-freebsd/freebsd-sbin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="ipfilter">
       Build tools to administer the ipfilter firewall.
diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
index 14db355a58b7..094d0d1f8e75 100644
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ b/sys-freebsd/freebsd-share/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
 	<flag name="isdn">Enable ISDN support</flag>
     <flag name="zfs">Enable ZFS support.</flag>
diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml
index e8793d127f81..c480c14383e0 100644
--- a/sys-freebsd/freebsd-sources/metadata.xml
+++ b/sys-freebsd/freebsd-sources/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="build-kernel">Build and install a kernel (recommended).</flag>
     <flag name="dtrace">Enable DTrace support.</flag>
diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml
index c0670fc4ec98..6bfc362e1ab6 100644
--- a/sys-freebsd/freebsd-ubin/metadata.xml
+++ b/sys-freebsd/freebsd-ubin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="audit">
       Build auditing tools.
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
index 89b41c1478af..97b586d119d6 100644
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ b/sys-freebsd/freebsd-usbin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
     <flag name="audit">
diff --git a/sys-fs/arm-fdisk/metadata.xml b/sys-fs/arm-fdisk/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/sys-fs/arm-fdisk/metadata.xml
+++ b/sys-fs/arm-fdisk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/autorun/metadata.xml b/sys-fs/autorun/metadata.xml
index 8bcffd6d6a8a..76157a6c50c2 100644
--- a/sys-fs/autorun/metadata.xml
+++ b/sys-fs/autorun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">autorun</remote-id>
 </upstream>
diff --git a/sys-fs/avfs/metadata.xml b/sys-fs/avfs/metadata.xml
index 26d3015a0b2e..27b688c32cec 100644
--- a/sys-fs/avfs/metadata.xml
+++ b/sys-fs/avfs/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pete4abw@comcast.net</email>
     <name>Peter Hyman</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">avf</remote-id>
   </upstream>
diff --git a/sys-fs/cramfs/metadata.xml b/sys-fs/cramfs/metadata.xml
index b63efc3d3b79..41583e0b46ac 100644
--- a/sys-fs/cramfs/metadata.xml
+++ b/sys-fs/cramfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">cramfs</remote-id>
 </upstream>
diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 1dbe202d27f0..59cc82bdcfcb 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
 	<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/dd-rescue/metadata.xml
+++ b/sys-fs/dd-rescue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/devfsd/metadata.xml b/sys-fs/devfsd/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/devfsd/metadata.xml
+++ b/sys-fs/devfsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 13d6b39cda16..7d9e58028126 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
 <maintainer>
 <email>josejx@gentoo.org</email>
 <name>Joseph Jezak</name>
 </maintainer>
+<maintainer>
+<email>ppc@gentoo.org</email>
+<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 <longdescription lang="en">
 HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
 versions.
diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml
index 18b079652c0e..8d19af5dfd76 100644
--- a/sys-fs/dmg2img/metadata.xml
+++ b/sys-fs/dmg2img/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>josejx@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 	dmg2img is an application that can convert .dmg files, popular on Mac OSX
 	systems, to HFS+ disk images, suitable for mounting on Linux systems.
diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index 232be8c76395..8c281cb0e557 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="github">dosfstools/dosfstools</remote-id>
 </upstream>
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 3f0c2e100593..064648ea37e3 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
diff --git a/sys-fs/e2tools/metadata.xml b/sys-fs/e2tools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/e2tools/metadata.xml
+++ b/sys-fs/e2tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/ecryptfs-utils/metadata.xml b/sys-fs/ecryptfs-utils/metadata.xml
index 8a71e7a160ef..1047fe2fdf7b 100644
--- a/sys-fs/ecryptfs-utils/metadata.xml
+++ b/sys-fs/ecryptfs-utils/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> key module</flag>
 		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> key
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index f64d26db4a6d..67d30617dcf6 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
 <maintainer>
 	<email>floppym@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="google-code">exfat</remote-id>
 	<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 3ae36b5a4189..fd3a36e345e8 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gokturk@binghamton.edu</email>
 		<name>Gokturk 'gokturk' Yuksek</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="expert-mode">Builds ext4magic with expert mode. Highly useful in recovering data from a corrupted filesystem</flag>
 		<flag name="file-attr">Enable the recovery of file attributes (append, immutable, nodump etc)</flag>
diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
index 4e12c0483bb5..1c8d47682a30 100644
--- a/sys-fs/extundelete/metadata.xml
+++ b/sys-fs/extundelete/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">extundelete</remote-id>
 </upstream>
diff --git a/sys-fs/fur/metadata.xml b/sys-fs/fur/metadata.xml
index b7fb13fcc09a..942d1d0bc954 100644
--- a/sys-fs/fur/metadata.xml
+++ b/sys-fs/fur/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pda</herd>
   <use>
     <flag name="void-chmod">Enable fake hook for "chmod" that will only return 0</flag>
   </use>
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index f64d26db4a6d..67d30617dcf6 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
 <maintainer>
 	<email>floppym@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="google-code">exfat</remote-id>
 	<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index 1d274435d915..a5d07b12ab65 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
   <maintainer>
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
diff --git a/sys-fs/fuse4bsd/metadata.xml b/sys-fs/fuse4bsd/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-fs/fuse4bsd/metadata.xml
+++ b/sys-fs/fuse4bsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/fuseiso/metadata.xml b/sys-fs/fuseiso/metadata.xml
index 9e127fd06435..b6e4f90f094c 100644
--- a/sys-fs/fuseiso/metadata.xml
+++ b/sys-fs/fuseiso/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>zhaoxiaoqiang007@gmail.com</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuseiso</remote-id>
 	</upstream>
diff --git a/sys-fs/genext2fs/metadata.xml b/sys-fs/genext2fs/metadata.xml
index 039dac4acd36..a55c404d1fc6 100644
--- a/sys-fs/genext2fs/metadata.xml
+++ b/sys-fs/genext2fs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dev-embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">genext2fs</remote-id>
 	</upstream>
diff --git a/sys-fs/gfs2-utils/metadata.xml b/sys-fs/gfs2-utils/metadata.xml
index 71656942007a..8a2a13a9b765 100644
--- a/sys-fs/gfs2-utils/metadata.xml
+++ b/sys-fs/gfs2-utils/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>GFS2 Utilities</longdescription>
 </pkgmetadata>
diff --git a/sys-fs/hfsplusutils/metadata.xml b/sys-fs/hfsplusutils/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-fs/hfsplusutils/metadata.xml
+++ b/sys-fs/hfsplusutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/hfsutils/metadata.xml b/sys-fs/hfsutils/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-fs/hfsutils/metadata.xml
+++ b/sys-fs/hfsutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/iprutils/metadata.xml b/sys-fs/iprutils/metadata.xml
index fc39b7328154..29a92f5c014c 100644
--- a/sys-fs/iprutils/metadata.xml
+++ b/sys-fs/iprutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">iprdd</remote-id>
 	</upstream>
diff --git a/sys-fs/jdiskreport-bin/metadata.xml b/sys-fs/jdiskreport-bin/metadata.xml
index 9df3e92f25af..4a85d8a209f5 100644
--- a/sys-fs/jdiskreport-bin/metadata.xml
+++ b/sys-fs/jdiskreport-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		JDiskReport enables you to understand how much space the files and
 		directories consume on your disk drives, and it helps you find obsolete
diff --git a/sys-fs/lde/metadata.xml b/sys-fs/lde/metadata.xml
index 5c165c26dfe9..e00243210f5d 100644
--- a/sys-fs/lde/metadata.xml
+++ b/sys-fs/lde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">lde</remote-id>
 </upstream>
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 94c55ab280ba..cd635aaa8d05 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="extra-ciphers">Enable extra ciphers</flag>
 		<flag name="keyscrub">Protects the encryption key in memory but takes
diff --git a/sys-fs/lsscsi/metadata.xml b/sys-fs/lsscsi/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/lsscsi/metadata.xml
+++ b/sys-fs/lsscsi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/lufis/metadata.xml b/sys-fs/lufis/metadata.xml
index e93f1bcba449..3cde2c779d34 100644
--- a/sys-fs/lufis/metadata.xml
+++ b/sys-fs/lufis/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
   <upstream>
     <remote-id type="sourceforge">fuse</remote-id>
   </upstream>
diff --git a/sys-fs/lufs/metadata.xml b/sys-fs/lufs/metadata.xml
index e5e3de083f3e..882ef8994c6a 100644
--- a/sys-fs/lufs/metadata.xml
+++ b/sys-fs/lufs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">lufs</remote-id>
 </upstream>
diff --git a/sys-fs/mac-fdisk/metadata.xml b/sys-fs/mac-fdisk/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-fs/mac-fdisk/metadata.xml
+++ b/sys-fs/mac-fdisk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/mdadm/metadata.xml b/sys-fs/mdadm/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/mdadm/metadata.xml
+++ b/sys-fs/mdadm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index d79031dd6db2..b3ec3b5c1c29 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/mtools/metadata.xml
+++ b/sys-fs/mtools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 439306dc586a..e9bc66b9e616 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>chutzpah@gentoo.org</email>
 </maintainer>
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 The ntfs-3g driver is an open source, GPL licensed, third generation Linux 
 NTFS driver for 32-bit, little-endian architectures which was implemented 
diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
index 9260f8b3146e..a8e205d54226 100644
--- a/sys-fs/ocfs2-tools/metadata.xml
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <use>
 	<flag name="external">Enable external locking</flag>
 </use>
diff --git a/sys-fs/progsreiserfs/metadata.xml b/sys-fs/progsreiserfs/metadata.xml
index 24a11a76a063..5a2efc57f90c 100644
--- a/sys-fs/progsreiserfs/metadata.xml
+++ b/sys-fs/progsreiserfs/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 	<description>Maintainer as part of base-system work. Assign bugs to base-system.</description>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/quota/metadata.xml b/sys-fs/quota/metadata.xml
index c9834efbc84a..f604bc81d21c 100644
--- a/sys-fs/quota/metadata.xml
+++ b/sys-fs/quota/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="netlink">Compile daemon receiving quota messages via netlink</flag>
 	<flag name="rpc">Enable quota interaction via RPC</flag>
diff --git a/sys-fs/quotatool/metadata.xml b/sys-fs/quotatool/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/quotatool/metadata.xml
+++ b/sys-fs/quotatool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
index 83d74e13cad1..75b8317687b3 100644
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 This is a library for reiser4 filesystem access and manipulation.
 </longdescription>
diff --git a/sys-fs/reiserfsprogs/metadata.xml b/sys-fs/reiserfsprogs/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/reiserfsprogs/metadata.xml
+++ b/sys-fs/reiserfsprogs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/scan-ffs/metadata.xml b/sys-fs/scan-ffs/metadata.xml
index 9c79e985dd9f..aa2065bf3556 100644
--- a/sys-fs/scan-ffs/metadata.xml
+++ b/sys-fs/scan-ffs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 <longdescription>
 scan_ffs(8) recovers accidential lost or deleted disklabels.
 
diff --git a/sys-fs/siefs/metadata.xml b/sys-fs/siefs/metadata.xml
index f7740ac73b8a..097975e3adc2 100644
--- a/sys-fs/siefs/metadata.xml
+++ b/sys-fs/siefs/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 5613e68b3586..410ebade8c3b 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>livecd</herd>
+  <maintainer>
+    <email>livecd@gentoo.org</email>
+    <name>Gentoo LiveCD Project</name>
+  </maintainer>
   <use>
     <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
     <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
diff --git a/sys-fs/sshfs-fuse/metadata.xml b/sys-fs/sshfs-fuse/metadata.xml
index d91bea8bceb7..5d45e4715683 100644
--- a/sys-fs/sshfs-fuse/metadata.xml
+++ b/sys-fs/sshfs-fuse/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel-misc</herd>
   <maintainer>
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
diff --git a/sys-fs/static-dev/metadata.xml b/sys-fs/static-dev/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/static-dev/metadata.xml
+++ b/sys-fs/static-dev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/sysfsutils/metadata.xml b/sys-fs/sysfsutils/metadata.xml
index 0777cf37585d..0cc112f68130 100644
--- a/sys-fs/sysfsutils/metadata.xml
+++ b/sys-fs/sysfsutils/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>gregkh@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">linux-diag</remote-id>
 </upstream>
diff --git a/sys-fs/traydevice/metadata.xml b/sys-fs/traydevice/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/sys-fs/traydevice/metadata.xml
+++ b/sys-fs/traydevice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
index 16604bf5eead..fcf64559baab 100644
--- a/sys-fs/udftools/metadata.xml
+++ b/sys-fs/udftools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">linux-udf</remote-id>
 </upstream>
diff --git a/sys-fs/udiskie/metadata.xml b/sys-fs/udiskie/metadata.xml
index 41657ce3215a..31257a8b614d 100644
--- a/sys-fs/udiskie/metadata.xml
+++ b/sys-fs/udiskie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">udiskie</remote-id>
     <remote-id type="github">coldfix/udiskie</remote-id>
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 87de231a876b..c859ac417627 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-fs/ufsutils/metadata.xml b/sys-fs/ufsutils/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-fs/ufsutils/metadata.xml
+++ b/sys-fs/ufsutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/wpflash/metadata.xml b/sys-fs/wpflash/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/sys-fs/wpflash/metadata.xml
+++ b/sys-fs/wpflash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/xfsdump/metadata.xml
+++ b/sys-fs/xfsdump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/yaffs-utils/metadata.xml b/sys-fs/yaffs-utils/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/sys-fs/yaffs-utils/metadata.xml
+++ b/sys-fs/yaffs-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/yaffs2-utils/metadata.xml b/sys-fs/yaffs2-utils/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/sys-fs/yaffs2-utils/metadata.xml
+++ b/sys-fs/yaffs2-utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/yaffs2utils/metadata.xml b/sys-fs/yaffs2utils/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/sys-fs/yaffs2utils/metadata.xml
+++ b/sys-fs/yaffs2utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-infiniband/compat-dapl/metadata.xml b/sys-infiniband/compat-dapl/metadata.xml
index c4ae6f4a7ac3..15cf7d23c3da 100644
--- a/sys-infiniband/compat-dapl/metadata.xml
+++ b/sys-infiniband/compat-dapl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 uDAPL is a transport neutral infrastructure that provides RDMA capabilities in
 user space.  It is the user space component of DAPL,  the Direct Access Provider
diff --git a/sys-infiniband/dapl/metadata.xml b/sys-infiniband/dapl/metadata.xml
index c4ae6f4a7ac3..15cf7d23c3da 100644
--- a/sys-infiniband/dapl/metadata.xml
+++ b/sys-infiniband/dapl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 uDAPL is a transport neutral infrastructure that provides RDMA capabilities in
 user space.  It is the user space component of DAPL,  the Direct Access Provider
diff --git a/sys-infiniband/ibacm/metadata.xml b/sys-infiniband/ibacm/metadata.xml
index d6f4b86016ac..35b1dd4fe70d 100644
--- a/sys-infiniband/ibacm/metadata.xml
+++ b/sys-infiniband/ibacm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB Userspace CM library
 </longdescription>
diff --git a/sys-infiniband/ibutils/metadata.xml b/sys-infiniband/ibutils/metadata.xml
index c4ae6f4a7ac3..15cf7d23c3da 100644
--- a/sys-infiniband/ibutils/metadata.xml
+++ b/sys-infiniband/ibutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 uDAPL is a transport neutral infrastructure that provides RDMA capabilities in
 user space.  It is the user space component of DAPL,  the Direct Access Provider
diff --git a/sys-infiniband/infiniband-diags/metadata.xml b/sys-infiniband/infiniband-diags/metadata.xml
index 05102b86d144..7e44a6d6d2be 100644
--- a/sys-infiniband/infiniband-diags/metadata.xml
+++ b/sys-infiniband/infiniband-diags/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 OpenIB diagnostic programs and scripts needed to diagnose an IB subnet.
 </longdescription>
diff --git a/sys-infiniband/infinipath-psm/metadata.xml b/sys-infiniband/infinipath-psm/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-infiniband/infinipath-psm/metadata.xml
+++ b/sys-infiniband/infinipath-psm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-infiniband/libcxgb3/metadata.xml b/sys-infiniband/libcxgb3/metadata.xml
index 4e5ec8841023..ab52626caff8 100644
--- a/sys-infiniband/libcxgb3/metadata.xml
+++ b/sys-infiniband/libcxgb3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)
 </longdescription>
diff --git a/sys-infiniband/libcxgb4/metadata.xml b/sys-infiniband/libcxgb4/metadata.xml
index 4e5ec8841023..ab52626caff8 100644
--- a/sys-infiniband/libcxgb4/metadata.xml
+++ b/sys-infiniband/libcxgb4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)
 </longdescription>
diff --git a/sys-infiniband/libehca/metadata.xml b/sys-infiniband/libehca/metadata.xml
index 3276c6fdb95a..c39c3c523830 100644
--- a/sys-infiniband/libehca/metadata.xml
+++ b/sys-infiniband/libehca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB - IBM eServer eHCA Infiniband device driver for Linux on POWER.
 </longdescription>
diff --git a/sys-infiniband/libibcm/metadata.xml b/sys-infiniband/libibcm/metadata.xml
index d6f4b86016ac..35b1dd4fe70d 100644
--- a/sys-infiniband/libibcm/metadata.xml
+++ b/sys-infiniband/libibcm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB Userspace CM library
 </longdescription>
diff --git a/sys-infiniband/libibmad/metadata.xml b/sys-infiniband/libibmad/metadata.xml
index dbc9d5578da7..7154fd9df7e2 100644
--- a/sys-infiniband/libibmad/metadata.xml
+++ b/sys-infiniband/libibmad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB library that provides low layer IB functions for use by the IB diagnostic
 and management programs. These include MAD, SA, SMP, and other basic IB
diff --git a/sys-infiniband/libibumad/metadata.xml b/sys-infiniband/libibumad/metadata.xml
index 4d5e933a14a8..57c457e45e13 100644
--- a/sys-infiniband/libibumad/metadata.xml
+++ b/sys-infiniband/libibumad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB User MAD library functions which sit on top of the user MAD modules in
 the kernel.  These are used by the IB diagnostic and management tools, including
diff --git a/sys-infiniband/libibverbs/metadata.xml b/sys-infiniband/libibverbs/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/libibverbs/metadata.xml
+++ b/sys-infiniband/libibverbs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/libibvpp/metadata.xml b/sys-infiniband/libibvpp/metadata.xml
index 401e270ede58..c539aa6767d1 100644
--- a/sys-infiniband/libibvpp/metadata.xml
+++ b/sys-infiniband/libibvpp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibvpp is a C++ wrapper around libibverbs, which is part of OpenIB.
 </longdescription>
diff --git a/sys-infiniband/libipathverbs/metadata.xml b/sys-infiniband/libipathverbs/metadata.xml
index 1cce96be7b24..1ecc23b69e76 100644
--- a/sys-infiniband/libipathverbs/metadata.xml
+++ b/sys-infiniband/libipathverbs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libipathverbs is a userspace driver for QLogic InfiniBand HCAs.  It works as a
 plug-in module for libibverbs that allows programs to use QLogic HCAs directly
diff --git a/sys-infiniband/libmlx4/metadata.xml b/sys-infiniband/libmlx4/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/libmlx4/metadata.xml
+++ b/sys-infiniband/libmlx4/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/libmlx5/metadata.xml b/sys-infiniband/libmlx5/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/sys-infiniband/libmlx5/metadata.xml
+++ b/sys-infiniband/libmlx5/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-infiniband/libmthca/metadata.xml b/sys-infiniband/libmthca/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/libmthca/metadata.xml
+++ b/sys-infiniband/libmthca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/libnes/metadata.xml b/sys-infiniband/libnes/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/libnes/metadata.xml
+++ b/sys-infiniband/libnes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/libocrdma/metadata.xml b/sys-infiniband/libocrdma/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/libocrdma/metadata.xml
+++ b/sys-infiniband/libocrdma/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/librdmacm/metadata.xml b/sys-infiniband/librdmacm/metadata.xml
index 67da2f26db6b..c5584e5d0be4 100644
--- a/sys-infiniband/librdmacm/metadata.xml
+++ b/sys-infiniband/librdmacm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB userspace RDMA CM library.
 </longdescription>
diff --git a/sys-infiniband/mstflint/metadata.xml b/sys-infiniband/mstflint/metadata.xml
index d6f4b86016ac..35b1dd4fe70d 100644
--- a/sys-infiniband/mstflint/metadata.xml
+++ b/sys-infiniband/mstflint/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 OpenIB Userspace CM library
 </longdescription>
diff --git a/sys-infiniband/ofed/metadata.xml b/sys-infiniband/ofed/metadata.xml
index 069bacc4b344..1739b860acdb 100644
--- a/sys-infiniband/ofed/metadata.xml
+++ b/sys-infiniband/ofed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+    	<email>cluster@gentoo.org</email>
+    	<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="compat-dapl">Add support for DAPL v1.2 abstraction layer</flag>
 		<flag name="dapl">Add support for DAPL abstraction layer</flag>
diff --git a/sys-infiniband/opensm/metadata.xml b/sys-infiniband/opensm/metadata.xml
index eb4ecb9d802f..3b0e78958952 100644
--- a/sys-infiniband/opensm/metadata.xml
+++ b/sys-infiniband/opensm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 OpenSM provides an implementation for an InfiniBand Subnet Manager and
 Administrator. Such a software entity is required to run for in order to
diff --git a/sys-infiniband/perftest/metadata.xml b/sys-infiniband/perftest/metadata.xml
index 8fb8c1c2eb9e..10515e2ca122 100644
--- a/sys-infiniband/perftest/metadata.xml
+++ b/sys-infiniband/perftest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 OpenIB uverbs micro-benchmarks.
 </longdescription>
diff --git a/sys-infiniband/qperf/metadata.xml b/sys-infiniband/qperf/metadata.xml
index f32cc6d6c3ca..3085fed98d52 100644
--- a/sys-infiniband/qperf/metadata.xml
+++ b/sys-infiniband/qperf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 libibverbs is a library that allows programs to use InfiniBand "verbs"
 for direct access to IB hardware from userspace.  For more information
diff --git a/sys-infiniband/rds-tools/metadata.xml b/sys-infiniband/rds-tools/metadata.xml
index c4ae6f4a7ac3..15cf7d23c3da 100644
--- a/sys-infiniband/rds-tools/metadata.xml
+++ b/sys-infiniband/rds-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
 <longdescription>
 uDAPL is a transport neutral infrastructure that provides RDMA capabilities in
 user space.  It is the user space component of DAPL,  the Direct Access Provider
diff --git a/sys-infiniband/srptools/metadata.xml b/sys-infiniband/srptools/metadata.xml
index 68d6e02a66c8..646bef34c2d4 100644
--- a/sys-infiniband/srptools/metadata.xml
+++ b/sys-infiniband/srptools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<longdescription>
 srptools is a package of tools for discovering and connecting to SRP
 SCSI targets on InfiniBand fabrics.  These targets can be accessed
diff --git a/sys-kernel/cryptodev/metadata.xml b/sys-kernel/cryptodev/metadata.xml
index a1406ad73c8e..9d2fb9657f52 100644
--- a/sys-kernel/cryptodev/metadata.xml
+++ b/sys-kernel/cryptodev/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>clabbe.montjoie@gmail.com</email>
 <name>LABBE Corentin</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index d4f4342f0ca0..413c131028b9 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -17,7 +17,10 @@
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="debug">Module installing additional tools like strace, file
 			editor, ssh and more</flag>
diff --git a/sys-kernel/gentoo-sources/metadata.xml b/sys-kernel/gentoo-sources/metadata.xml
index 423d383df2b9..2dd052949875 100644
--- a/sys-kernel/gentoo-sources/metadata.xml
+++ b/sys-kernel/gentoo-sources/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel</herd>
+<maintainer>
+  <email>kernel@gentoo.org</email>
+  <name>Gentoo Kernel Project</name>
+</maintainer>
 <use>
   <flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
   <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
diff --git a/sys-kernel/git-sources/metadata.xml b/sys-kernel/git-sources/metadata.xml
index ae08212b1ea3..ed57ed25f795 100644
--- a/sys-kernel/git-sources/metadata.xml
+++ b/sys-kernel/git-sources/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kernel</herd>
   <maintainer>
     <email>mpagano@gentoo.org</email>
     <name>Mike Pagano</name>
     <description>Actively maintained</description>
   </maintainer>
+  <maintainer>
+    <email>kernel@gentoo.org</email>
+    <name>Gentoo Kernel Project</name>
+  </maintainer>
   <longdescription>
     -git sources sources, for people who like to have the absolute latest kernel available
   </longdescription>
diff --git a/sys-kernel/hardened-sources/metadata.xml b/sys-kernel/hardened-sources/metadata.xml
index a1e0392b8d1b..b557cd3fcdb3 100644
--- a/sys-kernel/hardened-sources/metadata.xml
+++ b/sys-kernel/hardened-sources/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>kernel@gentoo.org</email>
+		<name>Gentoo Kernel Project</name>
+	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>
 		hardened-sources is based upon genpatches, and adds the grsecurity
 		patch from http://www.grsecurity.net, which also includes PaX.
diff --git a/sys-kernel/kccmp/metadata.xml b/sys-kernel/kccmp/metadata.xml
index 59c9a21a55b6..470d61d1f8b8 100644
--- a/sys-kernel/kccmp/metadata.xml
+++ b/sys-kernel/kccmp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel</herd>
 <maintainer>
   <email>mpagano@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>kernel@gentoo.org</email>
+  <name>Gentoo Kernel Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-kernel/linux-docs/metadata.xml b/sys-kernel/linux-docs/metadata.xml
index 344ae0f3e1d0..56d5913acfdb 100644
--- a/sys-kernel/linux-docs/metadata.xml
+++ b/sys-kernel/linux-docs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
 	<maintainer>
 		<email>mpagano@gentoo.org</email>
 	</maintainer>
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index 4823b62494a3..a51ca72f76de 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel</herd>
 <maintainer>
 	<email>gregkh@gentoo.org</email>
 	<name>Greg Kroah-Hartman</name>
@@ -14,6 +13,10 @@
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
+<maintainer>
+	<email>kernel@gentoo.org</email>
+	<name>Gentoo Kernel Project</name>
+</maintainer>
 <use>
 	<flag name="savedconfig">Allows individual selection of firmware files</flag>
 </use>
diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml
index 0cddf5227d63..d57ceb3b9a22 100644
--- a/sys-kernel/linux-headers/metadata.xml
+++ b/sys-kernel/linux-headers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+  <email>toolchain@gentoo.org</email>
+  <name>Gentoo Toolchain Project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
 </upstream>
diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml
index 45452f17ccc1..5986bcb97a9e 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mips</herd>
 	<maintainer>
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
diff --git a/sys-kernel/openvz-sources/metadata.xml b/sys-kernel/openvz-sources/metadata.xml
index f282372a204c..576e4e3de125 100644
--- a/sys-kernel/openvz-sources/metadata.xml
+++ b/sys-kernel/openvz-sources/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 	<email>pva@gentoo.org</email>
 	<name>Peter Volkov</name>
@@ -11,6 +10,10 @@
 		<name>Andreis Vinogradovs</name>
 		<description>Proxy maintainer, CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		OpenVZ is an Operating System-level server virtualization solution, 
 		built on Linux. OpenVZ creates isolated, secure virtual private 
diff --git a/sys-kernel/rsbac-sources/metadata.xml b/sys-kernel/rsbac-sources/metadata.xml
index 71cf2783bbf8..dfa3202d13f9 100644
--- a/sys-kernel/rsbac-sources/metadata.xml
+++ b/sys-kernel/rsbac-sources/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>kernel@gentoo.org</email>
+		<name>Gentoo Kernel Project</name>
+	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>
 		RSBAC patched kernel from http://www.rsbac.org/
 	</longdescription>
diff --git a/sys-kernel/rt-sources/metadata.xml b/sys-kernel/rt-sources/metadata.xml
index 9e8400d02056..42b4a7cc05bd 100644
--- a/sys-kernel/rt-sources/metadata.xml
+++ b/sys-kernel/rt-sources/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>psomas@gentoo.org</email>
 		<name>Stratos Psomadakis</name>
@@ -10,6 +9,10 @@
 		<email>eric-f.garioud@wanadoo.fr</email>
 		<name>Eric F. GARIOUD</name>
 	</maintainer>
+	<maintainer>
+	  <email>proxy-maint@gentoo.org</email>
+	  <name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Real-time patchset for the Linux Kernel
 	</longdescription>
diff --git a/sys-kernel/tuxonice-sources/metadata.xml b/sys-kernel/tuxonice-sources/metadata.xml
index e9ef9a6c3cf1..aa7c9dd8d736 100644
--- a/sys-kernel/tuxonice-sources/metadata.xml
+++ b/sys-kernel/tuxonice-sources/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer>
+		<email>kernel@gentoo.org</email>
+		<name>Gentoo Kernel Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
 		<remote-id type="github">NigelCunningham/tuxonice-kernel</remote-id>
diff --git a/sys-kernel/vanilla-sources/metadata.xml b/sys-kernel/vanilla-sources/metadata.xml
index 1ad4546ee9e2..62f628ea905f 100644
--- a/sys-kernel/vanilla-sources/metadata.xml
+++ b/sys-kernel/vanilla-sources/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
 	<maintainer>
 		<email>kernel@gentoo.org</email>
 		<name>Gentoo kernel team</name>
diff --git a/sys-kernel/xbox-sources/metadata.xml b/sys-kernel/xbox-sources/metadata.xml
index 413f9bdcef93..790fd8cfeb10 100644
--- a/sys-kernel/xbox-sources/metadata.xml
+++ b/sys-kernel/xbox-sources/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
-	<herd>xbox</herd>
+	<maintainer>
+		<email>kernel@gentoo.org</email>
+		<name>Gentoo Kernel Project</name>
+	</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
 	<longdescription>Full sources for the Xbox Linux kernel</longdescription>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index df5ec0287618..648cce926827 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>vicegentoo@gmail.com</email>
 	<name>Daniel Weiss</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
 </upstream>
diff --git a/sys-libs/argp-standalone/metadata.xml b/sys-libs/argp-standalone/metadata.xml
index c89e3114594a..1bd2342b3d61 100644
--- a/sys-libs/argp-standalone/metadata.xml
+++ b/sys-libs/argp-standalone/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
 		<email>gentoo@wildgooses.com</email>
 		<name>Ed Wildgoose</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/binutils-libs/metadata.xml b/sys-libs/binutils-libs/metadata.xml
index 9005ddcf7683..33dc6bb6273d 100644
--- a/sys-libs/binutils-libs/metadata.xml
+++ b/sys-libs/binutils-libs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
 	<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
 	<flag name="multitarget">Enable all possible targets in libbfd</flag>
diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
index 95143822cca7..f09fa5733d61 100644
--- a/sys-libs/cracklib/metadata.xml
+++ b/sys-libs/cracklib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">cracklib</remote-id>
 	<remote-id type="github">cracklib/cracklib</remote-id>
diff --git a/sys-libs/csu/metadata.xml b/sys-libs/csu/metadata.xml
index f737f232e3bf..6bd94e0770d5 100644
--- a/sys-libs/csu/metadata.xml
+++ b/sys-libs/csu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prefix</herd>
+  <maintainer>
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
index dabfe3f0d14a..0aea622da47c 100644
--- a/sys-libs/db/metadata.xml
+++ b/sys-libs/db/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription>
 The Berkeley Database (Berkeley DB) is a programmatic toolkit
 that provides embedded database support for both traditional and client/server
diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index d687bd7f96ce..dabbf6a8458e 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index a95aa780763a..7d939962d867 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
 
   <use>
     <flag name="nagios">
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index e58e63d6c5aa..755b19ad7f4f 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
 	<flag name="exporter">enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index d8e8789c6e0f..5c0827ceb8da 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
  <flag name="debug">When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)</flag>
  <flag name="gd">build memusage and memusagestat tools</flag>
diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/gpm/metadata.xml
+++ b/sys-libs/gpm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/kpmcore/metadata.xml b/sys-libs/kpmcore/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sys-libs/kpmcore/metadata.xml
+++ b/sys-libs/kpmcore/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index 587dabd73f1d..36f98ffb31b9 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>samba</herd>
+<maintainer>
+	<email>samba@gentoo.org</email>
+	<name>Samba</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/lib-compat-loki/metadata.xml b/sys-libs/lib-compat-loki/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/sys-libs/lib-compat-loki/metadata.xml
+++ b/sys-libs/lib-compat-loki/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/lib-compat/metadata.xml
+++ b/sys-libs/lib-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libaal/metadata.xml b/sys-libs/libaal/metadata.xml
index 981ae413d18e..0de89ea96730 100644
--- a/sys-libs/libaal/metadata.xml
+++ b/sys-libs/libaal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription>
 This is a library, that provides application abstraction mechanism.
 It includes device abstraction, libc independence code, etc.
diff --git a/sys-libs/libapparmor/metadata.xml b/sys-libs/libapparmor/metadata.xml
index f60a2bbf973d..0b14b7a31476 100644
--- a/sys-libs/libapparmor/metadata.xml
+++ b/sys-libs/libapparmor/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
 	</upstream>
diff --git a/sys-libs/libavc1394/metadata.xml b/sys-libs/libavc1394/metadata.xml
index e86032584253..2c3c35a41e48 100644
--- a/sys-libs/libavc1394/metadata.xml
+++ b/sys-libs/libavc1394/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">libavc1394</remote-id>
 </upstream>
diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index 036748e8916b..b24b5f1065b5 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription>
 	The libcap-ng library is intended to make programming with POSIX
 	capabilities much easier than the traditional libcap library. It includes
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index 1d3cd13e19bf..61f0fb1a7c8e 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
   <!-- BSD is here because the plan is to have libc++ as the standard C++
 	   library with clang. A llvm herd would make a lot of sense here too -->
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
 	  <flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
   </use>
diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml
index bb8b535288ce..cdb8a11b95fd 100644
--- a/sys-libs/libcxxrt/metadata.xml
+++ b/sys-libs/libcxxrt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <maintainer>
+    <email>bsd@gentoo.org</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
     <flag name="libunwind">Use <pkg>sys-libs/libunwind</pkg> instead of libgcc_s for unwinding. This should allow avoiding relying on <pkg>sys-devel/gcc</pkg> but for now clang is setup to use libgcc_s.</flag>
   </use>
diff --git a/sys-libs/libfreevec/metadata.xml b/sys-libs/libfreevec/metadata.xml
index c5e4f911c5c4..65bf54cdfa38 100644
--- a/sys-libs/libfreevec/metadata.xml
+++ b/sys-libs/libfreevec/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>ppc@gentoo.org</email>
+  <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
index 9dcec146689b..9687d230194c 100644
--- a/sys-libs/libhugetlbfs/metadata.xml
+++ b/sys-libs/libhugetlbfs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="perl">Install the cpupcstat tool and some perl modules</flag>
 </use>
diff --git a/sys-libs/libieee1284/metadata.xml b/sys-libs/libieee1284/metadata.xml
index 648ebdad06a8..c181919828cd 100644
--- a/sys-libs/libieee1284/metadata.xml
+++ b/sys-libs/libieee1284/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">libieee1284</remote-id>
 </upstream>
diff --git a/sys-libs/libkudzu/metadata.xml b/sys-libs/libkudzu/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/sys-libs/libkudzu/metadata.xml
+++ b/sys-libs/libkudzu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libmath++/metadata.xml b/sys-libs/libmath++/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/sys-libs/libmath++/metadata.xml
+++ b/sys-libs/libmath++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+	<email>cpp@gentoo.org</email>
+	<name>Gentoo C++ Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libosinfo/metadata.xml b/sys-libs/libosinfo/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/sys-libs/libosinfo/metadata.xml
+++ b/sys-libs/libosinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libraw1394/metadata.xml
+++ b/sys-libs/libraw1394/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/librtas/metadata.xml b/sys-libs/librtas/metadata.xml
index 749b46648ac5..61fca846f804 100644
--- a/sys-libs/librtas/metadata.xml
+++ b/sys-libs/librtas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">librtas</remote-id>
 	</upstream>
diff --git a/sys-libs/libservicelog/metadata.xml b/sys-libs/libservicelog/metadata.xml
index 09b995174c26..55b6e6055e09 100644
--- a/sys-libs/libservicelog/metadata.xml
+++ b/sys-libs/libservicelog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linux-diag</remote-id>
 	</upstream>
diff --git a/sys-libs/libstdc++-v3-bin/metadata.xml b/sys-libs/libstdc++-v3-bin/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-libs/libstdc++-v3-bin/metadata.xml
+++ b/sys-libs/libstdc++-v3-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+	<email>ppc@gentoo.org</email>
+	<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libstdc++-v3/metadata.xml b/sys-libs/libstdc++-v3/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/sys-libs/libstdc++-v3/metadata.xml
+++ b/sys-libs/libstdc++-v3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libtermcap-compat/metadata.xml b/sys-libs/libtermcap-compat/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libtermcap-compat/metadata.xml
+++ b/sys-libs/libtermcap-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libunwind/metadata.xml b/sys-libs/libunwind/metadata.xml
index 4c7b538d98c6..d64ee9740694 100644
--- a/sys-libs/libunwind/metadata.xml
+++ b/sys-libs/libunwind/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
+	<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<use>
 		<flag name="debug-frame">Adds support for DWARF .debug_frame section: Use the information from this section if available</flag>
 		<flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
index 23c2cea3bcd7..609938156747 100644
--- a/sys-libs/libutempter/metadata.xml
+++ b/sys-libs/libutempter/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libvpd/metadata.xml b/sys-libs/libvpd/metadata.xml
index ec717b71c1e8..a4f47f13ea27 100644
--- a/sys-libs/libvpd/metadata.xml
+++ b/sys-libs/libvpd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ppc64</herd>
+	<maintainer>
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
index 8f5a0e9c8006..113897cea76f 100644
--- a/sys-libs/libxcrypt/metadata.xml
+++ b/sys-libs/libxcrypt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
+	<maintainer>
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>
 		Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for
 		libcrypt, which comes with the GNU C Library. It supports DES crypt,
diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
index 51e8d40c477a..d97933f8b39f 100644
--- a/sys-libs/lrmi/metadata.xml
+++ b/sys-libs/lrmi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">lrmi</remote-id>
 </upstream>
diff --git a/sys-libs/lwp/metadata.xml b/sys-libs/lwp/metadata.xml
index ca66751dee2f..097975e3adc2 100644
--- a/sys-libs/lwp/metadata.xml
+++ b/sys-libs/lwp/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
 </pkgmetadata>
diff --git a/sys-libs/mtdev/metadata.xml b/sys-libs/mtdev/metadata.xml
index 1e9847021115..2ef40f28a26c 100644
--- a/sys-libs/mtdev/metadata.xml
+++ b/sys-libs/mtdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
 <maintainer>
   <email>naota@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml
index 733d904a9f88..2390ab96137e 100644
--- a/sys-libs/musl/metadata.xml
+++ b/sys-libs/musl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>toolchain</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -9,4 +8,8 @@
 	<maintainer>
 		<email>lu_zero@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index f5459e5aa3a7..b5d4c1f8e0a5 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="ada">Add bindings for the ADA programming language</flag>
 	<flag name="tinfo">
diff --git a/sys-libs/newlib/metadata.xml b/sys-libs/newlib/metadata.xml
index c30294285aee..d75c8c9e2c47 100644
--- a/sys-libs/newlib/metadata.xml
+++ b/sys-libs/newlib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
 <maintainer>
 <email>lu_zero@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/nss-db/metadata.xml
+++ b/sys-libs/nss-db/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/nss_wrapper/metadata.xml b/sys-libs/nss_wrapper/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/nss_wrapper/metadata.xml
+++ b/sys-libs/nss_wrapper/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+<maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/ntdb/metadata.xml b/sys-libs/ntdb/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/ntdb/metadata.xml
+++ b/sys-libs/ntdb/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+<maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/openipmi/metadata.xml b/sys-libs/openipmi/metadata.xml
index cc81d5a5bb71..5df442e5167a 100644
--- a/sys-libs/openipmi/metadata.xml
+++ b/sys-libs/openipmi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sysadmin</herd>
+  <maintainer>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">openipmi</remote-id>
   </upstream>
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index f69d9e3e8118..6a14c91d0a40 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
   <maintainer>
     <email>pam-bugs@gentoo.org</email>
   </maintainer>
diff --git a/sys-libs/pwdb/metadata.xml b/sys-libs/pwdb/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/pwdb/metadata.xml
+++ b/sys-libs/pwdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index 656aedaef0ec..6c398b85460e 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
 </use>
diff --git a/sys-libs/rvm/metadata.xml b/sys-libs/rvm/metadata.xml
index ca66751dee2f..097975e3adc2 100644
--- a/sys-libs/rvm/metadata.xml
+++ b/sys-libs/rvm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
 </pkgmetadata>
diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml
index aef01fc3d591..c746f2860f8d 100644
--- a/sys-libs/slang/metadata.xml
+++ b/sys-libs/slang/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
index be0176a4cf3b..963ed440d219 100644
--- a/sys-libs/talloc/metadata.xml
+++ b/sys-libs/talloc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
   <use>
     <flag name="compat">Enable extra compatibility stuff</flag>
   </use>
diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml
index eb993d35b82e..ed54732cb951 100644
--- a/sys-libs/tdb/metadata.xml
+++ b/sys-libs/tdb/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+<maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml
index e06ba379b734..79edcaf7eb4c 100644
--- a/sys-libs/tevent/metadata.xml
+++ b/sys-libs/tevent/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+<maintainer>
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index 7aaccf953694..4cc6fd1a0849 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
   <maintainer>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <use>
     <flag name="leaps_timezone">
       Install the set of "right" timezones; these timezones include leap seconds
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index df545f8f89ef..fd532e2864c1 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>embedded</herd>
   <maintainer>
     <email>vapier@gentoo.org</email>
     <description>Primary Maintainer</description>
@@ -10,6 +9,10 @@
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
   </maintainer>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <longdescription>
 uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
 systems. It is much smaller than the GNU C Library, but nearly all applications supported 
diff --git a/sys-libs/uid_wrapper/metadata.xml b/sys-libs/uid_wrapper/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/uid_wrapper/metadata.xml
+++ b/sys-libs/uid_wrapper/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+<maintainer>
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
index 8b66de8a5583..e4285b8660e3 100644
--- a/sys-libs/zlib/metadata.xml
+++ b/sys-libs/zlib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="minizip">include the minizip library for quick and dirty zip extraction</flag>
 </use>
diff --git a/sys-power/acpi/metadata.xml b/sys-power/acpi/metadata.xml
index bf649f4ccb3a..fc17b6aa1fab 100644
--- a/sys-power/acpi/metadata.xml
+++ b/sys-power/acpi/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>axelgenus@gmail.com</email>
 		<name>Alessandro Calorì</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">acpiclient</remote-id>
 	</upstream>
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index c9ae750fb011..83f7b54baeac 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>mattm@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 Apcupsd can be used for power mangement and controlling most of 
 APC's UPS models on Unix and Windows machines. Apcupsd works with 
diff --git a/sys-power/athcool/metadata.xml b/sys-power/athcool/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-power/athcool/metadata.xml
+++ b/sys-power/athcool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 885be06c1bd9..60b7c757fe50 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
@@ -14,6 +13,10 @@
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
     Kernel module which automatically detects the required ACPI calls for two
     kinds of Optimus laptops for safe disabling/enabling the discrete graphics card.
diff --git a/sys-power/cpupower/metadata.xml b/sys-power/cpupower/metadata.xml
index e2278cd61bb3..e5506bea26d0 100644
--- a/sys-power/cpupower/metadata.xml
+++ b/sys-power/cpupower/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
diff --git a/sys-power/nvram-reboot/metadata.xml b/sys-power/nvram-reboot/metadata.xml
index bf74ec1f1991..9516e2505218 100644
--- a/sys-power/nvram-reboot/metadata.xml
+++ b/sys-power/nvram-reboot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">nvram-wakeup</remote-id>
 </upstream>
diff --git a/sys-power/nvram-wakeup/metadata.xml b/sys-power/nvram-wakeup/metadata.xml
index bf74ec1f1991..9516e2505218 100644
--- a/sys-power/nvram-wakeup/metadata.xml
+++ b/sys-power/nvram-wakeup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">nvram-wakeup</remote-id>
 </upstream>
diff --git a/sys-power/pm-quirks/metadata.xml b/sys-power/pm-quirks/metadata.xml
index 854288052d19..05a369b487a6 100644
--- a/sys-power/pm-quirks/metadata.xml
+++ b/sys-power/pm-quirks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+		<name>Gentoo Freedesktop Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-power/pm-utils/metadata.xml b/sys-power/pm-utils/metadata.xml
index e1f7c9831435..a2b08579c6ae 100644
--- a/sys-power/pm-utils/metadata.xml
+++ b/sys-power/pm-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/sys-power/upower-pm-utils/metadata.xml b/sys-power/upower-pm-utils/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/sys-power/upower-pm-utils/metadata.xml
+++ b/sys-power/upower-pm-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-power/upower/metadata.xml b/sys-power/upower/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/sys-power/upower/metadata.xml
+++ b/sys-power/upower/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/sys-process/acct/metadata.xml b/sys-process/acct/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/acct/metadata.xml
+++ b/sys-process/acct/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/anacron/metadata.xml b/sys-process/anacron/metadata.xml
index 9ac2d4e1c668..e0254fbcc93d 100644
--- a/sys-process/anacron/metadata.xml
+++ b/sys-process/anacron/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
+	<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">anacron</remote-id>
 	</upstream>
diff --git a/sys-process/at/metadata.xml b/sys-process/at/metadata.xml
index 750528bcaa7c..3824326c6be7 100644
--- a/sys-process/at/metadata.xml
+++ b/sys-process/at/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-process/atop/metadata.xml b/sys-process/atop/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/atop/metadata.xml
+++ b/sys-process/atop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/bcron/metadata.xml b/sys-process/bcron/metadata.xml
index 2ba9b9520d07..162328810f1e 100644
--- a/sys-process/bcron/metadata.xml
+++ b/sys-process/bcron/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
+	<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 	<longdescription>
 	This is bcron, a new cron system designed with secure operations in
 	mind.  To do this, the system is divided into several seperate programs,
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index e130e31b27b2..fe915eb7a88e 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="setproctitle">Make process titles of service workers to be more verbose</flag>
 	</use>
diff --git a/sys-process/cronbase/metadata.xml b/sys-process/cronbase/metadata.xml
index 3f399e92bcff..29096e3597ea 100644
--- a/sys-process/cronbase/metadata.xml
+++ b/sys-process/cronbase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
+	<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index bf18845e4d1b..d1dc67a818b1 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cron</herd>
 <maintainer>
   <email>polynomial-c@gentoo.org</email>
   <name>Lars Wendler</name>
 </maintainer>
+  <maintainer>
+    <email>cron-bugs@gentoo.org</email>
+    <name>Gentoo Cron Project</name>
+  </maintainer>
   <longdescription lang="en">
   Cronie contains the standard UNIX daemon crond that runs specified programs at
   scheduled times and related tools. It is based on the original cron and
diff --git a/sys-process/daemontools-encore/metadata.xml b/sys-process/daemontools-encore/metadata.xml
index 484c664ee7b8..c2d31d7a3944 100644
--- a/sys-process/daemontools-encore/metadata.xml
+++ b/sys-process/daemontools-encore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <longdescription lang="en">
 daemontools-encore is a collection of tools for managing UNIX services.
 It is derived from the public-domain release of daemontools by 
diff --git a/sys-process/daemontools/metadata.xml b/sys-process/daemontools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/daemontools/metadata.xml
+++ b/sys-process/daemontools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/dcron/metadata.xml b/sys-process/dcron/metadata.xml
index 541835b7739d..6d98ad2e2462 100644
--- a/sys-process/dcron/metadata.xml
+++ b/sys-process/dcron/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cron</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
 </maintainer>
+<maintainer>
+ <email>cron-bugs@gentoo.org</email>
+ <name>Gentoo Cron Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml
index 9c6deb27657e..7e48b2f21c46 100644
--- a/sys-process/fcron/metadata.xml
+++ b/sys-process/fcron/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 	<use>
 		<flag name="debug">
       Enable debug code and output. Since version 3.0.5 this will no
diff --git a/sys-process/fuser-bsd/metadata.xml b/sys-process/fuser-bsd/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-process/fuser-bsd/metadata.xml
+++ b/sys-process/fuser-bsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/glances/metadata.xml b/sys-process/glances/metadata.xml
index 9e1478de80bb..94122c3f0702 100644
--- a/sys-process/glances/metadata.xml
+++ b/sys-process/glances/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 	Glances is a cross-platform curses-based monitoring tool written in Python.
 </longdescription>
diff --git a/sys-process/iotop/metadata.xml b/sys-process/iotop/metadata.xml
index d4cd4e57777e..d14daaabba67 100644
--- a/sys-process/iotop/metadata.xml
+++ b/sys-process/iotop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-process/latencytop/metadata.xml b/sys-process/latencytop/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/latencytop/metadata.xml
+++ b/sys-process/latencytop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index b640cdbe1682..9fca1106b0ef 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="rpc">support looking up RPC service info</flag>
 </use>
diff --git a/sys-process/minit/metadata.xml b/sys-process/minit/metadata.xml
index e6921be3b87b..147e11d0fcf2 100644
--- a/sys-process/minit/metadata.xml
+++ b/sys-process/minit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<herd>proxy-maintainers</herd>
 		<maintainer>
 			<email>vostorga@gentoo.org</email>
 			<name>Víctor Ostorga</name>
@@ -10,6 +9,10 @@
 			<email>aw-gentoo@instandbesetzt.net</email>
 			<name>Andreas Wiese</name>
 		</maintainer>
+<maintainer>
+			<email>proxy-maint@gentoo.org</email>
+			<name>Proxy Maintainers</name>
+		</maintainer>
 <longdescription>
 minit - a small yet feature-complete init
 
diff --git a/sys-process/numactl/metadata.xml b/sys-process/numactl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/numactl/metadata.xml
+++ b/sys-process/numactl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/numad/metadata.xml b/sys-process/numad/metadata.xml
index 00600def5819..90c9eb172c0f 100644
--- a/sys-process/numad/metadata.xml
+++ b/sys-process/numad/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>cardoe@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/parallel/metadata.xml b/sys-process/parallel/metadata.xml
index 7bed4228d018..14947da28e68 100644
--- a/sys-process/parallel/metadata.xml
+++ b/sys-process/parallel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
   <email>ryoichiro.suzuki@gmail.com</email>
   <name>Ryoichiro Suzuki</name>
@@ -10,6 +9,10 @@
   <email>fauli@gentoo.org</email>
   <name>Christian Faulhammer (proxy)</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 GNU parallel is a shell tool for executing jobs in parallel locally or
 using remote machines. A job is typically a single command or a small
diff --git a/sys-process/pidof-bsd/metadata.xml b/sys-process/pidof-bsd/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-process/pidof-bsd/metadata.xml
+++ b/sys-process/pidof-bsd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/pkill-darwin/metadata.xml b/sys-process/pkill-darwin/metadata.xml
index f737f232e3bf..6bd94e0770d5 100644
--- a/sys-process/pkill-darwin/metadata.xml
+++ b/sys-process/pkill-darwin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prefix</herd>
+  <maintainer>
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-process/prll/metadata.xml b/sys-process/prll/metadata.xml
index a69e07e7917a..ce99c92c8e9b 100644
--- a/sys-process/prll/metadata.xml
+++ b/sys-process/prll/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">prll</remote-id>
 	</upstream>
diff --git a/sys-process/procexp/metadata.xml b/sys-process/procexp/metadata.xml
index c900ff1e9017..7e1069a4c821 100644
--- a/sys-process/procexp/metadata.xml
+++ b/sys-process/procexp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">procexp</remote-id>
 	</upstream>
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index aba64f77b2e6..0454b334c236 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="kill">Build the kill program</flag>
 	<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
diff --git a/sys-process/psinfo/metadata.xml b/sys-process/psinfo/metadata.xml
index 80ac69d9c2f2..85e9d1a546fc 100644
--- a/sys-process/psinfo/metadata.xml
+++ b/sys-process/psinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
+<maintainer>
+	<email>shell-tools@gentoo.org</email>
+	<name>Gentoo Shell Tools Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
index 499f880fe974..0b0a0b03a656 100644
--- a/sys-process/psmisc/metadata.xml
+++ b/sys-process/psmisc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">psmisc</remote-id>
 </upstream>
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index ba4336d7846b..fb3e799da91b 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
 	<email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/supervise-scripts/metadata.xml b/sys-process/supervise-scripts/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/supervise-scripts/metadata.xml
+++ b/sys-process/supervise-scripts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/time/metadata.xml b/sys-process/time/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/time/metadata.xml
+++ b/sys-process/time/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-process/top-apple/metadata.xml b/sys-process/top-apple/metadata.xml
index f737f232e3bf..6bd94e0770d5 100644
--- a/sys-process/top-apple/metadata.xml
+++ b/sys-process/top-apple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>prefix</herd>
+  <maintainer>
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-process/unixtop/metadata.xml b/sys-process/unixtop/metadata.xml
index f5e4e79522ea..7b37beff3478 100644
--- a/sys-process/unixtop/metadata.xml
+++ b/sys-process/unixtop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">unixtop</remote-id>
 	</upstream>
diff --git a/sys-process/vixie-cron/metadata.xml b/sys-process/vixie-cron/metadata.xml
index 3f399e92bcff..29096e3597ea 100644
--- a/sys-process/vixie-cron/metadata.xml
+++ b/sys-process/vixie-cron/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cron</herd>
+	<maintainer>
+		<email>cron-bugs@gentoo.org</email>
+		<name>Gentoo Cron Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-process/watchpid/metadata.xml b/sys-process/watchpid/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-process/watchpid/metadata.xml
+++ b/sys-process/watchpid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/acl/metadata.xml b/virtual/acl/metadata.xml
index c6e0a013acb4..5bb2fcc31636 100644
--- a/virtual/acl/metadata.xml
+++ b/virtual/acl/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
-<herd>base-system</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/ada/metadata.xml b/virtual/ada/metadata.xml
index aec150231c3f..faafba5cf197 100644
--- a/virtual/ada/metadata.xml
+++ b/virtual/ada/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
index 4651ee5209cd..0b8888c2d9df 100644
--- a/virtual/awk/metadata.xml
+++ b/virtual/awk/metadata.xml
@@ -5,5 +5,8 @@
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <herd>base-system</herd>
-</pkgmetadata>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/virtual/bitcoin-leveldb/metadata.xml b/virtual/bitcoin-leveldb/metadata.xml
index f258144be6d6..0e19f0e2cefc 100644
--- a/virtual/bitcoin-leveldb/metadata.xml
+++ b/virtual/bitcoin-leveldb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml
index 33c1a1a050cf..15556618f601 100644
--- a/virtual/blas/metadata.xml
+++ b/virtual/blas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 Gentoo virtual package for the Basic Linear Algebra Subprograms
 FORTRAN 77 implementation.
diff --git a/virtual/cblas/metadata.xml b/virtual/cblas/metadata.xml
index 7de36ad23410..0331cd933f8c 100644
--- a/virtual/cblas/metadata.xml
+++ b/virtual/cblas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 Gentoo virtual package for the Basic Linear Algebra Subprograms
 C implementation.
diff --git a/virtual/cdrtools/metadata.xml b/virtual/cdrtools/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/virtual/cdrtools/metadata.xml
+++ b/virtual/cdrtools/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/virtual/checkpassword/metadata.xml b/virtual/checkpassword/metadata.xml
index 210ce3ffc25e..5f39b000ab6f 100644
--- a/virtual/checkpassword/metadata.xml
+++ b/virtual/checkpassword/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/commonlisp/metadata.xml b/virtual/commonlisp/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/virtual/commonlisp/metadata.xml
+++ b/virtual/commonlisp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/cron/metadata.xml b/virtual/cron/metadata.xml
index 1d9cbae7f82a..161419e28f2f 100644
--- a/virtual/cron/metadata.xml
+++ b/virtual/cron/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cron</herd>
+<maintainer>
+	<email>cron-bugs@gentoo.org</email>
+	<name>Gentoo Cron Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/daemontools/metadata.xml b/virtual/daemontools/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/virtual/daemontools/metadata.xml
+++ b/virtual/daemontools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/dev-manager/metadata.xml b/virtual/dev-manager/metadata.xml
index cbc72fcf8f85..35d581cbe1a9 100644
--- a/virtual/dev-manager/metadata.xml
+++ b/virtual/dev-manager/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>bsd</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index d3514926a04f..0121a4259a4b 100644
--- a/virtual/editor/metadata.xml
+++ b/virtual/editor/metadata.xml
@@ -5,6 +5,12 @@
   <email>emacs@gentoo.org</email>
   <name>Gentoo Emacs project</name>
 </maintainer>
-<herd>vim</herd>
-<herd>base-system</herd>
+<maintainer>
+  <email>vim@gentoo.org</email>
+  <name>Gentoo Vim Project</name>
+</maintainer>
+<maintainer>
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/eject/metadata.xml b/virtual/eject/metadata.xml
index bee9f9ae6f02..aff39ca735f4 100644
--- a/virtual/eject/metadata.xml
+++ b/virtual/eject/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/fam/metadata.xml b/virtual/fam/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/virtual/fam/metadata.xml
+++ b/virtual/fam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/virtual/ffmpeg/metadata.xml b/virtual/ffmpeg/metadata.xml
index 4ca5bff578d8..9f31709f5980 100644
--- a/virtual/ffmpeg/metadata.xml
+++ b/virtual/ffmpeg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/virtual/fortran/metadata.xml b/virtual/fortran/metadata.xml
index 11f39a4c56de..49e6e5667464 100644
--- a/virtual/fortran/metadata.xml
+++ b/virtual/fortran/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>Use this package, if you package needs a fortran compiler</longdescription>
 </pkgmetadata>
diff --git a/virtual/freedesktop-icon-theme/metadata.xml b/virtual/freedesktop-icon-theme/metadata.xml
index 00b0f88611bb..5f0f076e0adc 100644
--- a/virtual/freedesktop-icon-theme/metadata.xml
+++ b/virtual/freedesktop-icon-theme/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 	<email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/virtual/glu/metadata.xml b/virtual/glu/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/glu/metadata.xml
+++ b/virtual/glu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/gnat/metadata.xml b/virtual/gnat/metadata.xml
index aec150231c3f..faafba5cf197 100644
--- a/virtual/gnat/metadata.xml
+++ b/virtual/gnat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ada</herd>
+<maintainer>
+	<email>ada@gentoo.org</email>
+	<name>Gentoo Resources for Ada</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/gnustep-back/metadata.xml b/virtual/gnustep-back/metadata.xml
index 2a3592e1557a..ebe04e99b209 100644
--- a/virtual/gnustep-back/metadata.xml
+++ b/virtual/gnustep-back/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 <longdescription>
 	This virtual provides a gnustep back-end component for the GNUstep 
 	GUI Library. 
diff --git a/virtual/gsasl/metadata.xml b/virtual/gsasl/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/virtual/gsasl/metadata.xml
+++ b/virtual/gsasl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/httpd-basic/metadata.xml b/virtual/httpd-basic/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-basic/metadata.xml
+++ b/virtual/httpd-basic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/httpd-cgi/metadata.xml b/virtual/httpd-cgi/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-cgi/metadata.xml
+++ b/virtual/httpd-cgi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/httpd-fastcgi/metadata.xml b/virtual/httpd-fastcgi/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-fastcgi/metadata.xml
+++ b/virtual/httpd-fastcgi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/httpd-php/metadata.xml b/virtual/httpd-php/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/virtual/httpd-php/metadata.xml
+++ b/virtual/httpd-php/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<maintainer>
+	<email>php-bugs@gentoo.org</email>
+	<name>PHP</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/imap-c-client/metadata.xml b/virtual/imap-c-client/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/virtual/imap-c-client/metadata.xml
+++ b/virtual/imap-c-client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/inetd/metadata.xml b/virtual/inetd/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/inetd/metadata.xml
+++ b/virtual/inetd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/virtual/jdk/metadata.xml
+++ b/virtual/jdk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index 07d7201f38a3..24cc09b4194c 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer>
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<slots>
 		<slot name="0">For building against. This is the only slot
 			that provides headers and command line tools.</slot>
diff --git a/virtual/jre/metadata.xml b/virtual/jre/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/virtual/jre/metadata.xml
+++ b/virtual/jre/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/krb5/metadata.xml b/virtual/krb5/metadata.xml
index 5ae9375e9391..2a1e1d958528 100644
--- a/virtual/krb5/metadata.xml
+++ b/virtual/krb5/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kerberos</herd>
+<maintainer>
+	<email>kerberos@gentoo.org</email>
+	<name>Kerberos</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/lapack/metadata.xml b/virtual/lapack/metadata.xml
index a61311fc5cae..7e3064b79795 100644
--- a/virtual/lapack/metadata.xml
+++ b/virtual/lapack/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 Gentoo virtual package for the Linear Algebra PACKAge
 FORTRAN 77 implementation.
diff --git a/virtual/latex-base/metadata.xml b/virtual/latex-base/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/virtual/latex-base/metadata.xml
+++ b/virtual/latex-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-browser/metadata.xml b/virtual/leechcraft-browser/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-browser/metadata.xml
+++ b/virtual/leechcraft-browser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-downloader-http/metadata.xml b/virtual/leechcraft-downloader-http/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/virtual/leechcraft-downloader-http/metadata.xml
+++ b/virtual/leechcraft-downloader-http/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-notifier/metadata.xml b/virtual/leechcraft-notifier/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-notifier/metadata.xml
+++ b/virtual/leechcraft-notifier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-quark-sideprovider/metadata.xml b/virtual/leechcraft-quark-sideprovider/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-quark-sideprovider/metadata.xml
+++ b/virtual/leechcraft-quark-sideprovider/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-search-show/metadata.xml b/virtual/leechcraft-search-show/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-search-show/metadata.xml
+++ b/virtual/leechcraft-search-show/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-storage-device-manager/metadata.xml b/virtual/leechcraft-storage-device-manager/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-storage-device-manager/metadata.xml
+++ b/virtual/leechcraft-storage-device-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-task-show/metadata.xml b/virtual/leechcraft-task-show/metadata.xml
index 3205dcc72f2f..085b7b403c61 100644
--- a/virtual/leechcraft-task-show/metadata.xml
+++ b/virtual/leechcraft-task-show/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+	<email>leechcraft@gentoo.org</email>
+	<name>LeechCraft</name>
+</maintainer>
 <longdescription>Virtual for plugins that can show IDownloads and IJobHolders</longdescription> 
 </pkgmetadata>
diff --git a/virtual/leechcraft-trayarea/metadata.xml b/virtual/leechcraft-trayarea/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-trayarea/metadata.xml
+++ b/virtual/leechcraft-trayarea/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/leechcraft-wysiwyg-editor/metadata.xml b/virtual/leechcraft-wysiwyg-editor/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-wysiwyg-editor/metadata.xml
+++ b/virtual/leechcraft-wysiwyg-editor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>leechcraft</herd>
+	<maintainer>
+		<email>leechcraft@gentoo.org</email>
+		<name>LeechCraft</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/libc/metadata.xml b/virtual/libc/metadata.xml
index 7b307f749fbf..c34aedf5d947 100644
--- a/virtual/libc/metadata.xml
+++ b/virtual/libc/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
-<herd>embedded</herd>
-<herd>bsd</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/libffi/metadata.xml b/virtual/libffi/metadata.xml
index 686dc818edb9..0c0a20a0e663 100644
--- a/virtual/libffi/metadata.xml
+++ b/virtual/libffi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>toolchain</herd>
+  <maintainer>
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/libmysqlclient/metadata.xml b/virtual/libmysqlclient/metadata.xml
index 362521e5bdf9..26e49be10177 100644
--- a/virtual/libmysqlclient/metadata.xml
+++ b/virtual/libmysqlclient/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>mysql</herd>
+  <maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/libstdc++/metadata.xml b/virtual/libstdc++/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/virtual/libstdc++/metadata.xml
+++ b/virtual/libstdc++/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/libusb/metadata.xml b/virtual/libusb/metadata.xml
index bff000f363b9..a4a5931b2beb 100644
--- a/virtual/libusb/metadata.xml
+++ b/virtual/libusb/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>peter@stuge.se</email>
 		<name>Peter Stuge</name>
 	</maintainer>
+<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/linux-sources/metadata.xml b/virtual/linux-sources/metadata.xml
index cc291a71f989..96c5ffcb8d81 100644
--- a/virtual/linux-sources/metadata.xml
+++ b/virtual/linux-sources/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>kernel@gentoo.org</email>
+		<name>Gentoo Kernel Project</name>
+	</maintainer>
 	<use>
 		<flag name="firmware">Install linux kernel firmware</flag>
 	</use>
diff --git a/virtual/linuxtv-dvb-headers/metadata.xml b/virtual/linuxtv-dvb-headers/metadata.xml
index fab1ebd6abea..d3b8269574ea 100644
--- a/virtual/linuxtv-dvb-headers/metadata.xml
+++ b/virtual/linuxtv-dvb-headers/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<longdescription>
 		This package contains the header files for the DVB drivers
 		from linuxtv.org needed to compile any application
diff --git a/virtual/logger/metadata.xml b/virtual/logger/metadata.xml
index e31cecb196d6..f6a0271326a3 100644
--- a/virtual/logger/metadata.xml
+++ b/virtual/logger/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
 <maintainer>
     <email>ultrabug@gentoo.org</email>
     <name>Alexys Jacob</name>
 </maintainer>
+<maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/mailx/metadata.xml b/virtual/mailx/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/virtual/mailx/metadata.xml
+++ b/virtual/mailx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/man/metadata.xml b/virtual/man/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/man/metadata.xml
+++ b/virtual/man/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/mda/metadata.xml b/virtual/mda/metadata.xml
index 10fe7e71ff8b..138967b70aea 100644
--- a/virtual/mda/metadata.xml
+++ b/virtual/mda/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/modutils/metadata.xml b/virtual/modutils/metadata.xml
index 14f8165f0c15..264f86b10bb2 100644
--- a/virtual/modutils/metadata.xml
+++ b/virtual/modutils/metadata.xml
@@ -4,5 +4,8 @@
 	<maintainer>
 		<email>udev-bugs@gentoo.org</email>
 	</maintainer>
-	<herd>base-system</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/virtual/mpi/metadata.xml b/virtual/mpi/metadata.xml
index 68315d1453b8..892427e7a9cd 100644
--- a/virtual/mpi/metadata.xml
+++ b/virtual/mpi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="romio">Enable romio, a high-performance portable MPI-IO</flag>
 	</use>
diff --git a/virtual/mta/metadata.xml b/virtual/mta/metadata.xml
index 10fe7e71ff8b..138967b70aea 100644
--- a/virtual/mta/metadata.xml
+++ b/virtual/mta/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>qmail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
index 2624f382a321..d19367d51a8c 100644
--- a/virtual/mysql/metadata.xml
+++ b/virtual/mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>mysql</herd>
+  <maintainer>
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
   <use>
     <flag name="embedded">Build embedded server (libmysqld)</flag>
   </use>
diff --git a/virtual/notification-daemon/metadata.xml b/virtual/notification-daemon/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/virtual/notification-daemon/metadata.xml
+++ b/virtual/notification-daemon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/virtual/ooo/metadata.xml b/virtual/ooo/metadata.xml
index 254a397ff975..6766c67a7ae2 100644
--- a/virtual/ooo/metadata.xml
+++ b/virtual/ooo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>office</herd>
+<maintainer>
+	<email>office@gentoo.org</email>
+	<name>Gentoo Office project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/opencl/metadata.xml b/virtual/opencl/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/opencl/metadata.xml
+++ b/virtual/opencl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/opengl/metadata.xml b/virtual/opengl/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/opengl/metadata.xml
+++ b/virtual/opengl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/os-headers/metadata.xml b/virtual/os-headers/metadata.xml
index 73b74513bca0..eccf2b3edc9a 100644
--- a/virtual/os-headers/metadata.xml
+++ b/virtual/os-headers/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
-<herd>bsd</herd>
+<maintainer>
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/package-manager/metadata.xml b/virtual/package-manager/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/package-manager/metadata.xml
+++ b/virtual/package-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/pam/metadata.xml b/virtual/pam/metadata.xml
index f8e763f016bf..b6f392af5fe6 100644
--- a/virtual/pam/metadata.xml
+++ b/virtual/pam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pam</herd>
 <maintainer>
   <email>pam-bugs@gentoo.org</email>
 </maintainer>
diff --git a/virtual/perl-Archive-Tar/metadata.xml b/virtual/perl-Archive-Tar/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Archive-Tar/metadata.xml
+++ b/virtual/perl-Archive-Tar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Attribute-Handlers/metadata.xml b/virtual/perl-Attribute-Handlers/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Attribute-Handlers/metadata.xml
+++ b/virtual/perl-Attribute-Handlers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-AutoLoader/metadata.xml b/virtual/perl-AutoLoader/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-AutoLoader/metadata.xml
+++ b/virtual/perl-AutoLoader/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-B-Debug/metadata.xml b/virtual/perl-B-Debug/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-B-Debug/metadata.xml
+++ b/virtual/perl-B-Debug/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta-Requirements/metadata.xml b/virtual/perl-CPAN-Meta-Requirements/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta-Requirements/metadata.xml
+++ b/virtual/perl-CPAN-Meta-Requirements/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta-YAML/metadata.xml b/virtual/perl-CPAN-Meta-YAML/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta-YAML/metadata.xml
+++ b/virtual/perl-CPAN-Meta-YAML/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta/metadata.xml b/virtual/perl-CPAN-Meta/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta/metadata.xml
+++ b/virtual/perl-CPAN-Meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-CPAN/metadata.xml b/virtual/perl-CPAN/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN/metadata.xml
+++ b/virtual/perl-CPAN/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Carp/metadata.xml b/virtual/perl-Carp/metadata.xml
index 1027ac9b1094..121d3972ee8c 100644
--- a/virtual/perl-Carp/metadata.xml
+++ b/virtual/perl-Carp/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>kentfredric@gmail.com</email>
 		<name>Kent Fredric</name>
 	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Compress-Raw-Bzip2/metadata.xml b/virtual/perl-Compress-Raw-Bzip2/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Compress-Raw-Bzip2/metadata.xml
+++ b/virtual/perl-Compress-Raw-Bzip2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Compress-Raw-Zlib/metadata.xml b/virtual/perl-Compress-Raw-Zlib/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Compress-Raw-Zlib/metadata.xml
+++ b/virtual/perl-Compress-Raw-Zlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-DB_File/metadata.xml b/virtual/perl-DB_File/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-DB_File/metadata.xml
+++ b/virtual/perl-DB_File/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Data-Dumper/metadata.xml b/virtual/perl-Data-Dumper/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Data-Dumper/metadata.xml
+++ b/virtual/perl-Data-Dumper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Devel-PPPort/metadata.xml b/virtual/perl-Devel-PPPort/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Devel-PPPort/metadata.xml
+++ b/virtual/perl-Devel-PPPort/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Digest-MD5/metadata.xml b/virtual/perl-Digest-MD5/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest-MD5/metadata.xml
+++ b/virtual/perl-Digest-MD5/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Digest-SHA/metadata.xml b/virtual/perl-Digest-SHA/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest-SHA/metadata.xml
+++ b/virtual/perl-Digest-SHA/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Digest/metadata.xml b/virtual/perl-Digest/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest/metadata.xml
+++ b/virtual/perl-Digest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Dumpvalue/metadata.xml b/virtual/perl-Dumpvalue/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Dumpvalue/metadata.xml
+++ b/virtual/perl-Dumpvalue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Encode/metadata.xml b/virtual/perl-Encode/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Encode/metadata.xml
+++ b/virtual/perl-Encode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Exporter/metadata.xml b/virtual/perl-Exporter/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Exporter/metadata.xml
+++ b/virtual/perl-Exporter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-CBuilder/metadata.xml b/virtual/perl-ExtUtils-CBuilder/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-ExtUtils-CBuilder/metadata.xml
+++ b/virtual/perl-ExtUtils-CBuilder/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Command/metadata.xml b/virtual/perl-ExtUtils-Command/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Command/metadata.xml
+++ b/virtual/perl-ExtUtils-Command/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Constant/metadata.xml b/virtual/perl-ExtUtils-Constant/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Constant/metadata.xml
+++ b/virtual/perl-ExtUtils-Constant/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Install/metadata.xml b/virtual/perl-ExtUtils-Install/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Install/metadata.xml
+++ b/virtual/perl-ExtUtils-Install/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-MakeMaker/metadata.xml b/virtual/perl-ExtUtils-MakeMaker/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-MakeMaker/metadata.xml
+++ b/virtual/perl-ExtUtils-MakeMaker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Manifest/metadata.xml b/virtual/perl-ExtUtils-Manifest/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Manifest/metadata.xml
+++ b/virtual/perl-ExtUtils-Manifest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-ExtUtils-ParseXS/metadata.xml b/virtual/perl-ExtUtils-ParseXS/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-ExtUtils-ParseXS/metadata.xml
+++ b/virtual/perl-ExtUtils-ParseXS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-File-Path/metadata.xml b/virtual/perl-File-Path/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-File-Path/metadata.xml
+++ b/virtual/perl-File-Path/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-File-Spec/metadata.xml b/virtual/perl-File-Spec/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-File-Spec/metadata.xml
+++ b/virtual/perl-File-Spec/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-File-Temp/metadata.xml b/virtual/perl-File-Temp/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-File-Temp/metadata.xml
+++ b/virtual/perl-File-Temp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Filter-Simple/metadata.xml b/virtual/perl-Filter-Simple/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Filter-Simple/metadata.xml
+++ b/virtual/perl-Filter-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Getopt-Long/metadata.xml b/virtual/perl-Getopt-Long/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Getopt-Long/metadata.xml
+++ b/virtual/perl-Getopt-Long/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-HTTP-Tiny/metadata.xml b/virtual/perl-HTTP-Tiny/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-HTTP-Tiny/metadata.xml
+++ b/virtual/perl-HTTP-Tiny/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-I18N-LangTags/metadata.xml b/virtual/perl-I18N-LangTags/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-I18N-LangTags/metadata.xml
+++ b/virtual/perl-I18N-LangTags/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-IO-Compress/metadata.xml b/virtual/perl-IO-Compress/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IO-Compress/metadata.xml
+++ b/virtual/perl-IO-Compress/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-IO-Socket-IP/metadata.xml b/virtual/perl-IO-Socket-IP/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IO-Socket-IP/metadata.xml
+++ b/virtual/perl-IO-Socket-IP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-IO-Zlib/metadata.xml b/virtual/perl-IO-Zlib/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-IO-Zlib/metadata.xml
+++ b/virtual/perl-IO-Zlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-IO/metadata.xml b/virtual/perl-IO/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-IO/metadata.xml
+++ b/virtual/perl-IO/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-IPC-Cmd/metadata.xml b/virtual/perl-IPC-Cmd/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IPC-Cmd/metadata.xml
+++ b/virtual/perl-IPC-Cmd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-JSON-PP/metadata.xml b/virtual/perl-JSON-PP/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-JSON-PP/metadata.xml
+++ b/virtual/perl-JSON-PP/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Locale-Maketext-Simple/metadata.xml b/virtual/perl-Locale-Maketext-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Locale-Maketext-Simple/metadata.xml
+++ b/virtual/perl-Locale-Maketext-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Locale-Maketext/metadata.xml b/virtual/perl-Locale-Maketext/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Locale-Maketext/metadata.xml
+++ b/virtual/perl-Locale-Maketext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-MIME-Base64/metadata.xml b/virtual/perl-MIME-Base64/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-MIME-Base64/metadata.xml
+++ b/virtual/perl-MIME-Base64/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Math-BigInt-FastCalc/metadata.xml b/virtual/perl-Math-BigInt-FastCalc/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigInt-FastCalc/metadata.xml
+++ b/virtual/perl-Math-BigInt-FastCalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Math-BigInt/metadata.xml b/virtual/perl-Math-BigInt/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigInt/metadata.xml
+++ b/virtual/perl-Math-BigInt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Math-BigRat/metadata.xml b/virtual/perl-Math-BigRat/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigRat/metadata.xml
+++ b/virtual/perl-Math-BigRat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Math-Complex/metadata.xml b/virtual/perl-Math-Complex/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Math-Complex/metadata.xml
+++ b/virtual/perl-Math-Complex/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Memoize/metadata.xml b/virtual/perl-Memoize/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Memoize/metadata.xml
+++ b/virtual/perl-Memoize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Module-CoreList/metadata.xml b/virtual/perl-Module-CoreList/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Module-CoreList/metadata.xml
+++ b/virtual/perl-Module-CoreList/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Module-Load-Conditional/metadata.xml b/virtual/perl-Module-Load-Conditional/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Load-Conditional/metadata.xml
+++ b/virtual/perl-Module-Load-Conditional/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Module-Load/metadata.xml b/virtual/perl-Module-Load/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Load/metadata.xml
+++ b/virtual/perl-Module-Load/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Module-Loaded/metadata.xml b/virtual/perl-Module-Loaded/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Loaded/metadata.xml
+++ b/virtual/perl-Module-Loaded/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Module-Metadata/metadata.xml b/virtual/perl-Module-Metadata/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Metadata/metadata.xml
+++ b/virtual/perl-Module-Metadata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Net-Ping/metadata.xml b/virtual/perl-Net-Ping/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Net-Ping/metadata.xml
+++ b/virtual/perl-Net-Ping/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Package-Constants/metadata.xml b/virtual/perl-Package-Constants/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Package-Constants/metadata.xml
+++ b/virtual/perl-Package-Constants/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Params-Check/metadata.xml b/virtual/perl-Params-Check/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Params-Check/metadata.xml
+++ b/virtual/perl-Params-Check/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Parse-CPAN-Meta/metadata.xml b/virtual/perl-Parse-CPAN-Meta/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Parse-CPAN-Meta/metadata.xml
+++ b/virtual/perl-Parse-CPAN-Meta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Perl-OSType/metadata.xml b/virtual/perl-Perl-OSType/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Perl-OSType/metadata.xml
+++ b/virtual/perl-Perl-OSType/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Pod-Escapes/metadata.xml b/virtual/perl-Pod-Escapes/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Escapes/metadata.xml
+++ b/virtual/perl-Pod-Escapes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Pod-Parser/metadata.xml b/virtual/perl-Pod-Parser/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Parser/metadata.xml
+++ b/virtual/perl-Pod-Parser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Pod-Simple/metadata.xml b/virtual/perl-Pod-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Simple/metadata.xml
+++ b/virtual/perl-Pod-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Safe/metadata.xml b/virtual/perl-Safe/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Safe/metadata.xml
+++ b/virtual/perl-Safe/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Scalar-List-Utils/metadata.xml b/virtual/perl-Scalar-List-Utils/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Scalar-List-Utils/metadata.xml
+++ b/virtual/perl-Scalar-List-Utils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Socket/metadata.xml b/virtual/perl-Socket/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Socket/metadata.xml
+++ b/virtual/perl-Socket/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Storable/metadata.xml b/virtual/perl-Storable/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Storable/metadata.xml
+++ b/virtual/perl-Storable/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Sys-Syslog/metadata.xml b/virtual/perl-Sys-Syslog/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Sys-Syslog/metadata.xml
+++ b/virtual/perl-Sys-Syslog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Term-ANSIColor/metadata.xml b/virtual/perl-Term-ANSIColor/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Term-ANSIColor/metadata.xml
+++ b/virtual/perl-Term-ANSIColor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Term-ReadLine/metadata.xml b/virtual/perl-Term-ReadLine/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Term-ReadLine/metadata.xml
+++ b/virtual/perl-Term-ReadLine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Test-Harness/metadata.xml b/virtual/perl-Test-Harness/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Test-Harness/metadata.xml
+++ b/virtual/perl-Test-Harness/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Test-Simple/metadata.xml b/virtual/perl-Test-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Test-Simple/metadata.xml
+++ b/virtual/perl-Test-Simple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Test/metadata.xml b/virtual/perl-Test/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Test/metadata.xml
+++ b/virtual/perl-Test/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Text-Balanced/metadata.xml b/virtual/perl-Text-Balanced/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Text-Balanced/metadata.xml
+++ b/virtual/perl-Text-Balanced/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Text-ParseWords/metadata.xml b/virtual/perl-Text-ParseWords/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Text-ParseWords/metadata.xml
+++ b/virtual/perl-Text-ParseWords/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Text-Tabs+Wrap/metadata.xml b/virtual/perl-Text-Tabs+Wrap/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Text-Tabs+Wrap/metadata.xml
+++ b/virtual/perl-Text-Tabs+Wrap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Thread-Queue/metadata.xml b/virtual/perl-Thread-Queue/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Thread-Queue/metadata.xml
+++ b/virtual/perl-Thread-Queue/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Thread-Semaphore/metadata.xml b/virtual/perl-Thread-Semaphore/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Thread-Semaphore/metadata.xml
+++ b/virtual/perl-Thread-Semaphore/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Tie-RefHash/metadata.xml b/virtual/perl-Tie-RefHash/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Tie-RefHash/metadata.xml
+++ b/virtual/perl-Tie-RefHash/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Time-HiRes/metadata.xml b/virtual/perl-Time-HiRes/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-HiRes/metadata.xml
+++ b/virtual/perl-Time-HiRes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Time-Local/metadata.xml b/virtual/perl-Time-Local/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-Local/metadata.xml
+++ b/virtual/perl-Time-Local/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Time-Piece/metadata.xml b/virtual/perl-Time-Piece/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-Piece/metadata.xml
+++ b/virtual/perl-Time-Piece/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Unicode-Collate/metadata.xml b/virtual/perl-Unicode-Collate/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Unicode-Collate/metadata.xml
+++ b/virtual/perl-Unicode-Collate/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-Unicode-Normalize/metadata.xml b/virtual/perl-Unicode-Normalize/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Unicode-Normalize/metadata.xml
+++ b/virtual/perl-Unicode-Normalize/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-XSLoader/metadata.xml b/virtual/perl-XSLoader/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-XSLoader/metadata.xml
+++ b/virtual/perl-XSLoader/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-autodie/metadata.xml b/virtual/perl-autodie/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-autodie/metadata.xml
+++ b/virtual/perl-autodie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-bignum/metadata.xml b/virtual/perl-bignum/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-bignum/metadata.xml
+++ b/virtual/perl-bignum/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-if/metadata.xml b/virtual/perl-if/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-if/metadata.xml
+++ b/virtual/perl-if/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>perl</herd>
+    <maintainer>
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-libnet/metadata.xml b/virtual/perl-libnet/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-libnet/metadata.xml
+++ b/virtual/perl-libnet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-parent/metadata.xml b/virtual/perl-parent/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-parent/metadata.xml
+++ b/virtual/perl-parent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-podlators/metadata.xml b/virtual/perl-podlators/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-podlators/metadata.xml
+++ b/virtual/perl-podlators/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-threads-shared/metadata.xml b/virtual/perl-threads-shared/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-threads-shared/metadata.xml
+++ b/virtual/perl-threads-shared/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-threads/metadata.xml b/virtual/perl-threads/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-threads/metadata.xml
+++ b/virtual/perl-threads/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/perl-version/metadata.xml b/virtual/perl-version/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-version/metadata.xml
+++ b/virtual/perl-version/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/pkgconfig/metadata.xml b/virtual/pkgconfig/metadata.xml
index 08b7896be4df..c3708add427f 100644
--- a/virtual/pkgconfig/metadata.xml
+++ b/virtual/pkgconfig/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/pmake/metadata.xml b/virtual/pmake/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/virtual/pmake/metadata.xml
+++ b/virtual/pmake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/pypy/metadata.xml b/virtual/pypy/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/pypy/metadata.xml
+++ b/virtual/pypy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/pypy3/metadata.xml b/virtual/pypy3/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/pypy3/metadata.xml
+++ b/virtual/pypy3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-asyncio/metadata.xml b/virtual/python-asyncio/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-asyncio/metadata.xml
+++ b/virtual/python-asyncio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-backports_abc/metadata.xml b/virtual/python-backports_abc/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-backports_abc/metadata.xml
+++ b/virtual/python-backports_abc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-dnspython/metadata.xml b/virtual/python-dnspython/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-dnspython/metadata.xml
+++ b/virtual/python-dnspython/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/python-funcsigs/metadata.xml b/virtual/python-funcsigs/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-funcsigs/metadata.xml
+++ b/virtual/python-funcsigs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/python-futures/metadata.xml b/virtual/python-futures/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-futures/metadata.xml
+++ b/virtual/python-futures/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-greenlet/metadata.xml b/virtual/python-greenlet/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-greenlet/metadata.xml
+++ b/virtual/python-greenlet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-imaging/metadata.xml b/virtual/python-imaging/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-imaging/metadata.xml
+++ b/virtual/python-imaging/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-ipaddress/metadata.xml b/virtual/python-ipaddress/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-ipaddress/metadata.xml
+++ b/virtual/python-ipaddress/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-pathlib/metadata.xml b/virtual/python-pathlib/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-pathlib/metadata.xml
+++ b/virtual/python-pathlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-pmw/metadata.xml b/virtual/python-pmw/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-pmw/metadata.xml
+++ b/virtual/python-pmw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/qmail/metadata.xml b/virtual/qmail/metadata.xml
index 0cb478b8c6ca..cf7950eb8559 100644
--- a/virtual/qmail/metadata.xml
+++ b/virtual/qmail/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qmail</herd>
+	<maintainer>
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/ruby-ffi/metadata.xml b/virtual/ruby-ffi/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby-ffi/metadata.xml
+++ b/virtual/ruby-ffi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/ruby-minitest/metadata.xml b/virtual/ruby-minitest/metadata.xml
index ed77b4f90bcb..055fcc834a3b 100644
--- a/virtual/ruby-minitest/metadata.xml
+++ b/virtual/ruby-minitest/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer>
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/virtual/ruby-ssl/metadata.xml b/virtual/ruby-ssl/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby-ssl/metadata.xml
+++ b/virtual/ruby-ssl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/ruby/metadata.xml b/virtual/ruby/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby/metadata.xml
+++ b/virtual/ruby/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/rubygems/metadata.xml b/virtual/rubygems/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/rubygems/metadata.xml
+++ b/virtual/rubygems/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+<maintainer>
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/service-manager/metadata.xml b/virtual/service-manager/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/service-manager/metadata.xml
+++ b/virtual/service-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/shadow/metadata.xml b/virtual/shadow/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/shadow/metadata.xml
+++ b/virtual/shadow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/skkserv/metadata.xml b/virtual/skkserv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/virtual/skkserv/metadata.xml
+++ b/virtual/skkserv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/ssh/metadata.xml b/virtual/ssh/metadata.xml
index 810ac9554f4a..6522e2865145 100644
--- a/virtual/ssh/metadata.xml
+++ b/virtual/ssh/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/tex-base/metadata.xml b/virtual/tex-base/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/virtual/tex-base/metadata.xml
+++ b/virtual/tex-base/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/texi2dvi/metadata.xml b/virtual/texi2dvi/metadata.xml
index 5d40bdf95b42..d21074a935e2 100644
--- a/virtual/texi2dvi/metadata.xml
+++ b/virtual/texi2dvi/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
-<herd>base-system</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/ttf-fonts/metadata.xml b/virtual/ttf-fonts/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/virtual/ttf-fonts/metadata.xml
+++ b/virtual/ttf-fonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/w3m/metadata.xml b/virtual/w3m/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/virtual/w3m/metadata.xml
+++ b/virtual/w3m/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/virtual/yacc/metadata.xml b/virtual/yacc/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/yacc/metadata.xml
+++ b/virtual/yacc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/www-apache/anyterm/metadata.xml
+++ b/www-apache/anyterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod-auth-mysql/metadata.xml b/www-apache/mod-auth-mysql/metadata.xml
index abf3529deac0..905d230c9b61 100644
--- a/www-apache/mod-auth-mysql/metadata.xml
+++ b/www-apache/mod-auth-mysql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_auth_mysql/metadata.xml b/www-apache/mod_auth_mysql/metadata.xml
index eb0a45566bdb..db549f86a90b 100644
--- a/www-apache/mod_auth_mysql/metadata.xml
+++ b/www-apache/mod_auth_mysql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+	<maintainer>
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">modauthmysql</remote-id>
 	</upstream>
diff --git a/www-apache/mod_auth_pgsql/metadata.xml b/www-apache/mod_auth_pgsql/metadata.xml
index d06e452b35af..59ee6494b165 100644
--- a/www-apache/mod_auth_pgsql/metadata.xml
+++ b/www-apache/mod_auth_pgsql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+	<maintainer>
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_auth_token/metadata.xml b/www-apache/mod_auth_token/metadata.xml
index c594eca9664d..71f4df81f76c 100644
--- a/www-apache/mod_auth_token/metadata.xml
+++ b/www-apache/mod_auth_token/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>pavel.stratil-jun@fenix.cz</email>
     <description>Proxied co-maintainer assign bugs to him</description>
@@ -9,6 +8,10 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">mod-auth-token</remote-id>
   </upstream>
diff --git a/www-apache/mod_caucho/metadata.xml b/www-apache/mod_caucho/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/www-apache/mod_caucho/metadata.xml
+++ b/www-apache/mod_caucho/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 119ebd55b7e4..2d882d7356ab 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mike@weisso.com</email>
 		<name>Mike Weissman</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		mod_jk is a connector used to connect Tomcat JSP/Servlet 
 		container with web servers such as Apache, Netscape, 
diff --git a/www-apache/mod_mono/metadata.xml b/www-apache/mod_mono/metadata.xml
index 1123c4994f60..654da4fe82c2 100644
--- a/www-apache/mod_mono/metadata.xml
+++ b/www-apache/mod_mono/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		The module allows Apache (http://httpd.apache.org) to serve ASP.NET
 		pages by proxying the requests to a slightly modified version of our XSP
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index 8be00b39dc0e..c30a7a1468e9 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
 	<maintainer>
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+<maintainer>
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_xsendfile/metadata.xml b/www-apache/mod_xsendfile/metadata.xml
index 8bca261d7b50..d84fc379a18c 100644
--- a/www-apache/mod_xsendfile/metadata.xml
+++ b/www-apache/mod_xsendfile/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -15,4 +14,8 @@
 		<name>Alexander Vershilov</name>
 	</maintainer>
 
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/passenger/metadata.xml b/www-apache/passenger/metadata.xml
index 76734eecd99f..d721f2c082b2 100644
--- a/www-apache/passenger/metadata.xml
+++ b/www-apache/passenger/metadata.xml
@@ -4,5 +4,8 @@
 	<maintainer>
 		<email>graaff@gentoo.org</email>
 	</maintainer>
-	<herd>ruby</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/www-apps/Apache-Gallery/metadata.xml b/www-apps/Apache-Gallery/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/www-apps/Apache-Gallery/metadata.xml
+++ b/www-apps/Apache-Gallery/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index 3a17645547f8..9af9221742f3 100644
--- a/www-apps/b2evolution/metadata.xml
+++ b/www-apps/b2evolution/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">evocms</remote-id>
 	</upstream>
diff --git a/www-apps/bitten/metadata.xml b/www-apps/bitten/metadata.xml
index cb24426f19f2..4a0ffc959176 100644
--- a/www-apps/bitten/metadata.xml
+++ b/www-apps/bitten/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+  		<email>python@gentoo.org</email>
+  		<name>Python</name>
+	</maintainer>
 	<use>
   		<flag name="server">Install master instance that integrates itself with Trac</flag>
 	</use>
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 7c2eecef180c..b905a109f84f 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@xayto.net</email>
 		<name>Craig Inches</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="extras">Optional Perl modules</flag>
 		<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 65409f295d37..9a9693c1902d 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	cgit - cgi for git
 
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
index 54d3aadfce8b..5b6d3ddae504 100644
--- a/www-apps/collectd-web/metadata.xml
+++ b/www-apps/collectd-web/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">httpdss/collectd-web</remote-id>
 	</upstream>
diff --git a/www-apps/coppermine/metadata.xml b/www-apps/coppermine/metadata.xml
index 276a32a3c827..227486c11856 100644
--- a/www-apps/coppermine/metadata.xml
+++ b/www-apps/coppermine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">eenemeenemuu.u</remote-id>
 	</upstream>
diff --git a/www-apps/curator/metadata.xml b/www-apps/curator/metadata.xml
index e81bafe6898e..0f5513f8648b 100644
--- a/www-apps/curator/metadata.xml
+++ b/www-apps/curator/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
   <maintainer>
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
   </maintainer>
+<maintainer>
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/www-apps/cvsweb/metadata.xml b/www-apps/cvsweb/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/cvsweb/metadata.xml
+++ b/www-apps/cvsweb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 777b49b1aa79..ec40ba43b159 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>jmbsvicetto@gentoo.org</email>
 		<name>Jorge Manuel B. S. Vicetto</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<longdescription lang="en">
 		DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
 		creating documentation of any kind. It is targeted at developer teams,
diff --git a/www-apps/dotproject/metadata.xml b/www-apps/dotproject/metadata.xml
index bd5db4864e44..a3d7c5bdbcb6 100644
--- a/www-apps/dotproject/metadata.xml
+++ b/www-apps/dotproject/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dotproject</remote-id>
 	</upstream>
diff --git a/www-apps/dragonflycms/metadata.xml b/www-apps/dragonflycms/metadata.xml
index fea7d5fbc77d..2f8777b26af4 100644
--- a/www-apps/dragonflycms/metadata.xml
+++ b/www-apps/dragonflycms/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<longdescription lang="en">
 		CPG Dragonfly CMS is a feature-rich open source content management system
 		based off of PHP-Nuke 6.5
diff --git a/www-apps/drraw/metadata.xml b/www-apps/drraw/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/drraw/metadata.xml
+++ b/www-apps/drraw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index c9bd514760a5..da2575e79194 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <use>
 	<flag name="accelerator">Add dependency on a php accelerator</flag>
 	<flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
diff --git a/www-apps/dspam-web/metadata.xml b/www-apps/dspam-web/metadata.xml
index 4f3fa398a3f9..708508c7b8f4 100644
--- a/www-apps/dspam-web/metadata.xml
+++ b/www-apps/dspam-web/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>Web Administrative interface for a statistical-algorithmic hybrid anti-spam filter</longdescription>
 </pkgmetadata>
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 93bdf0b618bc..7d9a3d1f645a 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="jpgraph">Add <pkg>dev-php/jpgraph</pkg> support</flag>
 		<flag name="gallery">Install gallery2 port for eGW</flag>
diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
index 02f3dbc904a3..90c4bce39bc4 100644
--- a/www-apps/freeradius-dialupadmin/metadata.xml
+++ b/www-apps/freeradius-dialupadmin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>
 The FreeRADIUS server comes including a powerfull web interface written in PHP 
 to administer radius users, called dialupadmin. Dialup Admin supports users 
diff --git a/www-apps/gallery/metadata.xml b/www-apps/gallery/metadata.xml
index 479dd79246b9..b3610927696d 100644
--- a/www-apps/gallery/metadata.xml
+++ b/www-apps/gallery/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="netpbm">Add <pkg>media-libs/netpbm</pkg> support</flag>
 		<flag name="unzip">Add <pkg>app-arch/unzip</pkg> support for the archive
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
index 223121355cfd..227d8de10cbc 100644
--- a/www-apps/gitit/metadata.xml
+++ b/www-apps/gitit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/www-apps/gnopaste/metadata.xml b/www-apps/gnopaste/metadata.xml
index 5f4a90172f2d..d83dc355d2d6 100644
--- a/www-apps/gnopaste/metadata.xml
+++ b/www-apps/gnopaste/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnopaste</remote-id>
 	</upstream>
diff --git a/www-apps/groupoffice/metadata.xml b/www-apps/groupoffice/metadata.xml
index fa669a99b3e4..152709175d17 100644
--- a/www-apps/groupoffice/metadata.xml
+++ b/www-apps/groupoffice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">group-office</remote-id>
 	</upstream>
diff --git a/www-apps/horde-chora/metadata.xml b/www-apps/horde-chora/metadata.xml
index 60478682cdb4..8606519e6532 100644
--- a/www-apps/horde-chora/metadata.xml
+++ b/www-apps/horde-chora/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Chora is our tool for viewing code repositories that are managed using 
 the CVS source control system. It aims to provide a high degree of 
diff --git a/www-apps/horde-dimp/metadata.xml b/www-apps/horde-dimp/metadata.xml
index 105739700b78..64ed48f894da 100644
--- a/www-apps/horde-dimp/metadata.xml
+++ b/www-apps/horde-dimp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Horde DIMP is a alternate presentation view of IMP using AJAX-ish
 technologies.
diff --git a/www-apps/horde-gollem/metadata.xml b/www-apps/horde-gollem/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/horde-gollem/metadata.xml
+++ b/www-apps/horde-gollem/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/horde-hermes/metadata.xml b/www-apps/horde-hermes/metadata.xml
index 19e58ab40b7d..1af6e6654313 100644
--- a/www-apps/horde-hermes/metadata.xml
+++ b/www-apps/horde-hermes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Hermes is a time-tracking application integrated with the Horde Framework. It ties into Turba (to retrieve clients) and Nag and Whups (to retrieve cost objects). It comes with a stop watch, search and reporting capabilities, and an invoice interface.
 </longdescription>
diff --git a/www-apps/horde-imp/metadata.xml b/www-apps/horde-imp/metadata.xml
index 80a52651e16f..9910036ccf36 100644
--- a/www-apps/horde-imp/metadata.xml
+++ b/www-apps/horde-imp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 <longdescription>
 IMP is the Internet Messaging Program. It is written in PHP and provides 
 webmail access to IMAP and POP3 accounts.
diff --git a/www-apps/horde-ingo/metadata.xml b/www-apps/horde-ingo/metadata.xml
index 7724759b556d..3d427cd72c09 100644
--- a/www-apps/horde-ingo/metadata.xml
+++ b/www-apps/horde-ingo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Ingo is an email filter rules manager.
 </longdescription>
diff --git a/www-apps/horde-jeta/metadata.xml b/www-apps/horde-jeta/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/horde-jeta/metadata.xml
+++ b/www-apps/horde-jeta/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/horde-kronolith/metadata.xml b/www-apps/horde-kronolith/metadata.xml
index 23226ecc99a7..81b2b6e2f124 100644
--- a/www-apps/horde-kronolith/metadata.xml
+++ b/www-apps/horde-kronolith/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Kronolith is the Horde calendar application. It provides a stable and 
 featureful individual calendar system for every Horde user, and 
diff --git a/www-apps/horde-mimp/metadata.xml b/www-apps/horde-mimp/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/www-apps/horde-mimp/metadata.xml
+++ b/www-apps/horde-mimp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/horde-mnemo/metadata.xml b/www-apps/horde-mnemo/metadata.xml
index e842c3a05b62..ffb4ba50032a 100644
--- a/www-apps/horde-mnemo/metadata.xml
+++ b/www-apps/horde-mnemo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Mnemo is a note manager.
 </longdescription>
diff --git a/www-apps/horde-nag/metadata.xml b/www-apps/horde-nag/metadata.xml
index 0df3fe67cab1..d07be0198ded 100644
--- a/www-apps/horde-nag/metadata.xml
+++ b/www-apps/horde-nag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Nag is a simple, multiuser task list manager.
 </longdescription>
diff --git a/www-apps/horde-passwd/metadata.xml b/www-apps/horde-passwd/metadata.xml
index 25b7fa5ba021..75018ff9500a 100644
--- a/www-apps/horde-passwd/metadata.xml
+++ b/www-apps/horde-passwd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Passwd is the Horde password changing application. While it has been 
 released and is in production use at many sites, it is also under heavy 
diff --git a/www-apps/horde-pear/metadata.xml b/www-apps/horde-pear/metadata.xml
index 449e031b5334..06d1cabb950c 100644
--- a/www-apps/horde-pear/metadata.xml
+++ b/www-apps/horde-pear/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Horde 2.x, IMP 3.x, and all other Horde applications make use of the 
 PEAR libraries to handle such tasks as database abstraction, mail 
diff --git a/www-apps/horde-turba/metadata.xml b/www-apps/horde-turba/metadata.xml
index f39fa43df11f..e966a3c094e2 100644
--- a/www-apps/horde-turba/metadata.xml
+++ b/www-apps/horde-turba/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 Turba is the Horde contact management application. It is a production 
 level address book, and makes heavy use of the Horde framework to 
diff --git a/www-apps/horde/metadata.xml b/www-apps/horde/metadata.xml
index 1f0aa4dd26bb..7226b6724949 100644
--- a/www-apps/horde/metadata.xml
+++ b/www-apps/horde/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 <longdescription>
 The Horde Application Framework is a general-purpose web application 
 framework in PHP, providing classes for dealing with preferences, 
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 623cf9b6e892..c88b37302148 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>harold@naparst.com</email>
     <name>Harold Naparst</name>
@@ -17,6 +15,14 @@
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
   </maintainer>
+  <maintainer>
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Joomla is an award-winning content management system (CMS), which enables you to build Web sites and powerful online applications.
   </longdescription>
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index fe6f9ccf1a7e..e782c4f79125 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
index d50c1bef73f7..969ee5b35e38 100644
--- a/www-apps/lxr/metadata.xml
+++ b/www-apps/lxr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lxr</remote-id>
 	</upstream>
diff --git a/www-apps/mantisbt/metadata.xml b/www-apps/mantisbt/metadata.xml
index e5a305eb81c7..62eb69c90c3a 100644
--- a/www-apps/mantisbt/metadata.xml
+++ b/www-apps/mantisbt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>d@hx.id.au</email>
diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/mediawiki/metadata.xml
+++ b/www-apps/mediawiki/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/metadot/metadata.xml b/www-apps/metadot/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/metadot/metadata.xml
+++ b/www-apps/metadot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/mod_survey/metadata.xml b/www-apps/mod_survey/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/www-apps/mod_survey/metadata.xml
+++ b/www-apps/mod_survey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/moinmoin/metadata.xml b/www-apps/moinmoin/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/moinmoin/metadata.xml
+++ b/www-apps/moinmoin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
index 3cf0cd5be0b1..8e9dd5e03903 100644
--- a/www-apps/moodle/metadata.xml
+++ b/www-apps/moodle/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
 <maintainer>
 	<email>blueness@gentoo.org</email>
 	<name>Anthony G. Basile</name>
 </maintainer>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/mypictures/metadata.xml b/www-apps/mypictures/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/mypictures/metadata.xml
+++ b/www-apps/mypictures/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/mythweb/metadata.xml b/www-apps/mythweb/metadata.xml
index bbe97fab0a78..f5d6be1ffa62 100644
--- a/www-apps/mythweb/metadata.xml
+++ b/www-apps/mythweb/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 		<description>Do not CC me on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">MythTV/mythweb</remote-id>
 	</upstream>
diff --git a/www-apps/nanoblogger/metadata.xml b/www-apps/nanoblogger/metadata.xml
index 194b9f320e11..a43d22574e0a 100644
--- a/www-apps/nanoblogger/metadata.xml
+++ b/www-apps/nanoblogger/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<longdescription lang="en">
 Nanoblogger is a small weblog engine written in Bash for the command line. It
 uses common UNIX tools such as cat, grep, and sed.  Features include: support
diff --git a/www-apps/nanoc/metadata.xml b/www-apps/nanoc/metadata.xml
index 3c43de11d5ec..409d99ea230c 100644
--- a/www-apps/nanoc/metadata.xml
+++ b/www-apps/nanoc/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>graaff@gentoo.org</email></maintainer>
-<herd>ruby</herd>
+<maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 84a1db7d3b19..47c38a6216e1 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <use>
     <flag name="assets">
       Support web asset management through <pkg>dev-python/assets</pkg>
diff --git a/www-apps/openwebstats/metadata.xml b/www-apps/openwebstats/metadata.xml
index dc9438ea01a5..8a81d8c08d50 100644
--- a/www-apps/openwebstats/metadata.xml
+++ b/www-apps/openwebstats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openwebstats</remote-id>
 	</upstream>
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 5a5ec1227454..d9716e27c6e1 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
 	<email>lists@xunil.at</email>
 	<name>Stefan Weichinger</name>
 	<description>Proxy maintainer</description>
   </maintainer>
+  <maintainer>
+  <email>web-apps@gentoo.org</email>
+  <name>Gentoo Webapps</name>
+  </maintainer>
+  <maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
 	<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
   </use>
diff --git a/www-apps/owncloud/metadata.xml b/www-apps/owncloud/metadata.xml
index 6895c80555dc..b4b967307a22 100644
--- a/www-apps/owncloud/metadata.xml
+++ b/www-apps/owncloud/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/pcgi/metadata.xml b/www-apps/pcgi/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/pcgi/metadata.xml
+++ b/www-apps/pcgi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/www-apps/phpBB/metadata.xml
+++ b/www-apps/phpBB/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/phpmp/metadata.xml b/www-apps/phpmp/metadata.xml
index f78e909e6c96..ce37cc3d4058 100644
--- a/www-apps/phpmp/metadata.xml
+++ b/www-apps/phpmp/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/www-apps/phprojekt/metadata.xml b/www-apps/phprojekt/metadata.xml
index 44cdf35091f9..d227678cea49 100644
--- a/www-apps/phprojekt/metadata.xml
+++ b/www-apps/phprojekt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Mayflower/PHProjekt</remote-id>
 	</upstream>
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 768048d28c6b..469a31d30299 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rk4an/phpsysinfo</remote-id>
 	</upstream>
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
index f04a5186b05c..12167139b5af 100644
--- a/www-apps/phpwebsite/metadata.xml
+++ b/www-apps/phpwebsite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">phpwebsite</remote-id>
diff --git a/www-apps/polarblog/metadata.xml b/www-apps/polarblog/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-apps/polarblog/metadata.xml
+++ b/www-apps/polarblog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
index 6266de700fd8..51365cb60ef0 100644
--- a/www-apps/postfixadmin/metadata.xml
+++ b/www-apps/postfixadmin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="vacation">Install vacation.pl script and dependencies</flag>
 	</use>
diff --git a/www-apps/pyblosxom/metadata.xml b/www-apps/pyblosxom/metadata.xml
index 11cefb5a384c..51f7662527f8 100644
--- a/www-apps/pyblosxom/metadata.xml
+++ b/www-apps/pyblosxom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyblosxom</remote-id>
 	</upstream>
diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
index c512aabf25dc..9cfdad250d36 100644
--- a/www-apps/roundup/metadata.xml
+++ b/www-apps/roundup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">roundup</remote-id>
 		<remote-id type="sourceforge">roundup</remote-id>
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
index 1a61ca9bfee3..4555b15e1e7f 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 	<email>titanofold@gentoo.org</email>
 	<name>Aaron W. Swenson</name>
@@ -11,6 +9,14 @@
 		<email>eric.joshua.martin@gmail.com</email>
 		<name>Eric Martin</name>
 	</maintainer>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+ 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+ 	</maintainer>
 	<use>
 		<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
 	</use>
diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
index 9dfa62285413..04a27ac19fb1 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">rutorrent</remote-id>
 		<remote-id type="github">Novik/ruTorrent</remote-id>
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
index 2d3672bfffd8..9b70833a11ba 100644
--- a/www-apps/sitebar/metadata.xml
+++ b/www-apps/sitebar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="plugins">Install optional plugins</flag>
 	</use>
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index a6e3b05753cf..b64c0c7ba8bd 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -10,6 +9,10 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
 	</use>
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 01f0547d2d10..5220ec6be67e 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
   <maintainer>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer>
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
   <use>
     <flag name="i18n">Enable support for i18n with dev-python/Babel</flag>
     <flag name="highlight">Enable syntax highlighting</flag>
diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
index 88181d6daf39..99fbb4891266 100644
--- a/www-apps/venus/metadata.xml
+++ b/www-apps/venus/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>web-apps</herd>
  <maintainer>
    <email>tampakrap@gentoo.org</email>
  </maintainer>
+ <maintainer>
+   <email>web-apps@gentoo.org</email>
+   <name>Gentoo Webapps</name>
+ </maintainer>
  <use>
    <flag name="django">Support for django template style to config files</flag>
    <flag name="genshi">Support for genshi style to config files</flag>
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
index 15664488ccee..8d0d0a612455 100644
--- a/www-apps/viewvc/metadata.xml
+++ b/www-apps/viewvc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<use>
 		<flag name="cvsgraph">Add <pkg>dev-vcs/cvsgraph</pkg> support to show graphical views of revisions and branches</flag>
 		<flag name="mod_wsgi">Add <pkg>www-apache/mod_wsgi</pkg> support</flag>
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
index d68a2a4f22b4..9e2b880b861a 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
@@ -10,6 +9,10 @@
 		<email>dev-zero@gentoo.org</email>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		WebDAV CGI is a Perl CGI script that enables the WebDAV protocol
 		(class 1,2,3) for Web server to manage Web sites or to use a Web server
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index 48e01138b4be..d6f3c7287d14 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 	<longdescription>
 		Web based Subversion repository browser written in PHP
 	</longdescription>
diff --git a/www-apps/wiliki/metadata.xml b/www-apps/wiliki/metadata.xml
index 81aa0dcdd197..9ef33b757003 100644
--- a/www-apps/wiliki/metadata.xml
+++ b/www-apps/wiliki/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription>
 	WiLiKi is a lightweight Wiki Engine written in Scheme.
 
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
index c9b584fe6f2c..7d4580f69fc1 100644
--- a/www-apps/wordpress/metadata.xml
+++ b/www-apps/wordpress/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+<email>web-apps@gentoo.org</email>
+<name>Gentoo Webapps</name>
+</maintainer>
 <use>
 <flag name="akismet">Installs Akismet comment spam plug-in</flag>
 <flag name="themes">Installs themes (including default theme)</flag>
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 74a14ac02cc7..28d1e7db1687 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
 		<flag name="gn">Use GN (generate ninja) instead of GYP for building</flag>
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 0648c35642c3..568ce2471ba9 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>kondor6c@toshers.org</email>
 		<name>Kevin Faulkner</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
 		<flag name="finger">Enable support for the finger protocol</flag>
diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index 72b304a074f2..4d6dc4e0d43b 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
 </use>
diff --git a/www-client/firefox-bin/metadata.xml b/www-client/firefox-bin/metadata.xml
index 74d9257900cf..937c6dbf9feb 100644
--- a/www-client/firefox-bin/metadata.xml
+++ b/www-client/firefox-bin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index c2dcadb427d6..80897d95ddc2 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer>
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
 	<flag name="bindist">Disable official Firefox branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
diff --git a/www-client/google-chrome-beta/metadata.xml b/www-client/google-chrome-beta/metadata.xml
index 6c5158d03d71..16c6882d93c8 100644
--- a/www-client/google-chrome-beta/metadata.xml
+++ b/www-client/google-chrome-beta/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<longdescription>
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
diff --git a/www-client/google-chrome-unstable/metadata.xml b/www-client/google-chrome-unstable/metadata.xml
index 6c5158d03d71..16c6882d93c8 100644
--- a/www-client/google-chrome-unstable/metadata.xml
+++ b/www-client/google-chrome-unstable/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<longdescription>
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-chrome/metadata.xml
index 6c5158d03d71..16c6882d93c8 100644
--- a/www-client/google-chrome/metadata.xml
+++ b/www-client/google-chrome/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
@@ -10,6 +9,10 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<longdescription>
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
diff --git a/www-client/jd/metadata.xml b/www-client/jd/metadata.xml
index 8aa71b38e8dd..8102496f2e8d 100644
--- a/www-client/jd/metadata.xml
+++ b/www-client/jd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">jd4linux</remote-id>
 	</upstream>
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index dc9f533034c7..98a1d7d1ad11 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
       shown inside the page, not blocking the application window. When closing
diff --git a/www-client/rekonq/metadata.xml b/www-client/rekonq/metadata.xml
index 0733808b52bc..683895e0f6d0 100644
--- a/www-client/rekonq/metadata.xml
+++ b/www-client/rekonq/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="opera">Support for Opera sync handler</flag>
 	</use>
diff --git a/www-client/ripe-atlas-cousteau/metadata.xml b/www-client/ripe-atlas-cousteau/metadata.xml
index 7359238d1b4c..0b82d36ee02d 100644
--- a/www-client/ripe-atlas-cousteau/metadata.xml
+++ b/www-client/ripe-atlas-cousteau/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo@danielquinn.org</email>
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ripe.atlas.cousteau</remote-id>
 	</upstream>
diff --git a/www-client/seamonkey-bin/metadata.xml b/www-client/seamonkey-bin/metadata.xml
index 49b17a8957fb..6112ef32d3a7 100644
--- a/www-client/seamonkey-bin/metadata.xml
+++ b/www-client/seamonkey-bin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mozilla</herd>
 	<maintainer>
 		<email>jdhore@gentoo.org</email>
 		<name>Jeff Horelick</name>
@@ -11,4 +10,8 @@
 		<name>Elizabeth Myers</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+<maintainer>
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 0277699ae500..98893f9e3f55 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
-  <maintainer>
+<maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+<maintainer>
+    <email>mozilla@gentoo.org</email>
+    <name>Gentoo Mozilla Team</name>
+  </maintainer>
 <use>
 	<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
 	<flag name="custom-optimization">Fine-tune custom compiler
diff --git a/www-client/surfraw/metadata.xml b/www-client/surfraw/metadata.xml
index a38ca9cdc4a3..17110e6f4a92 100644
--- a/www-client/surfraw/metadata.xml
+++ b/www-client/surfraw/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
@@ -10,6 +9,10 @@
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Surfraw provides a fast unix command line interface to a variety of
 		popular WWW search engines and other artifacts of power. It reclaims
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
index 5d8d1b030ec2..6304d5b28ae8 100644
--- a/www-client/uzbl/metadata.xml
+++ b/www-client/uzbl/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>tharvik@gmail.com</email>
 		<name>Kéwan Marconnet</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="browser">Install the uzbl-browser script</flag>
 		<flag name="experimental">Enable experimental branch</flag>
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index eeaac1e0cc4b..5670d66bb8e5 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<use>
 		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
 	</use>
diff --git a/www-client/w3mmee/metadata.xml b/www-client/w3mmee/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/www-client/w3mmee/metadata.xml
+++ b/www-client/w3mmee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-misc/awstats/metadata.xml b/www-misc/awstats/metadata.xml
index 4767441ed67c..a0edcdbe5aa3 100644
--- a/www-misc/awstats/metadata.xml
+++ b/www-misc/awstats/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>web-apps</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
index 308bf11c1fc7..8de7993635bc 100644
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	fcgiwrap is a simple server for running CGI applications over FastCGI. It
 	hopes to provide clean CGI support to Nginx (and other web servers that may
diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml
index 95c06f0095bb..5267114f8a2a 100644
--- a/www-misc/htdig/metadata.xml
+++ b/www-misc/htdig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 04e6d0d7818c..95a38d77409a 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>WebDAV server protocol compliance test suite</longdescription>
 	<use>
 		<flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag>
diff --git a/www-misc/shellinabox/metadata.xml b/www-misc/shellinabox/metadata.xml
index a7ec23a9d4b9..7b49cb1d993a 100644
--- a/www-misc/shellinabox/metadata.xml
+++ b/www-misc/shellinabox/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<use>
 		<flag name="ssl">Enable SSL support.</flag>
 		<flag name="pam">Enable PAM support.</flag>
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
index 613721190802..71f3dc889486 100644
--- a/www-misc/vdradmin-am/metadata.xml
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index fda74fd5835d..db4f1d9fe514 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <use>
 <flag name="kde">Install a KCM plugin for configuring flash player preferences</flag>
 </use>
diff --git a/www-plugins/chrome-binary-plugins/metadata.xml b/www-plugins/chrome-binary-plugins/metadata.xml
index 09868e174618..ec2c78bec174 100644
--- a/www-plugins/chrome-binary-plugins/metadata.xml
+++ b/www-plugins/chrome-binary-plugins/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>chromium</herd>
 	<maintainer>
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
@@ -10,6 +9,10 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer>
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
 	<use>
 		<flag name="flash">Install Chrome's native Pepper Flash</flag>
 		<flag name="widevine">Install the Widevine DRM library</flag>
diff --git a/www-plugins/gecko-mediaplayer/metadata.xml b/www-plugins/gecko-mediaplayer/metadata.xml
index b9229a7c57b7..bea116764fc8 100644
--- a/www-plugins/gecko-mediaplayer/metadata.xml
+++ b/www-plugins/gecko-mediaplayer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/www-plugins/google-talkplugin/metadata.xml b/www-plugins/google-talkplugin/metadata.xml
index f3b1b0184f83..c35b3c57ddf4 100644
--- a/www-plugins/google-talkplugin/metadata.xml
+++ b/www-plugins/google-talkplugin/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-plugins/kaffeine-mozilla-plugin/metadata.xml b/www-plugins/kaffeine-mozilla-plugin/metadata.xml
index 62c56c83007a..9b6ec4b2a500 100644
--- a/www-plugins/kaffeine-mozilla-plugin/metadata.xml
+++ b/www-plugins/kaffeine-mozilla-plugin/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kaffeine</remote-id>
 	</upstream>
diff --git a/www-plugins/kpartsplugin/metadata.xml b/www-plugins/kpartsplugin/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/www-plugins/kpartsplugin/metadata.xml
+++ b/www-plugins/kpartsplugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-plugins/nspluginwrapper/metadata.xml b/www-plugins/nspluginwrapper/metadata.xml
index 0c34d4956475..56f6460cc86a 100644
--- a/www-plugins/nspluginwrapper/metadata.xml
+++ b/www-plugins/nspluginwrapper/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>amd64</herd>
 <maintainer>
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
 </maintainer>
+<maintainer>
+  <email>amd64@gentoo.org</email>
+  <name>AMD64 Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 92d30e8ed79a..2ddbbe6768a6 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
@@ -11,6 +10,10 @@
     <name>Johan Bergström</name>
     <description>Co-maintainer, CC on bugs.</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="aio">Enables file AIO support</flag>
     <flag name="http">Enable HTTP core support</flag>
diff --git a/www-servers/ocsigenserver/metadata.xml b/www-servers/ocsigenserver/metadata.xml
index 6c2941a2a9ed..3c312bcff7bb 100644
--- a/www-servers/ocsigenserver/metadata.xml
+++ b/www-servers/ocsigenserver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocsigen/ocsigenserver</remote-id>
 	</upstream>
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
index 56bd1ef88cb0..1ba5e64db90e 100644
--- a/www-servers/resin/metadata.xml
+++ b/www-servers/resin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+	  <email>java@gentoo.org</email>
+	  <name>Java</name>
+  </maintainer>
   <use>
 	  <flag name="admin">Enable Resin admin webapp</flag>
   </use>
diff --git a/www-servers/thin/metadata.xml b/www-servers/thin/metadata.xml
index 468426a55f69..e5e9b73cc1cb 100644
--- a/www-servers/thin/metadata.xml
+++ b/www-servers/thin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription>
 Thin is a very simple web server written in Ruby. It's single-threaded, which
 means it can only serve one request at a time. This simplicity affords increased
diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index e194d2375db6..f1e2368c8b0b 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>
     Tomcat is the servlet container that is used in the official Reference
     Implementation for the Java Servlet and JavaServer Pages technologies.
diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
index ec9b762db147..f218826fcc53 100644
--- a/www-servers/tornado/metadata.xml
+++ b/www-servers/tornado/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
   <maintainer>
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tornado</remote-id>
     <remote-id type="github">tornadoweb/tornado</remote-id>
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 63a1c4418db4..4492241f3085 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
index da626214408a..bd28ecd48db9 100644
--- a/www-servers/xsp/metadata.xml
+++ b/www-servers/xsp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+                <email>dotnet@gentoo.org</email>
+                <name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		XSP is a standalone web server written in C# that can be used to run
 		your ASP.NET applications.
diff --git a/x11-apps/amlc/metadata.xml b/x11-apps/amlc/metadata.xml
index 1f92389269f6..c0c4aed3b2c1 100644
--- a/x11-apps/amlc/metadata.xml
+++ b/x11-apps/amlc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">amlc.berlios</remote-id>
   </upstream>
diff --git a/x11-apps/appres/metadata.xml b/x11-apps/appres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/appres/metadata.xml
+++ b/x11-apps/appres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/ardesia/metadata.xml b/x11-apps/ardesia/metadata.xml
index f6ea1cf4cf14..4e68b1de657f 100644
--- a/x11-apps/ardesia/metadata.xml
+++ b/x11-apps/ardesia/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>ziapannocchia@gmail.com</email>
 	<name>Marco Clocchiatti</name>
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 Ardesia enables you to make colored free-hand annotations on your computer screen, 
 record it and share on the network.
diff --git a/x11-apps/bdftopcf/metadata.xml b/x11-apps/bdftopcf/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/bdftopcf/metadata.xml
+++ b/x11-apps/bdftopcf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/beforelight/metadata.xml b/x11-apps/beforelight/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/beforelight/metadata.xml
+++ b/x11-apps/beforelight/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/bitmap/metadata.xml b/x11-apps/bitmap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/bitmap/metadata.xml
+++ b/x11-apps/bitmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/ccsm/metadata.xml b/x11-apps/ccsm/metadata.xml
index 9472ccd24699..31b920f3bac2 100644
--- a/x11-apps/ccsm/metadata.xml
+++ b/x11-apps/ccsm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Compizconfig Settings Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-apps/editres/metadata.xml b/x11-apps/editres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/editres/metadata.xml
+++ b/x11-apps/editres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/fonttosfnt/metadata.xml b/x11-apps/fonttosfnt/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/fonttosfnt/metadata.xml
+++ b/x11-apps/fonttosfnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/fslsfonts/metadata.xml b/x11-apps/fslsfonts/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/fslsfonts/metadata.xml
+++ b/x11-apps/fslsfonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/fstobdf/metadata.xml b/x11-apps/fstobdf/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/fstobdf/metadata.xml
+++ b/x11-apps/fstobdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
index 36b9293a2f3e..42ea3d1d2cb4 100644
--- a/x11-apps/fusion-icon/metadata.xml
+++ b/x11-apps/fusion-icon/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-effects</herd>
+	<maintainer>
+		<email>desktop-effects@gentoo.org</email>
+		<name>Desktop effects</name>
+	</maintainer>
 	<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-apps/iceauth/metadata.xml b/x11-apps/iceauth/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/iceauth/metadata.xml
+++ b/x11-apps/iceauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/ico/metadata.xml b/x11-apps/ico/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/ico/metadata.xml
+++ b/x11-apps/ico/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index 4aa3a7936a13..7ee69caa2295 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
 <use>
  <flag name="python">Install python based register dumper utilities</flag>
  <flag name="test-programs">Install test programs for DRM driver development</flag>
diff --git a/x11-apps/listres/metadata.xml b/x11-apps/listres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/listres/metadata.xml
+++ b/x11-apps/listres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/luit/metadata.xml
+++ b/x11-apps/luit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index 96a5661d6b30..440edd55b91c 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>x11</herd>
+    <maintainer>
+        <email>x11@gentoo.org</email>
+        <name>X11</name>
+    </maintainer>
     <use>
         <flag name="egl">Build EGL utilities</flag>
         <flag name="gles2">Build OpenGL ES 2 utilities</flag>
diff --git a/x11-apps/mkfontdir/metadata.xml b/x11-apps/mkfontdir/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/mkfontdir/metadata.xml
+++ b/x11-apps/mkfontdir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/mkfontscale/metadata.xml b/x11-apps/mkfontscale/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/mkfontscale/metadata.xml
+++ b/x11-apps/mkfontscale/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/oclock/metadata.xml b/x11-apps/oclock/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/oclock/metadata.xml
+++ b/x11-apps/oclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/python-whiteboard/metadata.xml b/x11-apps/python-whiteboard/metadata.xml
index 3f861ec05ca1..68c18381bfc4 100644
--- a/x11-apps/python-whiteboard/metadata.xml
+++ b/x11-apps/python-whiteboard/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
@@ -12,6 +11,10 @@
 		<name>Marco Clocchiatti</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	Build and operate an electronic whiteboard using gnu/linux, a wiimote and an IR pen.
 	</longdescription>
diff --git a/x11-apps/radeontop/metadata.xml b/x11-apps/radeontop/metadata.xml
index b636395628b0..76c4b399b491 100644
--- a/x11-apps/radeontop/metadata.xml
+++ b/x11-apps/radeontop/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer>
 		<email>nikoli@gmx.us</email>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">clbr/radeontop</remote-id>
 	</upstream>
diff --git a/x11-apps/rgb/metadata.xml b/x11-apps/rgb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/rgb/metadata.xml
+++ b/x11-apps/rgb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/rstart/metadata.xml b/x11-apps/rstart/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/rstart/metadata.xml
+++ b/x11-apps/rstart/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/scripts/metadata.xml b/x11-apps/scripts/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/scripts/metadata.xml
+++ b/x11-apps/scripts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/sessreg/metadata.xml b/x11-apps/sessreg/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/sessreg/metadata.xml
+++ b/x11-apps/sessreg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/setxkbmap/metadata.xml b/x11-apps/setxkbmap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/setxkbmap/metadata.xml
+++ b/x11-apps/setxkbmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/showfont/metadata.xml b/x11-apps/showfont/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/showfont/metadata.xml
+++ b/x11-apps/showfont/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/simple-ccsm/metadata.xml b/x11-apps/simple-ccsm/metadata.xml
index 7c85fbdd4d61..1d30d81435e2 100644
--- a/x11-apps/simple-ccsm/metadata.xml
+++ b/x11-apps/simple-ccsm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-apps/smproxy/metadata.xml b/x11-apps/smproxy/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/smproxy/metadata.xml
+++ b/x11-apps/smproxy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/spotlighter/metadata.xml b/x11-apps/spotlighter/metadata.xml
index aa721ff16273..7f6db1279a83 100644
--- a/x11-apps/spotlighter/metadata.xml
+++ b/x11-apps/spotlighter/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
@@ -12,6 +11,10 @@
 		<name>Marco Clocchiatti</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Spotlighter is a tool that show a movable and resizable spotlight
 		on the desktop screen.
 		You can use this to hide and show objects on the desktop.
diff --git a/x11-apps/transset/metadata.xml b/x11-apps/transset/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/transset/metadata.xml
+++ b/x11-apps/transset/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/viewres/metadata.xml b/x11-apps/viewres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/viewres/metadata.xml
+++ b/x11-apps/viewres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/whyteboard/metadata.xml b/x11-apps/whyteboard/metadata.xml
index e86319d033f7..6eccc4156544 100644
--- a/x11-apps/whyteboard/metadata.xml
+++ b/x11-apps/whyteboard/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>lxnay@gentoo.org</email>
     <name>Fabio Erculiani</name>
@@ -12,6 +11,10 @@
     <name>Marco Clocchiatti</name>
     <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">A simple image, PDF and postscript file annotator.</longdescription>
   <upstream>
     <maintainer status="active">
diff --git a/x11-apps/x11perf/metadata.xml b/x11-apps/x11perf/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/x11perf/metadata.xml
+++ b/x11-apps/x11perf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xauth/metadata.xml b/x11-apps/xauth/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-apps/xauth/metadata.xml
+++ b/x11-apps/xauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xbacklight/metadata.xml b/x11-apps/xbacklight/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xbacklight/metadata.xml
+++ b/x11-apps/xbacklight/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xbiff/metadata.xml b/x11-apps/xbiff/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xbiff/metadata.xml
+++ b/x11-apps/xbiff/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xcalc/metadata.xml b/x11-apps/xcalc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xcalc/metadata.xml
+++ b/x11-apps/xcalc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xclipboard/metadata.xml b/x11-apps/xclipboard/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xclipboard/metadata.xml
+++ b/x11-apps/xclipboard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xclock/metadata.xml b/x11-apps/xclock/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xclock/metadata.xml
+++ b/x11-apps/xclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xcmsdb/metadata.xml b/x11-apps/xcmsdb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xcmsdb/metadata.xml
+++ b/x11-apps/xcmsdb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xconsole/metadata.xml b/x11-apps/xconsole/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xconsole/metadata.xml
+++ b/x11-apps/xconsole/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xcursorgen/metadata.xml b/x11-apps/xcursorgen/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xcursorgen/metadata.xml
+++ b/x11-apps/xcursorgen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xdbedizzy/metadata.xml b/x11-apps/xdbedizzy/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xdbedizzy/metadata.xml
+++ b/x11-apps/xdbedizzy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xditview/metadata.xml b/x11-apps/xditview/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xditview/metadata.xml
+++ b/x11-apps/xditview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index de17c4b2786f..7a360c1ba405 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <use>
     <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
     <flag name="xdm-auth">Enable XDM-AUTHENTICATION-1 support</flag>
diff --git a/x11-apps/xdpyinfo/metadata.xml b/x11-apps/xdpyinfo/metadata.xml
index 358dd30a9f7e..ff7d6b8428d2 100644
--- a/x11-apps/xdpyinfo/metadata.xml
+++ b/x11-apps/xdpyinfo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="dmx">Builds support for Distributed Multiheaded X
 		<pkg>x11-base/xorg-server</pkg></flag>
diff --git a/x11-apps/xdriinfo/metadata.xml b/x11-apps/xdriinfo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xdriinfo/metadata.xml
+++ b/x11-apps/xdriinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xedit/metadata.xml b/x11-apps/xedit/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xedit/metadata.xml
+++ b/x11-apps/xedit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xev/metadata.xml b/x11-apps/xev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xev/metadata.xml
+++ b/x11-apps/xev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xeyes/metadata.xml b/x11-apps/xeyes/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xeyes/metadata.xml
+++ b/x11-apps/xeyes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xf86dga/metadata.xml b/x11-apps/xf86dga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xf86dga/metadata.xml
+++ b/x11-apps/xf86dga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xfd/metadata.xml b/x11-apps/xfd/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xfd/metadata.xml
+++ b/x11-apps/xfd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xfontsel/metadata.xml b/x11-apps/xfontsel/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xfontsel/metadata.xml
+++ b/x11-apps/xfontsel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xgamma/metadata.xml b/x11-apps/xgamma/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xgamma/metadata.xml
+++ b/x11-apps/xgamma/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xgc/metadata.xml b/x11-apps/xgc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xgc/metadata.xml
+++ b/x11-apps/xgc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xhost/metadata.xml b/x11-apps/xhost/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xhost/metadata.xml
+++ b/x11-apps/xhost/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index d4002ef52485..dabcea2c41cf 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="minimal">
 			Control dependencies on legacy apps (xterm, twm, ...). Safe to
diff --git a/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
index 962587d4405b..0152b20560c1 100644
--- a/x11-apps/xinput/metadata.xml
+++ b/x11-apps/xinput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
 	</upstream>
diff --git a/x11-apps/xinput_calibrator/metadata.xml b/x11-apps/xinput_calibrator/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-apps/xinput_calibrator/metadata.xml
+++ b/x11-apps/xinput_calibrator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xkbcomp/metadata.xml b/x11-apps/xkbcomp/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xkbcomp/metadata.xml
+++ b/x11-apps/xkbcomp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xkbevd/metadata.xml b/x11-apps/xkbevd/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xkbevd/metadata.xml
+++ b/x11-apps/xkbevd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xkbprint/metadata.xml b/x11-apps/xkbprint/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xkbprint/metadata.xml
+++ b/x11-apps/xkbprint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xkbutils/metadata.xml b/x11-apps/xkbutils/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xkbutils/metadata.xml
+++ b/x11-apps/xkbutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xkill/metadata.xml b/x11-apps/xkill/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xkill/metadata.xml
+++ b/x11-apps/xkill/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xload/metadata.xml b/x11-apps/xload/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xload/metadata.xml
+++ b/x11-apps/xload/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xlogo/metadata.xml b/x11-apps/xlogo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xlogo/metadata.xml
+++ b/x11-apps/xlogo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xlsatoms/metadata.xml b/x11-apps/xlsatoms/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xlsatoms/metadata.xml
+++ b/x11-apps/xlsatoms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xlsclients/metadata.xml b/x11-apps/xlsclients/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xlsclients/metadata.xml
+++ b/x11-apps/xlsclients/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xlsfonts/metadata.xml b/x11-apps/xlsfonts/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xlsfonts/metadata.xml
+++ b/x11-apps/xlsfonts/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xmag/metadata.xml b/x11-apps/xmag/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xmag/metadata.xml
+++ b/x11-apps/xmag/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xman/metadata.xml b/x11-apps/xman/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xman/metadata.xml
+++ b/x11-apps/xman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xmessage/metadata.xml b/x11-apps/xmessage/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xmessage/metadata.xml
+++ b/x11-apps/xmessage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xmodmap/metadata.xml b/x11-apps/xmodmap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xmodmap/metadata.xml
+++ b/x11-apps/xmodmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xmore/metadata.xml b/x11-apps/xmore/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xmore/metadata.xml
+++ b/x11-apps/xmore/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xpr/metadata.xml b/x11-apps/xpr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xpr/metadata.xml
+++ b/x11-apps/xpr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xprop/metadata.xml b/x11-apps/xprop/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xprop/metadata.xml
+++ b/x11-apps/xprop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xrandr/metadata.xml b/x11-apps/xrandr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xrandr/metadata.xml
+++ b/x11-apps/xrandr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xrdb/metadata.xml b/x11-apps/xrdb/metadata.xml
index 35172171ffb7..1bbfb99ba065 100644
--- a/x11-apps/xrdb/metadata.xml
+++ b/x11-apps/xrdb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
 </upstream>
diff --git a/x11-apps/xrectsel/metadata.xml b/x11-apps/xrectsel/metadata.xml
index c868de9720ee..205dba39d87f 100644
--- a/x11-apps/xrectsel/metadata.xml
+++ b/x11-apps/xrectsel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lolilolicon/xrectsel</remote-id>
 	</upstream>
diff --git a/x11-apps/xrefresh/metadata.xml b/x11-apps/xrefresh/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xrefresh/metadata.xml
+++ b/x11-apps/xrefresh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xset/metadata.xml b/x11-apps/xset/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xset/metadata.xml
+++ b/x11-apps/xset/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xsetroot/metadata.xml b/x11-apps/xsetroot/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xsetroot/metadata.xml
+++ b/x11-apps/xsetroot/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml
index 264927988512..01815a9d6cf4 100644
--- a/x11-apps/xsm/metadata.xml
+++ b/x11-apps/xsm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy).</flag>
 </use>
diff --git a/x11-apps/xstdcmap/metadata.xml b/x11-apps/xstdcmap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xstdcmap/metadata.xml
+++ b/x11-apps/xstdcmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xtrap/metadata.xml b/x11-apps/xtrap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xtrap/metadata.xml
+++ b/x11-apps/xtrap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xvidtune/metadata.xml b/x11-apps/xvidtune/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xvidtune/metadata.xml
+++ b/x11-apps/xvidtune/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xvinfo/metadata.xml b/x11-apps/xvinfo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xvinfo/metadata.xml
+++ b/x11-apps/xvinfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xwd/metadata.xml b/x11-apps/xwd/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xwd/metadata.xml
+++ b/x11-apps/xwd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xwininfo/metadata.xml b/x11-apps/xwininfo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xwininfo/metadata.xml
+++ b/x11-apps/xwininfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-apps/xwud/metadata.xml b/x11-apps/xwud/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-apps/xwud/metadata.xml
+++ b/x11-apps/xwud/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-base/xorg-drivers/metadata.xml
+++ b/x11-base/xorg-drivers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index fef28b682bd1..6114f4e62558 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="dmx">Build the Distributed Multiheaded X server</flag>
 	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 26b7e0083c13..781109c82da7 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
 </pkgmetadata>
diff --git a/x11-drivers/afb-ucode/metadata.xml b/x11-drivers/afb-ucode/metadata.xml
index bec30fdf4884..9d2258a9da51 100644
--- a/x11-drivers/afb-ucode/metadata.xml
+++ b/x11-drivers/afb-ucode/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sparc</herd>
+<maintainer>
+	<email>sparc@gentoo.org</email>
+	<name>Gentoo Linux SPARC Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 41b5fc7e9f57..e1a4e77417d1 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>x11@gentoo.org</email>
 		<description>Assign to herd.</description>
@@ -11,6 +9,10 @@
 		<email>jekarlson@gmail.com</email>
 		<description>Proxy maintainer, CC him on bugs.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="qt4">
 			Install qt4 dependent optional tools (e.g Catalyst Control Panel)
diff --git a/x11-drivers/xf86-input-acecad/metadata.xml b/x11-drivers/xf86-input-acecad/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-acecad/metadata.xml
+++ b/x11-drivers/xf86-input-acecad/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-aiptek/metadata.xml b/x11-drivers/xf86-input-aiptek/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-aiptek/metadata.xml
+++ b/x11-drivers/xf86-input-aiptek/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-elographics/metadata.xml b/x11-drivers/xf86-input-elographics/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-elographics/metadata.xml
+++ b/x11-drivers/xf86-input-elographics/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-evdev/metadata.xml b/x11-drivers/xf86-input-evdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-evdev/metadata.xml
+++ b/x11-drivers/xf86-input-evdev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-fpit/metadata.xml b/x11-drivers/xf86-input-fpit/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-fpit/metadata.xml
+++ b/x11-drivers/xf86-input-fpit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-hyperpen/metadata.xml b/x11-drivers/xf86-input-hyperpen/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-hyperpen/metadata.xml
+++ b/x11-drivers/xf86-input-hyperpen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-joystick/metadata.xml b/x11-drivers/xf86-input-joystick/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-joystick/metadata.xml
+++ b/x11-drivers/xf86-input-joystick/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-keyboard/metadata.xml b/x11-drivers/xf86-input-keyboard/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-keyboard/metadata.xml
+++ b/x11-drivers/xf86-input-keyboard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-libinput/metadata.xml b/x11-drivers/xf86-input-libinput/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-libinput/metadata.xml
+++ b/x11-drivers/xf86-input-libinput/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-mouse/metadata.xml b/x11-drivers/xf86-input-mouse/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-mouse/metadata.xml
+++ b/x11-drivers/xf86-input-mouse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-mtrack/metadata.xml b/x11-drivers/xf86-input-mtrack/metadata.xml
index 9f444a786712..16d41677c196 100644
--- a/x11-drivers/xf86-input-mtrack/metadata.xml
+++ b/x11-drivers/xf86-input-mtrack/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">BlueDragonX/xf86-input-mtrack</remote-id>
   </upstream>
diff --git a/x11-drivers/xf86-input-mutouch/metadata.xml b/x11-drivers/xf86-input-mutouch/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-mutouch/metadata.xml
+++ b/x11-drivers/xf86-input-mutouch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-penmount/metadata.xml b/x11-drivers/xf86-input-penmount/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-penmount/metadata.xml
+++ b/x11-drivers/xf86-input-penmount/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml
index c923f3ff7c16..37e9c1087310 100644
--- a/x11-drivers/xf86-input-synaptics/metadata.xml
+++ b/x11-drivers/xf86-input-synaptics/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>eva@gentoo.org</email>
 		<name>Gilles Dartiguelongue</name>
@@ -12,4 +10,12 @@
 		<name>Christoph Brill</name>
 		<description>upstream co-maintainer</description>
 	</maintainer>
+<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-tslib/metadata.xml b/x11-drivers/xf86-input-tslib/metadata.xml
index 83fba9ad767e..5bcf802750e7 100644
--- a/x11-drivers/xf86-input-tslib/metadata.xml
+++ b/x11-drivers/xf86-input-tslib/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
-<herd>x11</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-vmmouse/metadata.xml b/x11-drivers/xf86-input-vmmouse/metadata.xml
index 8a4ab6d163db..e0f72925dde3 100644
--- a/x11-drivers/xf86-input-vmmouse/metadata.xml
+++ b/x11-drivers/xf86-input-vmmouse/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-void/metadata.xml b/x11-drivers/xf86-input-void/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-void/metadata.xml
+++ b/x11-drivers/xf86-input-void/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-wacom/metadata.xml b/x11-drivers/xf86-input-wacom/metadata.xml
index dfa7f95c2666..1a222876a093 100644
--- a/x11-drivers/xf86-input-wacom/metadata.xml
+++ b/x11-drivers/xf86-input-wacom/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <longdescription>Driver for Wacom tablets and drawing devices (friendly fork of linuxwacom)</longdescription>
   <upstream>
     <remote-id type="sourceforge">linuxwacom</remote-id>
diff --git a/x11-drivers/xf86-video-amdgpu/metadata.xml b/x11-drivers/xf86-video-amdgpu/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-amdgpu/metadata.xml
+++ b/x11-drivers/xf86-video-amdgpu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 </use>
diff --git a/x11-drivers/xf86-video-apm/metadata.xml b/x11-drivers/xf86-video-apm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-apm/metadata.xml
+++ b/x11-drivers/xf86-video-apm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ark/metadata.xml b/x11-drivers/xf86-video-ark/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-ark/metadata.xml
+++ b/x11-drivers/xf86-video-ark/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ast/metadata.xml b/x11-drivers/xf86-video-ast/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-ast/metadata.xml
+++ b/x11-drivers/xf86-video-ast/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-ati/metadata.xml
+++ b/x11-drivers/xf86-video-ati/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 </use>
diff --git a/x11-drivers/xf86-video-chips/metadata.xml b/x11-drivers/xf86-video-chips/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-chips/metadata.xml
+++ b/x11-drivers/xf86-video-chips/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-cirrus/metadata.xml b/x11-drivers/xf86-video-cirrus/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-cirrus/metadata.xml
+++ b/x11-drivers/xf86-video-cirrus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-dummy/metadata.xml b/x11-drivers/xf86-video-dummy/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-dummy/metadata.xml
+++ b/x11-drivers/xf86-video-dummy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-fbdev/metadata.xml b/x11-drivers/xf86-video-fbdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-fbdev/metadata.xml
+++ b/x11-drivers/xf86-video-fbdev/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-freedreno/metadata.xml b/x11-drivers/xf86-video-freedreno/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-drivers/xf86-video-freedreno/metadata.xml
+++ b/x11-drivers/xf86-video-freedreno/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-geode/metadata.xml b/x11-drivers/xf86-video-geode/metadata.xml
index 6634fd0793d3..48bf9304d1cb 100644
--- a/x11-drivers/xf86-video-geode/metadata.xml
+++ b/x11-drivers/xf86-video-geode/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
 <maintainer>
 <email>leio@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
 <use>
 <flag name="ztv">Enable building the V4L2 ZTV driver</flag>
 </use>
diff --git a/x11-drivers/xf86-video-glint/metadata.xml b/x11-drivers/xf86-video-glint/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-glint/metadata.xml
+++ b/x11-drivers/xf86-video-glint/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-i128/metadata.xml b/x11-drivers/xf86-video-i128/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-i128/metadata.xml
+++ b/x11-drivers/xf86-video-i128/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-i740/metadata.xml b/x11-drivers/xf86-video-i740/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-i740/metadata.xml
+++ b/x11-drivers/xf86-video-i740/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
index fd3227137901..ff0923340194 100644
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 		<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
diff --git a/x11-drivers/xf86-video-ivtv/metadata.xml b/x11-drivers/xf86-video-ivtv/metadata.xml
index 9815514cc5a1..2c08b337dac8 100644
--- a/x11-drivers/xf86-video-ivtv/metadata.xml
+++ b/x11-drivers/xf86-video-ivtv/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
 <maintainer>
 	<email>je_fro@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <longdescription lang="en">
 	X.Org driver for TV-out on ivtv cards
 </longdescription>
diff --git a/x11-drivers/xf86-video-mach64/metadata.xml b/x11-drivers/xf86-video-mach64/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-mach64/metadata.xml
+++ b/x11-drivers/xf86-video-mach64/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-mga/metadata.xml b/x11-drivers/xf86-video-mga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-mga/metadata.xml
+++ b/x11-drivers/xf86-video-mga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-modesetting/metadata.xml b/x11-drivers/xf86-video-modesetting/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-modesetting/metadata.xml
+++ b/x11-drivers/xf86-video-modesetting/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-neomagic/metadata.xml b/x11-drivers/xf86-video-neomagic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-neomagic/metadata.xml
+++ b/x11-drivers/xf86-video-neomagic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-newport/metadata.xml b/x11-drivers/xf86-video-newport/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-newport/metadata.xml
+++ b/x11-drivers/xf86-video-newport/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-nouveau/metadata.xml b/x11-drivers/xf86-video-nouveau/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-nouveau/metadata.xml
+++ b/x11-drivers/xf86-video-nouveau/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 </use>
diff --git a/x11-drivers/xf86-video-nv/metadata.xml b/x11-drivers/xf86-video-nv/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-nv/metadata.xml
+++ b/x11-drivers/xf86-video-nv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-omap/metadata.xml b/x11-drivers/xf86-video-omap/metadata.xml
index 48b24f0a1db6..df5ca67c3772 100644
--- a/x11-drivers/xf86-video-omap/metadata.xml
+++ b/x11-drivers/xf86-video-omap/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<herd>arm</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-omapfb/metadata.xml b/x11-drivers/xf86-video-omapfb/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/x11-drivers/xf86-video-omapfb/metadata.xml
+++ b/x11-drivers/xf86-video-omapfb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>arm</herd>
+<maintainer>
+	<email>arm@gentoo.org</email>
+	<name>Gentoo Linux ARM Development</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-openchrome/metadata.xml b/x11-drivers/xf86-video-openchrome/metadata.xml
index 8c3d909e870e..50e9760eee86 100644
--- a/x11-drivers/xf86-video-openchrome/metadata.xml
+++ b/x11-drivers/xf86-video-openchrome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
 <use>
 <flag name="viaregtool">Install registers dumper tool</flag>
 </use>
diff --git a/x11-drivers/xf86-video-opentegra/metadata.xml b/x11-drivers/xf86-video-opentegra/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-opentegra/metadata.xml
+++ b/x11-drivers/xf86-video-opentegra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-qxl/metadata.xml b/x11-drivers/xf86-video-qxl/metadata.xml
index 7fd8b1eb5c3e..1c9e935050c7 100644
--- a/x11-drivers/xf86-video-qxl/metadata.xml
+++ b/x11-drivers/xf86-video-qxl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
 <use>
 <flag name="xspice">Build the xspice driver</flag>
 </use>
diff --git a/x11-drivers/xf86-video-r128/metadata.xml b/x11-drivers/xf86-video-r128/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-r128/metadata.xml
+++ b/x11-drivers/xf86-video-r128/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-rendition/metadata.xml b/x11-drivers/xf86-video-rendition/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-rendition/metadata.xml
+++ b/x11-drivers/xf86-video-rendition/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-s3/metadata.xml b/x11-drivers/xf86-video-s3/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-s3/metadata.xml
+++ b/x11-drivers/xf86-video-s3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-s3virge/metadata.xml b/x11-drivers/xf86-video-s3virge/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-s3virge/metadata.xml
+++ b/x11-drivers/xf86-video-s3virge/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-savage/metadata.xml b/x11-drivers/xf86-video-savage/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-savage/metadata.xml
+++ b/x11-drivers/xf86-video-savage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-siliconmotion/metadata.xml b/x11-drivers/xf86-video-siliconmotion/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-siliconmotion/metadata.xml
+++ b/x11-drivers/xf86-video-siliconmotion/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-sis/metadata.xml b/x11-drivers/xf86-video-sis/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sis/metadata.xml
+++ b/x11-drivers/xf86-video-sis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-sisusb/metadata.xml b/x11-drivers/xf86-video-sisusb/metadata.xml
index 3cb365e8431a..6293af6c4818 100644
--- a/x11-drivers/xf86-video-sisusb/metadata.xml
+++ b/x11-drivers/xf86-video-sisusb/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
 	<maintainer>
 		<email>vapier@gentoo.org</email>
 		<name>Mike Frysinger</name>
 	</maintainer>
+<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg14/metadata.xml b/x11-drivers/xf86-video-suncg14/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg14/metadata.xml
+++ b/x11-drivers/xf86-video-suncg14/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg3/metadata.xml b/x11-drivers/xf86-video-suncg3/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg3/metadata.xml
+++ b/x11-drivers/xf86-video-suncg3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg6/metadata.xml b/x11-drivers/xf86-video-suncg6/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg6/metadata.xml
+++ b/x11-drivers/xf86-video-suncg6/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-sunffb/metadata.xml b/x11-drivers/xf86-video-sunffb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sunffb/metadata.xml
+++ b/x11-drivers/xf86-video-sunffb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-sunleo/metadata.xml b/x11-drivers/xf86-video-sunleo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sunleo/metadata.xml
+++ b/x11-drivers/xf86-video-sunleo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-suntcx/metadata.xml b/x11-drivers/xf86-video-suntcx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suntcx/metadata.xml
+++ b/x11-drivers/xf86-video-suntcx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-tdfx/metadata.xml b/x11-drivers/xf86-video-tdfx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tdfx/metadata.xml
+++ b/x11-drivers/xf86-video-tdfx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-tga/metadata.xml b/x11-drivers/xf86-video-tga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tga/metadata.xml
+++ b/x11-drivers/xf86-video-tga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-trident/metadata.xml b/x11-drivers/xf86-video-trident/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-trident/metadata.xml
+++ b/x11-drivers/xf86-video-trident/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-tseng/metadata.xml b/x11-drivers/xf86-video-tseng/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tseng/metadata.xml
+++ b/x11-drivers/xf86-video-tseng/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-v4l/metadata.xml b/x11-drivers/xf86-video-v4l/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-v4l/metadata.xml
+++ b/x11-drivers/xf86-video-v4l/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-vesa/metadata.xml b/x11-drivers/xf86-video-vesa/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-vesa/metadata.xml
+++ b/x11-drivers/xf86-video-vesa/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-vmware/metadata.xml b/x11-drivers/xf86-video-vmware/metadata.xml
index 8a4ab6d163db..e0f72925dde3 100644
--- a/x11-drivers/xf86-video-vmware/metadata.xml
+++ b/x11-drivers/xf86-video-vmware/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-voodoo/metadata.xml b/x11-drivers/xf86-video-voodoo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-voodoo/metadata.xml
+++ b/x11-drivers/xf86-video-voodoo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 4ac61867094f..6e3887754976 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
 	</upstream>
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index b076360db45e..839a18052010 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
   <maintainer>
 	<email>tetromino@gentoo.org</email>
 	<name>Alexandre Rostovtsev</name>
@@ -11,6 +10,10 @@
     <name>Ben de Groot</name>
 	<description>Secondary maintainer (x11 team is primary)</description>
   </maintainer>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <use>
     <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">
       Use Mesa backend for acceleration</flag>
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
index b8c820e5807e..524d8b2e1df5 100644
--- a/x11-libs/compiz-bcop/metadata.xml
+++ b/x11-libs/compiz-bcop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">
 BCOP is a code generator that provides an easy way to handle plugin options by
 generating parts of the plugin code directly from the xml metadata file. 
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
index aad6dbb7276c..10ae9d7df39d 100644
--- a/x11-libs/compizconfig-backend-gconf/metadata.xml
+++ b/x11-libs/compizconfig-backend-gconf/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
index 6b904364e152..d9434b3bbbdf 100644
--- a/x11-libs/compizconfig-backend-kconfig4/metadata.xml
+++ b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/flowcanvas/metadata.xml b/x11-libs/flowcanvas/metadata.xml
index 6292b8c1f28d..df77019bb066 100644
--- a/x11-libs/flowcanvas/metadata.xml
+++ b/x11-libs/flowcanvas/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
 <longdescription lang="en">
 	FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes and
 	lines" environments (ie modular synths or interactive finite state automata
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index b77585c4741b..2efd757f556d 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+  <email>desktop-misc@gentoo.org</email>
+  <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription>
   The Fast Light ToolKit is a cross-platform C++ user interface
   toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gksu/metadata.xml
+++ b/x11-libs/gksu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
index 678526ea433f..6cad271d9c04 100644
--- a/x11-libs/gl2ps/metadata.xml
+++ b/x11-libs/gl2ps/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   GL2PS is a C library providing high quality vector output for any
   OpenGL application. The main difference between GL2PS and other
diff --git a/x11-libs/glamor/metadata.xml b/x11-libs/glamor/metadata.xml
index a61f7113f618..1e18854c32d5 100644
--- a/x11-libs/glamor/metadata.xml
+++ b/x11-libs/glamor/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="gles">Build glamor based on gles2</flag>
 </use>
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gnome-pty-helper/metadata.xml
+++ b/x11-libs/gnome-pty-helper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
index dd404721855d..a229b10010ac 100644
--- a/x11-libs/goffice/metadata.xml
+++ b/x11-libs/goffice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<longdescription lang="en">
 		GOffice is a library of document-centric objects and utilities building
 		on top of GLib and Gtk+ and used by software such as Gnumeric.
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/goocanvas/metadata.xml
+++ b/x11-libs/goocanvas/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index f5d67e73f0e5..4e736cb89fd1 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
     GTK+ is a multi-platform toolkit for creating graphical user
     interfaces. Offering a complete set of widgets, GTK+ is suitable
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
index a97fafc3ceec..9fdfae2e19e8 100644
--- a/x11-libs/gtk+extra/metadata.xml
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkextra</remote-id>
 	</upstream>
diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml
index 4561e552bd04..4609b17cbb97 100644
--- a/x11-libs/gtk-mac-integration/metadata.xml
+++ b/x11-libs/gtk-mac-integration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
index 6e85d8cc60ad..5f435e2e0b7d 100644
--- a/x11-libs/gtkdatabox/metadata.xml
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer>
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
 	<longdescription>Gtk+ Widgets for live display fluctuating numerical data</longdescription>
 	<use>
 		<flag name="glade">Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag>
diff --git a/x11-libs/gtkglarea/metadata.xml b/x11-libs/gtkglarea/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gtkglarea/metadata.xml
+++ b/x11-libs/gtkglarea/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
index c77e80cdedf9..9f0aa705356d 100644
--- a/x11-libs/gtkglext/metadata.xml
+++ b/x11-libs/gtkglext/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtkglext</remote-id>
 	</upstream>
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
index 9ca29e5e82b5..76bcaa0f3090 100644
--- a/x11-libs/gtkmathview/metadata.xml
+++ b/x11-libs/gtkmathview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="mathml">Install additional fonts for proper mathml
 	support.</flag>
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
index 11d9db8be33d..79102e9a50b1 100644
--- a/x11-libs/gtksourceview/metadata.xml
+++ b/x11-libs/gtksourceview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="glade">Install a glade catalog file</flag>
 </use>
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
index 344196c171d9..a2bfa753eee5 100644
--- a/x11-libs/guile-gtk/metadata.xml
+++ b/x11-libs/guile-gtk/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
 	</maintainer>
+	<maintainer>
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 The guile-gtk project brings the power of Scheme to your graphical application.
 	</longdescription>
diff --git a/x11-libs/ige-mac-integration/metadata.xml b/x11-libs/ige-mac-integration/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/x11-libs/ige-mac-integration/metadata.xml
+++ b/x11-libs/ige-mac-integration/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+	<email>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libFS/metadata.xml
+++ b/x11-libs/libFS/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
index dd4783e45f5e..4fd5fa390eab 100644
--- a/x11-libs/libGLw/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mesa3d</remote-id>
 	</upstream>
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libICE/metadata.xml
+++ b/x11-libs/libICE/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index 8b3fa73a30b0..0aa9922043f4 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="uuid">Use UUID for session identification instead of IP address
 		and system time.
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index ef95d0c2c840..c919877614ac 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
 </upstream>
diff --git a/x11-libs/libXCalibrate/metadata.xml b/x11-libs/libXCalibrate/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-libs/libXCalibrate/metadata.xml
+++ b/x11-libs/libXCalibrate/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXScrnSaver/metadata.xml
+++ b/x11-libs/libXScrnSaver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXTrap/metadata.xml b/x11-libs/libXTrap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXTrap/metadata.xml
+++ b/x11-libs/libXTrap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXau/metadata.xml
+++ b/x11-libs/libXau/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
index f58d351da9d8..e70578ebf580 100644
--- a/x11-libs/libXaw/metadata.xml
+++ b/x11-libs/libXaw/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="deprecated">Install deprecated Xaw6 library.</flag>
 </use>
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXaw3d/metadata.xml
+++ b/x11-libs/libXaw3d/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXcomposite/metadata.xml
+++ b/x11-libs/libXcomposite/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXdamage/metadata.xml
+++ b/x11-libs/libXdamage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXext/metadata.xml
+++ b/x11-libs/libXext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXfixes/metadata.xml
+++ b/x11-libs/libXfixes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
index ce1f6e1a2b55..0acc578f2896 100644
--- a/x11-libs/libXfont/metadata.xml
+++ b/x11-libs/libXfont/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
 		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
index ce1f6e1a2b55..0acc578f2896 100644
--- a/x11-libs/libXfont2/metadata.xml
+++ b/x11-libs/libXfont2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
 		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
diff --git a/x11-libs/libXfontcache/metadata.xml b/x11-libs/libXfontcache/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXfontcache/metadata.xml
+++ b/x11-libs/libXfontcache/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXft/metadata.xml
+++ b/x11-libs/libXft/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXi/metadata.xml
+++ b/x11-libs/libXi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXinerama/metadata.xml
+++ b/x11-libs/libXinerama/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXmu/metadata.xml
+++ b/x11-libs/libXmu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXp/metadata.xml b/x11-libs/libXp/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXp/metadata.xml
+++ b/x11-libs/libXp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXpm/metadata.xml
+++ b/x11-libs/libXpm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXrandr/metadata.xml
+++ b/x11-libs/libXrandr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXrender/metadata.xml
+++ b/x11-libs/libXrender/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXres/metadata.xml
+++ b/x11-libs/libXres/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXt/metadata.xml
+++ b/x11-libs/libXt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXtst/metadata.xml
+++ b/x11-libs/libXtst/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXv/metadata.xml
+++ b/x11-libs/libXv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXvMC/metadata.xml
+++ b/x11-libs/libXvMC/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86dga/metadata.xml
+++ b/x11-libs/libXxf86dga/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXxf86misc/metadata.xml b/x11-libs/libXxf86misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86misc/metadata.xml
+++ b/x11-libs/libXxf86misc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86vm/metadata.xml
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
index 237116b437d9..d5bf5b265d95 100644
--- a/x11-libs/libcompizconfig/metadata.xml
+++ b/x11-libs/libcompizconfig/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/libcryptui/metadata.xml
+++ b/x11-libs/libcryptui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libdmx/metadata.xml
+++ b/x11-libs/libdmx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-libs/libdockapp/metadata.xml
+++ b/x11-libs/libdockapp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index ff58990ed2db..50b7ca6a769a 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
 <use>
 <flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
 <flag name="valgrind">Compile in valgrind memory hints</flag>
diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml
index 13070094fdcc..e218a13609c3 100644
--- a/x11-libs/libfakekey/metadata.xml
+++ b/x11-libs/libfakekey/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gpe</herd>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index 68e971611724..56db2d4eea00 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
-  <herd>lxqt</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pcmanfm</remote-id>
   </upstream>
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index 82f76ad43b71..8444adaad472 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
-  <herd>lxqt</herd>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <use>
     <flag name="vala">Support custom actions in menus</flag>
     <flag name="udisks">Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libfontenc/metadata.xml
+++ b/x11-libs/libfontenc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/libgksu/metadata.xml
+++ b/x11-libs/libgksu/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index 09b23c20c59c..66e80c95a98a 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libgxim</remote-id>
 		<remote-id type="bitbucket">tagoh/libgxim</remote-id>
diff --git a/x11-libs/libiterm-mbt/metadata.xml b/x11-libs/libiterm-mbt/metadata.xml
index 75ea3d5af77b..e116a84be222 100644
--- a/x11-libs/libiterm-mbt/metadata.xml
+++ b/x11-libs/libiterm-mbt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <longdescription>
 	Hacked version of the libiterm library.
 </longdescription>
diff --git a/x11-libs/libkscreen/metadata.xml b/x11-libs/libkscreen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-libs/libkscreen/metadata.xml
+++ b/x11-libs/libkscreen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libmatchbox/metadata.xml b/x11-libs/libmatchbox/metadata.xml
index a7fef72f1e2f..0efb326489f3 100644
--- a/x11-libs/libmatchbox/metadata.xml
+++ b/x11-libs/libmatchbox/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gpe</herd>
 	<use>
 		<flag name="pango">Enable <pkg>x11-libs/pango</pkg> support</flag>
 		<flag name="xsettings">Enable the use of xsettings for settings
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
index 81439daa1259..19ea34996e84 100644
--- a/x11-libs/liboglappth/metadata.xml
+++ b/x11-libs/liboglappth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+<maintainer>
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
 <longdescription>
 Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models 
 and molecular mechanics models (there is an experimental Tripos 5.2-like force 
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libpciaccess/metadata.xml
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
index 32c24a498f1d..83b4efffe7a2 100644
--- a/x11-libs/libqxt/metadata.xml
+++ b/x11-libs/libqxt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 <use>
 	<flag name="berkdb">Build the QxtBerkeley module</flag>
 	<flag name="sql">Build the QxtSql module</flag>
diff --git a/x11-libs/libsexy/metadata.xml b/x11-libs/libsexy/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/x11-libs/libsexy/metadata.xml
+++ b/x11-libs/libsexy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 2d8e058094e0..327bb4ef39d2 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
@@ -10,6 +9,10 @@
 	<email>jekarlson@gmail.com</email>
 	<name>Emil Karlson</name>
   </maintainer>
+	<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 	<use>
 		<flag name="drm">Enables VA/DRM API support.</flag>
     </use>
diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
index 2861eaad42d0..b70cbaa3985f 100644
--- a/x11-libs/libva-vdpau-driver/metadata.xml
+++ b/x11-libs/libva-vdpau-driver/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
   <maintainer>
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+<maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libview/metadata.xml b/x11-libs/libview/metadata.xml
index d34f18b75014..fa005babbacc 100644
--- a/x11-libs/libview/metadata.xml
+++ b/x11-libs/libview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vmware</herd>
+	<maintainer>
+		<email>vmware@gentoo.org</email>
+		<name>Gentoo VMware Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index 8e1b6e57a01a..355cc78e7922 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3
 			command-line tools</flag>
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index 6d157b5ddcf9..37fcd63cee04 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>x11</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
   <use>
     <flag name="xkb">Enable the XCB keyboard extension</flag>
   </use>
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxkbfile/metadata.xml
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libxkbui/metadata.xml b/x11-libs/libxkbui/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxkbui/metadata.xml
+++ b/x11-libs/libxkbui/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
index 1d2462d712ff..fe2720bebdab 100644
--- a/x11-libs/libxklavier/metadata.xml
+++ b/x11-libs/libxklavier/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-libs/libxsettings-client/metadata.xml b/x11-libs/libxsettings-client/metadata.xml
index 8619aae1ffb5..3447e5c316aa 100644
--- a/x11-libs/libxsettings-client/metadata.xml
+++ b/x11-libs/libxsettings-client/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
-		<herd>gpe</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxshmfence/metadata.xml
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
index 819f47669909..f77211fc5f0f 100644
--- a/x11-libs/mx/metadata.xml
+++ b/x11-libs/mx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index 1ebecbbd0df7..0bc5bdf48caf 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
 </upstream>
diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/pangox-compat/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/pangox-compat/metadata.xml
+++ b/x11-libs/pangox-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index ab31961e33f1..5d147a55d479 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
 </use>
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 661ed4fe6647..8426531e290f 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>python</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="designer">Build plugin for Qt Designer</flag>
 	</use>
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
index c6123b692e1b..26b3a49f8458 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	QTermWidget is an opensource project based on KDE4 Konsole application.
 	The main goal of this project is to provide unicode-enabled, embeddable
diff --git a/x11-libs/qtscriptgenerator/metadata.xml b/x11-libs/qtscriptgenerator/metadata.xml
index 6e3dc974f22a..a460a8ac4617 100644
--- a/x11-libs/qtscriptgenerator/metadata.xml
+++ b/x11-libs/qtscriptgenerator/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>qt</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">qtscriptgenerator</remote-id>
 	</upstream>
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index afa034e934b1..b94f120bbeb7 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The Qwt library contains GUI Components and utility classes which are
   primarily useful for programs with a technical background.
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
index e06eb8b1e62d..f75330cdbf7b 100644
--- a/x11-libs/qwtplot3d/metadata.xml
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
     QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
 	providing essentially a  bunch of 3D-widgets for programmers.
diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
index 9d090eca6c3f..2e9c8f3ab50f 100644
--- a/x11-libs/qwtpolar/metadata.xml
+++ b/x11-libs/qwtpolar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qwtpolar</remote-id>
   </upstream>
diff --git a/x11-libs/snorenotify/metadata.xml b/x11-libs/snorenotify/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-libs/snorenotify/metadata.xml
+++ b/x11-libs/snorenotify/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-libs/startup-notification/metadata.xml
+++ b/x11-libs/startup-notification/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
index 0288e627e3ff..bb9d4ee8bd1d 100644
--- a/x11-libs/tslib/metadata.xml
+++ b/x11-libs/tslib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">kergoth/tslib</remote-id>
 	</upstream>
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index cd6612f9502d..cc74c276d1e8 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
 	</use>
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index aa7aa5e656fd..288d62d5d7fe 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wxwidgets</herd>
 	<maintainer>
 		<email>wxwidgets@gentoo.org</email>
 		<description>All modifications to this package must be approved by the wxwidgets herd.</description>
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index 821284b9a309..a8dda16b099c 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
   XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
   LessTif) which presents an editable array of string data to the user in a 
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-cursor/metadata.xml
+++ b/x11-libs/xcb-util-cursor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-image/metadata.xml
+++ b/x11-libs/xcb-util-image/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-keysyms/metadata.xml
+++ b/x11-libs/xcb-util-keysyms/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-renderutil/metadata.xml
+++ b/x11-libs/xcb-util-renderutil/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-wm/metadata.xml
+++ b/x11-libs/xcb-util-wm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util/metadata.xml
+++ b/x11-libs/xcb-util/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
index 4bab88844f54..62a5579a2fac 100644
--- a/x11-libs/xpa/metadata.xml
+++ b/x11-libs/xpa/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   The XPA messaging system provides seamless communication between many
   kinds of Unix programs, including X programs and Tcl/Tk programs. 
diff --git a/x11-libs/xpyb/metadata.xml b/x11-libs/xpyb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xpyb/metadata.xml
+++ b/x11-libs/xpyb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xtrans/metadata.xml
+++ b/x11-libs/xtrans/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xvba-video/metadata.xml b/x11-libs/xvba-video/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xvba-video/metadata.xml
+++ b/x11-libs/xvba-video/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml
index a31c49d0edc4..31d528e232ac 100644
--- a/x11-misc/3ddesktop/metadata.xml
+++ b/x11-misc/3ddesktop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>
 3d Destkop is an OpenGL program for switching virtual desktops in a seamless
 3-dimensional manner. The current desktop is mapped into a 3D space where you
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
index d0053fa8abcf..b3b087251d6a 100644
--- a/x11-misc/3dfb/metadata.xml
+++ b/x11-misc/3dfb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-effects</herd>
+	<maintainer>
+		<email>desktop-effects@gentoo.org</email>
+		<name>Desktop effects</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dz3d</remote-id>
 	</upstream>
diff --git a/x11-misc/3dfm/metadata.xml b/x11-misc/3dfm/metadata.xml
index 8b279ff8e12d..09e9443d572e 100644
--- a/x11-misc/3dfm/metadata.xml
+++ b/x11-misc/3dfm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-effects</herd>
+	<maintainer>
+		<email>desktop-effects@gentoo.org</email>
+		<name>Desktop effects</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">innolab</remote-id>
 	</upstream>
diff --git a/x11-misc/Xorgautoconfig/metadata.xml b/x11-misc/Xorgautoconfig/metadata.xml
index e6b7521efb30..265a00c46d8a 100644
--- a/x11-misc/Xorgautoconfig/metadata.xml
+++ b/x11-misc/Xorgautoconfig/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
 <maintainer>
 <email>josejx@gentoo.org</email>
 <name>Joseph Jezak</name>
 </maintainer>
+<maintainer>
+<email>ppc@gentoo.org</email>
+<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
 <longdescription lang="en">
 An X.org auto configuration tool for PPC machines.
 </longdescription>
diff --git a/x11-misc/accessx/metadata.xml b/x11-misc/accessx/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/accessx/metadata.xml
+++ b/x11-misc/accessx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/afbinit/metadata.xml b/x11-misc/afbinit/metadata.xml
index b87e94c3126f..f6d278ffb701 100644
--- a/x11-misc/afbinit/metadata.xml
+++ b/x11-misc/afbinit/metadata.xml
@@ -2,6 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 
-	<herd>sparc</herd>
-
+	<maintainer>
+		<email>sparc@gentoo.org</email>
+		<name>Gentoo Linux SPARC Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-misc/alacarte/metadata.xml
+++ b/x11-misc/alacarte/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/andromeda/metadata.xml b/x11-misc/andromeda/metadata.xml
index 52ac90661a13..34c03c2482aa 100644
--- a/x11-misc/andromeda/metadata.xml
+++ b/x11-misc/andromeda/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ABBAPOH/andromeda</remote-id>
 	</upstream>
diff --git a/x11-misc/appmenu-qt/metadata.xml b/x11-misc/appmenu-qt/metadata.xml
index 0d275ddb5633..1427543c8e2b 100644
--- a/x11-misc/appmenu-qt/metadata.xml
+++ b/x11-misc/appmenu-qt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">appmenu-qt</remote-id>
 	</upstream>
diff --git a/x11-misc/apwal/metadata.xml b/x11-misc/apwal/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/apwal/metadata.xml
+++ b/x11-misc/apwal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/arandr/metadata.xml
+++ b/x11-misc/arandr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
index de3e31e37b47..a0e2763fb4ee 100644
--- a/x11-misc/autocutsel/metadata.xml
+++ b/x11-misc/autocutsel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription>
 	<upstream>
 		<remote-id type="github">sigmike/autocutsel</remote-id>
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
index c1ca52bbfce4..6594cc52265b 100644
--- a/x11-misc/basqet/metadata.xml
+++ b/x11-misc/basqet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">basqet</remote-id>
 		<remote-id type="bitbucket">ridderby/basqet</remote-id>
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
index 42fe8839ccee..dc6e906551a2 100644
--- a/x11-misc/bbacpi/metadata.xml
+++ b/x11-misc/bbacpi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Utility for viewing ACPI data via X11
 </longdescription>
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 15a5547eef62..9e789c85fe74 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
@@ -10,6 +9,10 @@
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	A rewrite of the original Bumblebee service, providing an elegant and stable
 	means of managing Optimus hybrid graphics chipsets. A primary goal of this
diff --git a/x11-misc/cairo-clock/metadata.xml b/x11-misc/cairo-clock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/cairo-clock/metadata.xml
+++ b/x11-misc/cairo-clock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/calise/metadata.xml b/x11-misc/calise/metadata.xml
index bcc862bc668f..13e04a1591e2 100644
--- a/x11-misc/calise/metadata.xml
+++ b/x11-misc/calise/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">calise</remote-id>
 	</upstream>
diff --git a/x11-misc/cbatticon/metadata.xml b/x11-misc/cbatticon/metadata.xml
index 419ec4f290b0..e80c791ebcc1 100644
--- a/x11-misc/cbatticon/metadata.xml
+++ b/x11-misc/cbatticon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ColinJones/cbatticon</remote-id>
 	</upstream>
diff --git a/x11-misc/chgres/metadata.xml b/x11-misc/chgres/metadata.xml
index 170550f4616e..3cd3a443c932 100644
--- a/x11-misc/chgres/metadata.xml
+++ b/x11-misc/chgres/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>chgres is a small tool which uses the XFree86-VidModeExtension X11 extension to query and set the resolution of your XFree86 display, without restarting it. It has a simple command-line user interface which makes it suitable for use in shell scripts.</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 419ce9848522..230450efe4c8 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="argyllcms">Enable ArgyllCMS sensor</flag>
 		<flag name="extra-print-profiles">Generate extra print profiles.
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index bad8680cf41c..5f3a0b24bbf6 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
     <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
diff --git a/x11-misc/dclock/metadata.xml b/x11-misc/dclock/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/dclock/metadata.xml
+++ b/x11-misc/dclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index 9c37c491d29b..bb364468f578 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>jer@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
   <flag name="xft">Enable unofficial <pkg>x11-libs/libXft</pkg> support</flag>
   </use>
diff --git a/x11-misc/driconf/metadata.xml b/x11-misc/driconf/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-misc/driconf/metadata.xml
+++ b/x11-misc/driconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dsx/metadata.xml b/x11-misc/dsx/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/dsx/metadata.xml
+++ b/x11-misc/dsx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dxpc/metadata.xml b/x11-misc/dxpc/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/dxpc/metadata.xml
+++ b/x11-misc/dxpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index a5cf379b5fce..b211a2ba7bfb 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>Dzen is a general purpose messaging, notification and menuing
   program for X11. It was designed to be scriptable in any language and
   integrate well with window managers like dwm, wmii and xmonad though it will
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
index 2e3907c587c3..da3d4b614ece 100644
--- a/x11-misc/e16keyedit/metadata.xml
+++ b/x11-misc/e16keyedit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <longdescription>
 This is a standalone keybindings editor for enlightenment version 0.16.
 </longdescription>
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
index ac83800a5389..4fbe32c84e9d 100644
--- a/x11-misc/e16menuedit2/metadata.xml
+++ b/x11-misc/e16menuedit2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml
index 2c734e7ab536..02c848c75a28 100644
--- a/x11-misc/easystroke/metadata.xml
+++ b/x11-misc/easystroke/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">easystroke</remote-id>
 	</upstream>
diff --git a/x11-misc/efax-gtk/metadata.xml b/x11-misc/efax-gtk/metadata.xml
index 5b7b5e3a3f21..4b660f56744f 100644
--- a/x11-misc/efax-gtk/metadata.xml
+++ b/x11-misc/efax-gtk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">efax-gtk</remote-id>
 	</upstream>
diff --git a/x11-misc/evolvotron/metadata.xml b/x11-misc/evolvotron/metadata.xml
index 77c9e1d9c3f6..e296ed03c2cc 100644
--- a/x11-misc/evolvotron/metadata.xml
+++ b/x11-misc/evolvotron/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">evolvotron</remote-id>
 	</upstream>
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
index 4172fa486e98..ad159c2276c2 100644
--- a/x11-misc/fbpanel/metadata.xml
+++ b/x11-misc/fbpanel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fbpanel</remote-id>
   </upstream>
diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
index 230e5d15e8b6..10be6bacb669 100644
--- a/x11-misc/fireflies/metadata.xml
+++ b/x11-misc/fireflies/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>desktop-misc</herd>
+    <maintainer>
+        <email>desktop-misc@gentoo.org</email>
+        <name>Gentoo Desktop Miscellaneous Project</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mpcomplete/fireflies</remote-id>
     </upstream>
diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml
index 2fa57541046f..15b5ae0e77c0 100644
--- a/x11-misc/fracplanet/metadata.xml
+++ b/x11-misc/fracplanet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fracplanet</remote-id>
 	</upstream>
diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml
index 4e66ecce0fd7..23b98c912f84 100644
--- a/x11-misc/fraqtive/metadata.xml
+++ b/x11-misc/fraqtive/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fraqtive</remote-id>
   </upstream>
diff --git a/x11-misc/gbase/metadata.xml b/x11-misc/gbase/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/gbase/metadata.xml
+++ b/x11-misc/gbase/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/gbdfed/metadata.xml b/x11-misc/gbdfed/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/x11-misc/gbdfed/metadata.xml
+++ b/x11-misc/gbdfed/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
+	<maintainer>
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/gccmakedep/metadata.xml
+++ b/x11-misc/gccmakedep/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml
index 340e98c59a07..2086f919c3a9 100644
--- a/x11-misc/gcolor2/metadata.xml
+++ b/x11-misc/gcolor2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gcolor2</remote-id>
 	</upstream>
diff --git a/x11-misc/gdevilspie/metadata.xml b/x11-misc/gdevilspie/metadata.xml
index 70778a76521f..3ce1741f293e 100644
--- a/x11-misc/gdevilspie/metadata.xml
+++ b/x11-misc/gdevilspie/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">gdevilspie</remote-id>
 	</upstream>
diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml
index 0db3203fd1e0..a2fb13852ee9 100644
--- a/x11-misc/gmrun/metadata.xml
+++ b/x11-misc/gmrun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>
 		A run utility intended to replace grun or gnome-run. Most prominent
 		features include slim design and bash style auto-completion.
diff --git a/x11-misc/grabc/metadata.xml b/x11-misc/grabc/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/grabc/metadata.xml
+++ b/x11-misc/grabc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/gromit/metadata.xml b/x11-misc/gromit/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/x11-misc/gromit/metadata.xml
+++ b/x11-misc/gromit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml
index 62788e9b0972..3a8b2ec5c0cf 100644
--- a/x11-misc/grun/metadata.xml
+++ b/x11-misc/grun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">grun</remote-id>
 		<remote-id type="github">lrgc/grun</remote-id>
diff --git a/x11-misc/gtk2fontsel/metadata.xml b/x11-misc/gtk2fontsel/metadata.xml
index da9d520c562a..35344ad9e71c 100644
--- a/x11-misc/gtk2fontsel/metadata.xml
+++ b/x11-misc/gtk2fontsel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gtk2fontsel</remote-id>
 	</upstream>
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 0bbea4d60131..5af84a98b9d6 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription>
 gtkdialog is a GUI-creation utility that can be used with an arbitrary
 interpreter. It enables the programmer to describe a graphical user interface
diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/gxmessage/metadata.xml
+++ b/x11-misc/gxmessage/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/habak/metadata.xml b/x11-misc/habak/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/habak/metadata.xml
+++ b/x11-misc/habak/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/hsetroot/metadata.xml b/x11-misc/hsetroot/metadata.xml
index cbdd24cc0a74..80bd1cbddd86 100644
--- a/x11-misc/hsetroot/metadata.xml
+++ b/x11-misc/hsetroot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription>
 hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for X. It has a lot of options like rendering gradients, solids, images but it also allows you to perform manipulations on those things, or chain them together. You could use one standard background image for isntance, and using tint to make it fit your current theme. And yes, of course it is compatible with semi-translucent applications like aterm and xchat :)
 	 
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index b5caab41c7b2..03272407361f 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>xarthisius@gentoo.org</email>
 		<name>Kacper Kowalik</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index 29dbb30b93cd..987a5b32977a 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>xarthisius@gentoo.org</email>
 		<name>Kacper Kowalik</name>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>
 		i3status is a small program (about 1500 SLOC) for generating a status bar for
 		dzen2, xmobar or similar programs. It is designed to be very efficient by
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
index 91dfec751a9f..0bbf40398c2a 100644
--- a/x11-misc/i855crt/metadata.xml
+++ b/x11-misc/i855crt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription lang="en">
 i855crt is a tool to send the output of a i855-based graphic card to the
 external VGA, primarily used for presentations.
diff --git a/x11-misc/icewmcp/metadata.xml b/x11-misc/icewmcp/metadata.xml
index 0c74c3eb46a6..0273131f275e 100644
--- a/x11-misc/icewmcp/metadata.xml
+++ b/x11-misc/icewmcp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">icesoundmanager</remote-id>
 	</upstream>
diff --git a/x11-misc/icon-naming-utils/metadata.xml b/x11-misc/icon-naming-utils/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/x11-misc/icon-naming-utils/metadata.xml
+++ b/x11-misc/icon-naming-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/x11-misc/iconbox/metadata.xml b/x11-misc/iconbox/metadata.xml
index c1bd756104cc..af6575bed871 100644
--- a/x11-misc/iconbox/metadata.xml
+++ b/x11-misc/iconbox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription lang="en">
 Iconbox is a free desktop tool that allows applications to be started quickly
 with one mouse click. When Iconbox is running, the main window is invisible
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index fb0d57fe87f6..58031ad6c89a 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">idesk</remote-id>
 	</upstream>
diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/imake/metadata.xml
+++ b/x11-misc/imake/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/imwheel/metadata.xml b/x11-misc/imwheel/metadata.xml
index da024bcfa0b3..21d3364c9756 100644
--- a/x11-misc/imwheel/metadata.xml
+++ b/x11-misc/imwheel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">imwheel</remote-id>
 	</upstream>
diff --git a/x11-misc/kapow/metadata.xml b/x11-misc/kapow/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/kapow/metadata.xml
+++ b/x11-misc/kapow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
index d40c59e42cfd..4543e383936a 100644
--- a/x11-misc/kaqaz/metadata.xml
+++ b/x11-misc/kaqaz/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">sialan-labs/kaqaz</remote-id>
   </upstream>
diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml
index 9ea37bfe2e26..ef07223a8049 100644
--- a/x11-misc/kdocker/metadata.xml
+++ b/x11-misc/kdocker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">kdocker</remote-id>
 		<bugs-to>https://bugs.launchpad.net/kdocker</bugs-to>
diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/kronometer/metadata.xml
+++ b/x11-misc/kronometer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/ksuperkey/metadata.xml b/x11-misc/ksuperkey/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/ksuperkey/metadata.xml
+++ b/x11-misc/ksuperkey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml
index a6a88629dac8..7fa1d3f6d1c7 100644
--- a/x11-misc/ktsuss/metadata.xml
+++ b/x11-misc/ktsuss/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hypnos75@gmail.com</email>
 		<name>Hypnos</name>
 		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ktsuss</remote-id>
 		<remote-id type="github">nomius/ktsuss</remote-id>
diff --git a/x11-misc/lightdm-kde/metadata.xml b/x11-misc/lightdm-kde/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-misc/lightdm-kde/metadata.xml
+++ b/x11-misc/lightdm-kde/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/lineak-defaultplugin/metadata.xml b/x11-misc/lineak-defaultplugin/metadata.xml
index c01576627929..05ff45013a05 100644
--- a/x11-misc/lineak-defaultplugin/metadata.xml
+++ b/x11-misc/lineak-defaultplugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lineak</remote-id>
   </upstream>
diff --git a/x11-misc/lineak-xosdplugin/metadata.xml b/x11-misc/lineak-xosdplugin/metadata.xml
index 381a9fd5d696..817f2ef05d41 100644
--- a/x11-misc/lineak-xosdplugin/metadata.xml
+++ b/x11-misc/lineak-xosdplugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lineak</remote-id>
 	</upstream>
diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml
index 381a9fd5d696..817f2ef05d41 100644
--- a/x11-misc/lineakd/metadata.xml
+++ b/x11-misc/lineakd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lineak</remote-id>
 	</upstream>
diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/lndir/metadata.xml
+++ b/x11-misc/lndir/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/lsw/metadata.xml
+++ b/x11-misc/lsw/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/lxmed/metadata.xml b/x11-misc/lxmed/metadata.xml
index 09cb6b0857cb..c21e3b86bc05 100644
--- a/x11-misc/lxmed/metadata.xml
+++ b/x11-misc/lxmed/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lxmed</remote-id>
   </upstream>
diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/macopix/metadata.xml
+++ b/x11-misc/macopix/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
index 7e1cd0d686a6..71b91866c43d 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>evadim@evadim.ru</email>
 		<name>Vadim Efimov</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">magick-rotation</remote-id>
 	</upstream>
diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/makedepend/metadata.xml
+++ b/x11-misc/makedepend/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/matchbox-keyboard/metadata.xml b/x11-misc/matchbox-keyboard/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/matchbox-keyboard/metadata.xml
+++ b/x11-misc/matchbox-keyboard/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-misc/matchbox-panel-manager/metadata.xml b/x11-misc/matchbox-panel-manager/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/matchbox-panel-manager/metadata.xml
+++ b/x11-misc/matchbox-panel-manager/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
index 504b80a3baa5..2ba06ffe4e69 100644
--- a/x11-misc/mate-notification-daemon/metadata.xml
+++ b/x11-misc/mate-notification-daemon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
     </upstream>
diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml
index 15139ff6b48f..322b806b6003 100644
--- a/x11-misc/menulibre/metadata.xml
+++ b/x11-misc/menulibre/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">menulibre</remote-id>
 	</upstream>
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index 97202cc660ab..34c3b3fcca63 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">menumaker</remote-id>
 	</upstream>
diff --git a/x11-misc/mgm/metadata.xml b/x11-misc/mgm/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/mgm/metadata.xml
+++ b/x11-misc/mgm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/mixer_app/metadata.xml b/x11-misc/mixer_app/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-misc/mixer_app/metadata.xml
+++ b/x11-misc/mixer_app/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 07173e378ed5..132a09dbfadc 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mozo</remote-id>
     </upstream>
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/notification-daemon/metadata.xml b/x11-misc/notification-daemon/metadata.xml
index 854288052d19..05a369b487a6 100644
--- a/x11-misc/notification-daemon/metadata.xml
+++ b/x11-misc/notification-daemon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+		<name>Gentoo Freedesktop Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/notify-osd/metadata.xml b/x11-misc/notify-osd/metadata.xml
index 650c2a2edb1f..16dde9afc2c6 100644
--- a/x11-misc/notify-osd/metadata.xml
+++ b/x11-misc/notify-osd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/x11-misc/obconf-qt/metadata.xml
+++ b/x11-misc/obconf-qt/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+<maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/obtheme/metadata.xml b/x11-misc/obtheme/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/obtheme/metadata.xml
+++ b/x11-misc/obtheme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/okindd/metadata.xml b/x11-misc/okindd/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/x11-misc/okindd/metadata.xml
+++ b/x11-misc/okindd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index fafd300e32bd..ce347c888ba7 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>mimasgpc@free.fr</email>
diff --git a/x11-misc/parcellite/metadata.xml b/x11-misc/parcellite/metadata.xml
index 8e77238df625..d63857b56fe7 100644
--- a/x11-misc/parcellite/metadata.xml
+++ b/x11-misc/parcellite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">parcellite</remote-id>
 	</upstream>
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index 716a047bea5d..ff18e5548f06 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <longdescription lang="en">
   </longdescription>
   <upstream>
diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml
index 3522b159f8ef..7b85f5faa50d 100644
--- a/x11-misc/pcmanfm/metadata.xml
+++ b/x11-misc/pcmanfm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pcmanfm</remote-id>
   </upstream>
diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/piedock/metadata.xml
+++ b/x11-misc/piedock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/ptbatterysystemtray/metadata.xml b/x11-misc/ptbatterysystemtray/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/x11-misc/ptbatterysystemtray/metadata.xml
+++ b/x11-misc/ptbatterysystemtray/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml
index ca302fdca57c..e57a81277e93 100644
--- a/x11-misc/pypanel/metadata.xml
+++ b/x11-misc/pypanel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>
 PyPanel is a lightweight panel/taskbar for X11 window managers that can
 be easily customized to match any desktop theme or taste.
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
index baccd90af55a..8933d7d0ef34 100644
--- a/x11-misc/qcomicbook/metadata.xml
+++ b/x11-misc/qcomicbook/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<herd>qt</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml
index 417967a8329b..268b841650eb 100644
--- a/x11-misc/qlipper/metadata.xml
+++ b/x11-misc/qlipper/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pvanek/qlipper</remote-id>
 	</upstream>
diff --git a/x11-misc/qps/metadata.xml b/x11-misc/qps/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/x11-misc/qps/metadata.xml
+++ b/x11-misc/qps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/qsynergy/metadata.xml b/x11-misc/qsynergy/metadata.xml
index 6346c424e69b..27f338c9a90e 100644
--- a/x11-misc/qsynergy/metadata.xml
+++ b/x11-misc/qsynergy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qsynergy</remote-id>
 	</upstream>
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
index 734d356f5763..8335b931c4df 100644
--- a/x11-misc/qterm/metadata.xml
+++ b/x11-misc/qterm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qterm</remote-id>
 	</upstream>
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index fe7f2a00ab81..17c274294684 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/qtnotifydaemon/metadata.xml b/x11-misc/qtnotifydaemon/metadata.xml
index e44f13e08d2e..79972e53f2a2 100644
--- a/x11-misc/qtnotifydaemon/metadata.xml
+++ b/x11-misc/qtnotifydaemon/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qtnotifydaemon</remote-id>
   </upstream>
diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml
index ecca2400b8fa..93d697fa5633 100644
--- a/x11-misc/quitcount/metadata.xml
+++ b/x11-misc/quitcount/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>Laurent Vivier</email>
 		<name>laurent@lamzi.com</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">quitcount</remote-id>
 	</upstream>
diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml
index 32bdd4ceba31..92889dff3cf8 100644
--- a/x11-misc/qxkb/metadata.xml
+++ b/x11-misc/qxkb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">disels/qxkb</remote-id>
 	</upstream>
diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/read-edid/metadata.xml
+++ b/x11-misc/read-edid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
index 5232af440a8a..5e74ee1d2b56 100644
--- a/x11-misc/redshift/metadata.xml
+++ b/x11-misc/redshift/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>sping@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options in to unity and KDE 5</flag>
     <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/rendercheck/metadata.xml
+++ b/x11-misc/rendercheck/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index b63b5dec9933..2e303314ab06 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 	<email>jer@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <use>
 	<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
 	<flag name="windowmode">Enable normal window mode</flag>
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index b5d864c0bffc..5705761e8a66 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<use>
 		<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
 	</use>
diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
index 2c3e7818e959..ef0cfda08013 100644
--- a/x11-misc/screengrab/metadata.xml
+++ b/x11-misc/screengrab/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">screengrab-qt</remote-id>
 		<remote-id type="github">DOOMer/screengrab</remote-id>
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index fdeadb584e84..1068dbe8a11a 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
+  <maintainer>
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
   <use>
     <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
   </use>
diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-misc/shared-mime-info/metadata.xml
+++ b/x11-misc/shared-mime-info/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index 441dd42644fc..815bb2a1aa6c 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+	<email>graphics@gentoo.org</email>
+	<name>Gentoo Graphics Project</name>
+</maintainer>
 <use>
 	<flag name="webphoto">Enables screenshots of websites</flag>
 	<flag name="drawing">Enables drawing tool</flag>
diff --git a/x11-misc/sisctrl/metadata.xml b/x11-misc/sisctrl/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/sisctrl/metadata.xml
+++ b/x11-misc/sisctrl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/skippy/metadata.xml b/x11-misc/skippy/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/skippy/metadata.xml
+++ b/x11-misc/skippy/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 56c5cc2069cb..10b599d4b590 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>axs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<use>
 		<flag name="consolekit">Enable native consolekit support</flag>
 	</use>
diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
index 68ea403e7ceb..80306f672867 100644
--- a/x11-misc/slock/metadata.xml
+++ b/x11-misc/slock/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
   <email>jer@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>desktop-misc@gentoo.org</email>
+  <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription>simple X screen locker</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml
index 691a96f7a8d8..445e70dd95ea 100644
--- a/x11-misc/spnavcfg/metadata.xml
+++ b/x11-misc/spnavcfg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>anthoine.bourgeois@gmail.com</email>
 		<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The spnavcfg is the GTK-based configuration GUI for
 		<pkg>sys-libs/spacenavd</pkg>.
diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/sselp/metadata.xml
+++ b/x11-misc/sselp/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 <name>Jeroen Roovers</name>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index 77344c741801..e5961abc14ad 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<use>
 		<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
 	</use>
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index d9df2048b4c0..f390d00169ac 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
 		<name>Henrique Dias</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">MeanEYE/Sunflower</remote-id>
 	</upstream>
diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/sux/metadata.xml
+++ b/x11-misc/sux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml
index e3df9aad5ab5..7f90c0588d32 100644
--- a/x11-misc/synergy/metadata.xml
+++ b/x11-misc/synergy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">synergy</remote-id>
 		<remote-id type="github">synergy/synergy</remote-id>
diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/tabbed/metadata.xml
+++ b/x11-misc/tabbed/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 <name>Jeroen Roovers</name>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/tinymount/metadata.xml b/x11-misc/tinymount/metadata.xml
index 102f7269c2c8..273b5612266f 100644
--- a/x11-misc/tinymount/metadata.xml
+++ b/x11-misc/tinymount/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <herd>desktop-misc</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>limanski@narod.ru</email>
     <name>Mike Limansky</name>
@@ -13,6 +10,18 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">limansky/tinymount</remote-id>
   </upstream>
diff --git a/x11-misc/touchfreeze/metadata.xml b/x11-misc/touchfreeze/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/x11-misc/touchfreeze/metadata.xml
+++ b/x11-misc/touchfreeze/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml
index b1a9efc4f2f0..097975e3adc2 100644
--- a/x11-misc/trayer/metadata.xml
+++ b/x11-misc/trayer/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-misc/treeline/metadata.xml b/x11-misc/treeline/metadata.xml
index a3891ce6e178..ea1b48ffe67e 100644
--- a/x11-misc/treeline/metadata.xml
+++ b/x11-misc/treeline/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">treeline</remote-id>
 	</upstream>
diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/unclutter/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/unclutter/metadata.xml
+++ b/x11-misc/unclutter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/util-macros/metadata.xml
+++ b/x11-misc/util-macros/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
index 665f68caaade..3bc2a0d5dc9c 100644
--- a/x11-misc/viewglob/metadata.xml
+++ b/x11-misc/viewglob/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>shell-tools</herd>
+  <maintainer>
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
   <longdescription lang="en">
 		Viewglob is a package that graphically displays the results of a shell
 		glob, helping beginners of shell usage become acclimitised to filename
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 82630efb1696..8bd428fb8890 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
@@ -14,6 +13,10 @@
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	An open source package that gives any Unix or Linux remote display software
 	the ability to run OpenGL applications with full 3D hardware acceleration.
diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml
index e022ba6cabdd..98529cb64373 100644
--- a/x11-misc/vnc2swf/metadata.xml
+++ b/x11-misc/vnc2swf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
   Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf)
   format. Vnc2swf comes with two different implementations, a Python one
diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml
index 33d6f84ad262..1dca93f27949 100644
--- a/x11-misc/vym/metadata.xml
+++ b/x11-misc/vym/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vym</remote-id>
 	</upstream>
diff --git a/x11-misc/wayv/metadata.xml b/x11-misc/wayv/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wayv/metadata.xml
+++ b/x11-misc/wayv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml
index 2b43af1b2da0..7905144e1cde 100644
--- a/x11-misc/wbar/metadata.xml
+++ b/x11-misc/wbar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<use>
 		<flag name="gtk">Enables the gtk-based wbar-config GUI</flag>
 	</use>
diff --git a/x11-misc/wbarconf/metadata.xml b/x11-misc/wbarconf/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wbarconf/metadata.xml
+++ b/x11-misc/wbarconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wdm/metadata.xml
+++ b/x11-misc/wdm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/wininfo/metadata.xml b/x11-misc/wininfo/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/wininfo/metadata.xml
+++ b/x11-misc/wininfo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
index 1f7c89842d5d..a0f0c869da8d 100644
--- a/x11-misc/wmakerconf/metadata.xml
+++ b/x11-misc/wmakerconf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wmakerconf</remote-id>
 	</upstream>
diff --git a/x11-misc/wmiface/metadata.xml b/x11-misc/wmiface/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/wmiface/metadata.xml
+++ b/x11-misc/wmiface/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index c5d0849608ed..119ea7586605 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The primary goal of this program is to create a portable and
 		simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/x2vnc/metadata.xml
+++ b/x11-misc/x2vnc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/x2x/metadata.xml
+++ b/x11-misc/x2x/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index a359aa3b27f9..f6fea6b343ad 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   XaoS is a fast, portable real-time interactive fractal zoomer. It
   displays the Mandelbrot set (among other escape time fractals) and
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xautomation/metadata.xml b/x11-misc/xautomation/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xautomation/metadata.xml
+++ b/x11-misc/xautomation/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xbatt/metadata.xml b/x11-misc/xbatt/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xbatt/metadata.xml
+++ b/x11-misc/xbatt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xbattbar/metadata.xml b/x11-misc/xbattbar/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xbattbar/metadata.xml
+++ b/x11-misc/xbattbar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xbindkeys/metadata.xml
+++ b/x11-misc/xbindkeys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xbitmaps/metadata.xml b/x11-misc/xbitmaps/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xbitmaps/metadata.xml
+++ b/x11-misc/xbitmaps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xcalendar/metadata.xml b/x11-misc/xcalendar/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xcalendar/metadata.xml
+++ b/x11-misc/xcalendar/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xcape/metadata.xml b/x11-misc/xcape/metadata.xml
index 43e57ddbd5aa..331e5f6a6a88 100644
--- a/x11-misc/xcape/metadata.xml
+++ b/x11-misc/xcape/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>aditsu@yahoo.com</email>
 		<description>Maintainer. Assign bugs to him</description>
@@ -11,6 +10,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">alols/xcape</remote-id>
 		<bugs-to>https://github.com/alols/xcape/issues</bugs-to>
diff --git a/x11-misc/xcave/metadata.xml b/x11-misc/xcave/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/xcave/metadata.xml
+++ b/x11-misc/xcave/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xcb/metadata.xml b/x11-misc/xcb/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xcb/metadata.xml
+++ b/x11-misc/xcb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml
index 52b5463d56b9..70897c6896b9 100644
--- a/x11-misc/xclip/metadata.xml
+++ b/x11-misc/xclip/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">xclip</remote-id>
   </upstream>
diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xcompmgr/metadata.xml
+++ b/x11-misc/xcompmgr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdaliclock/metadata.xml b/x11-misc/xdaliclock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xdaliclock/metadata.xml
+++ b/x11-misc/xdaliclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
index e6f7528ea31a..6a4564facff5 100644
--- a/x11-misc/xdesktopwaves/metadata.xml
+++ b/x11-misc/xdesktopwaves/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription>
 		xdesktopwaves is a cellular automata setting the background of your
 		X Windows desktop under water. Windows and mouse are like ships on the
diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/x11-misc/xdg-user-dirs-gtk/metadata.xml
+++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/x11-misc/xdg-user-dirs/metadata.xml
+++ b/x11-misc/xdg-user-dirs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/x11-misc/xdialog/metadata.xml b/x11-misc/xdialog/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xdialog/metadata.xml
+++ b/x11-misc/xdialog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml
index e4f009e486c5..0e7ac58760de 100644
--- a/x11-misc/xdiskusage/metadata.xml
+++ b/x11-misc/xdiskusage/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
 	xdiskusage is a user-friendly program to show you what is using up all your disk space.
   </longdescription>
diff --git a/x11-misc/xdock/metadata.xml b/x11-misc/xdock/metadata.xml
index 0e065732328d..3ca134189578 100644
--- a/x11-misc/xdock/metadata.xml
+++ b/x11-misc/xdock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">xdock</remote-id>
 	</upstream>
diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xearth/metadata.xml
+++ b/x11-misc/xearth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml
index 900869d128f4..73bcd5209d81 100644
--- a/x11-misc/xfe/metadata.xml
+++ b/x11-misc/xfe/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xfe</remote-id>
 	</upstream>
diff --git a/x11-misc/xfishtank/metadata.xml b/x11-misc/xfishtank/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xfishtank/metadata.xml
+++ b/x11-misc/xfishtank/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xhkeys/metadata.xml b/x11-misc/xhkeys/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xhkeys/metadata.xml
+++ b/x11-misc/xhkeys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xkeycaps/metadata.xml b/x11-misc/xkeycaps/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xkeycaps/metadata.xml
+++ b/x11-misc/xkeycaps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
index 48c7c37b15d0..858bc515489d 100644
--- a/x11-misc/xlockmore/metadata.xml
+++ b/x11-misc/xlockmore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <use>
     <flag name="xlockrc">Enables xlockrc for people without PAM</flag>
   </use>
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 007f3439bb69..e393b5c0892f 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
index 1e501a4b3854..7e5b44480d7a 100644
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
   <maintainer>
     <email>haskell@gentoo.org</email>
   </maintainer>
diff --git a/x11-misc/xmountains/metadata.xml b/x11-misc/xmountains/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xmountains/metadata.xml
+++ b/x11-misc/xmountains/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xnee/metadata.xml
+++ b/x11-misc/xnee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml
index c21707af8d13..0a8b12688e1b 100644
--- a/x11-misc/xnots/metadata.xml
+++ b/x11-misc/xnots/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xnots</remote-id>
 		<remote-id type="github">thePalindrome/xnots</remote-id>
diff --git a/x11-misc/xoo/metadata.xml b/x11-misc/xoo/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/xoo/metadata.xml
+++ b/x11-misc/xoo/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xorg-cf-files/metadata.xml
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml
index f16af1d84223..d4c45d0e1b3d 100644
--- a/x11-misc/xpad/metadata.xml
+++ b/x11-misc/xpad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">xpad</remote-id>
 	</upstream>
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
index a565416dca3c..6e6d6108f23b 100644
--- a/x11-misc/xplanet/metadata.xml
+++ b/x11-misc/xplanet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xplanet</remote-id>
 	</upstream>
diff --git a/x11-misc/xrestop/metadata.xml b/x11-misc/xrestop/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xrestop/metadata.xml
+++ b/x11-misc/xrestop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xrmap/metadata.xml b/x11-misc/xrmap/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xrmap/metadata.xml
+++ b/x11-misc/xrmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xrootconsole/metadata.xml b/x11-misc/xrootconsole/metadata.xml
index b5be7343e366..a64fe1d085cc 100644
--- a/x11-misc/xrootconsole/metadata.xml
+++ b/x11-misc/xrootconsole/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xrootconsole</remote-id>
 	</upstream>
diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml
index 7d6c82b3f272..8aedeaf742b8 100644
--- a/x11-misc/xscreensaver-app/metadata.xml
+++ b/x11-misc/xscreensaver-app/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">xscreensaverapp</remote-id>
   </upstream>
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 5f7839bd0fb9..6cff6787849f 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>jwz@jwz.org</email>
diff --git a/x11-misc/xsel/metadata.xml b/x11-misc/xsel/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsel/metadata.xml
+++ b/x11-misc/xsel/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsensors/metadata.xml b/x11-misc/xsensors/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsensors/metadata.xml
+++ b/x11-misc/xsensors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsetleds/metadata.xml b/x11-misc/xsetleds/metadata.xml
index 09b04e7fe07d..5bbaaf72a08e 100644
--- a/x11-misc/xsetleds/metadata.xml
+++ b/x11-misc/xsetleds/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<herd>proxy-maintainers</herd>
-<maintainer>
+	<maintainer>
   <email>jss2k2@chello.no</email>
   <name>Unknown</name>
   <description>seemant@gentoo.org as a proxy maintainer.  Please refer to jss2k2</description>
 </maintainer>
+<maintainer>
+  <email>desktop-misc@gentoo.org</email>
+  <name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnap/metadata.xml b/x11-misc/xsnap/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/xsnap/metadata.xml
+++ b/x11-misc/xsnap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsri/metadata.xml b/x11-misc/xsri/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xsri/metadata.xml
+++ b/x11-misc/xsri/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/xssstate/metadata.xml
+++ b/x11-misc/xssstate/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 <name>Jeroen Roovers</name>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
index 6b3af6a2eb25..7e69141a086b 100644
--- a/x11-misc/xstroke/metadata.xml
+++ b/x11-misc/xstroke/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">xstroke</remote-id>
 	</upstream>
diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml
index 61b5fb040877..5c8b382da261 100644
--- a/x11-misc/xteddy/metadata.xml
+++ b/x11-misc/xteddy/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Normally, xteddy just sits around doing nothing. After all, that's what
 		teddy bears are for. Look at him, talk to him, place heavy windows on
diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml
index 546318348d25..3af7a8669a4a 100644
--- a/x11-misc/xtermcontrol/metadata.xml
+++ b/x11-misc/xtermcontrol/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <longdescription>
 xtermcontrol enables dynamic control of xterm properties.
 It makes it easy to change colors, title, font and geometry of a running xterm,
diff --git a/x11-misc/xtoolwait/metadata.xml b/x11-misc/xtoolwait/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xtoolwait/metadata.xml
+++ b/x11-misc/xtoolwait/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
index 9f624545b1b0..6ef5e0a6de15 100644
--- a/x11-misc/xtrace/metadata.xml
+++ b/x11-misc/xtrace/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>nightnord@gmail.com</email>
 	<name>Andrian Nord</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xtrlock/metadata.xml b/x11-misc/xtrlock/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xtrlock/metadata.xml
+++ b/x11-misc/xtrlock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xtscal/metadata.xml b/x11-misc/xtscal/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-misc/xtscal/metadata.xml
+++ b/x11-misc/xtscal/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xvkbd/metadata.xml b/x11-misc/xvkbd/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xvkbd/metadata.xml
+++ b/x11-misc/xvkbd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xwit/metadata.xml b/x11-misc/xwit/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xwit/metadata.xml
+++ b/x11-misc/xwit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <maintainer>
+                <email>desktop-misc@gentoo.org</email>
+                <name>Gentoo Desktop Miscellaneous Project</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xwrits/metadata.xml b/x11-misc/xwrits/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xwrits/metadata.xml
+++ b/x11-misc/xwrits/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml
index 37b1d4e5f29c..b2f0ab733f79 100644
--- a/x11-misc/xxkb/metadata.xml
+++ b/x11-misc/xxkb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xxkb</remote-id>
 	</upstream>
diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml
index 82797295f61e..afd553847dae 100644
--- a/x11-misc/zim/metadata.xml
+++ b/x11-misc/zim/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <longdescription lang="en">
 Zim is a graphical text editor used to maintain a collection of wiki pages.
 Each page can contain links to other pages, simple formatting and images. Pages
diff --git a/x11-plugins/allin1/metadata.xml b/x11-plugins/allin1/metadata.xml
index 4f220c971d27..a3347829bd54 100644
--- a/x11-plugins/allin1/metadata.xml
+++ b/x11-plugins/allin1/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<longdescription>Allin1 is a little dock applet for FluxBox and similar window managers which monitors CPU load with a moving graph, memory and swap usage with histograms, battery and power status with histogram and icons, and ethernet/PPP interfaces with icons and histograms (linear or logaritmic).</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">allinone</remote-id>
diff --git a/x11-plugins/bfm/metadata.xml b/x11-plugins/bfm/metadata.xml
index 0e1f5fae0119..be625711b043 100644
--- a/x11-plugins/bfm/metadata.xml
+++ b/x11-plugins/bfm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/bubblemon/metadata.xml b/x11-plugins/bubblemon/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/bubblemon/metadata.xml
+++ b/x11-plugins/bubblemon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
index 3cde455b32af..53e7a556d1f9 100644
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ b/x11-plugins/compiz-plugins-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+    <email>desktop-effects@gentoo.org</email>
+    <name>Desktop effects</name>
+  </maintainer>
 <longdescription lang="en">
 &gt;Package with several compiz-fusion plugins:
 addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
diff --git a/x11-plugins/compiz-plugins-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml
index f80d46d0455f..01e7262e3432 100644
--- a/x11-plugins/compiz-plugins-main/metadata.xml
+++ b/x11-plugins/compiz-plugins-main/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+    <email>desktop-effects@gentoo.org</email>
+    <name>Desktop effects</name>
+  </maintainer>
 <longdescription lang="en">
 Package with the base compiz-fusion plugins:
 animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
diff --git a/x11-plugins/compiz-plugins-unsupported/metadata.xml b/x11-plugins/compiz-plugins-unsupported/metadata.xml
index 74d7b9528609..6c535e0520ee 100644
--- a/x11-plugins/compiz-plugins-unsupported/metadata.xml
+++ b/x11-plugins/compiz-plugins-unsupported/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">
 Package with several compiz-fusion plugins:
 fakeargb, mswitch, snow, tile.
diff --git a/x11-plugins/cputnik/metadata.xml b/x11-plugins/cputnik/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/cputnik/metadata.xml
+++ b/x11-plugins/cputnik/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/docker/metadata.xml b/x11-plugins/docker/metadata.xml
index 276027ff97db..5aff544cfda6 100644
--- a/x11-plugins/docker/metadata.xml
+++ b/x11-plugins/docker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/echievements/metadata.xml b/x11-plugins/echievements/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/x11-plugins/echievements/metadata.xml
+++ b/x11-plugins/echievements/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
index 55f8757582fc..d8028a0f75f1 100644
--- a/x11-plugins/epplets/metadata.xml
+++ b/x11-plugins/epplets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <longdescription>
 Epplets are small, handy Enlightenment applets, similar to 'dockapps'
 or 'applets' for other packages.  The epplets package contains the
diff --git a/x11-plugins/fsviewer/metadata.xml b/x11-plugins/fsviewer/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/fsviewer/metadata.xml
+++ b/x11-plugins/fsviewer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/gkrellaclock/metadata.xml b/x11-plugins/gkrellaclock/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellaclock/metadata.xml
+++ b/x11-plugins/gkrellaclock/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellfire/metadata.xml b/x11-plugins/gkrellfire/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellfire/metadata.xml
+++ b/x11-plugins/gkrellfire/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellflynn/metadata.xml b/x11-plugins/gkrellflynn/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellflynn/metadata.xml
+++ b/x11-plugins/gkrellflynn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellkam/metadata.xml b/x11-plugins/gkrellkam/metadata.xml
index 58edd8f67a54..b1ce8c9e480e 100644
--- a/x11-plugins/gkrellkam/metadata.xml
+++ b/x11-plugins/gkrellkam/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellkam</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-bgchanger/metadata.xml b/x11-plugins/gkrellm-bgchanger/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-bgchanger/metadata.xml
+++ b/x11-plugins/gkrellm-bgchanger/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-bluez/metadata.xml b/x11-plugins/gkrellm-bluez/metadata.xml
index 81eae46a58f1..e1c030293ab6 100644
--- a/x11-plugins/gkrellm-bluez/metadata.xml
+++ b/x11-plugins/gkrellm-bluez/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellm-bluez</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index b1a9efc4f2f0..097975e3adc2 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-imonc/metadata.xml b/x11-plugins/gkrellm-imonc/metadata.xml
index 1b5d178ad4bf..e5fef077f8c2 100644
--- a/x11-plugins/gkrellm-imonc/metadata.xml
+++ b/x11-plugins/gkrellm-imonc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellm-imonc</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-leds/metadata.xml b/x11-plugins/gkrellm-leds/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-leds/metadata.xml
+++ b/x11-plugins/gkrellm-leds/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-mailwatch/metadata.xml b/x11-plugins/gkrellm-mailwatch/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-mailwatch/metadata.xml
+++ b/x11-plugins/gkrellm-mailwatch/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-plugins/metadata.xml b/x11-plugins/gkrellm-plugins/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-plugins/metadata.xml
+++ b/x11-plugins/gkrellm-plugins/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-radio/metadata.xml b/x11-plugins/gkrellm-radio/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-radio/metadata.xml
+++ b/x11-plugins/gkrellm-radio/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-trayicons/metadata.xml b/x11-plugins/gkrellm-trayicons/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-trayicons/metadata.xml
+++ b/x11-plugins/gkrellm-trayicons/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-vaiobright/metadata.xml
+++ b/x11-plugins/gkrellm-vaiobright/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-volume/metadata.xml b/x11-plugins/gkrellm-volume/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-volume/metadata.xml
+++ b/x11-plugins/gkrellm-volume/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-xkb/metadata.xml b/x11-plugins/gkrellm-xkb/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellm-xkb/metadata.xml
+++ b/x11-plugins/gkrellm-xkb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellmlaunch/metadata.xml b/x11-plugins/gkrellmlaunch/metadata.xml
index 3b58c1c8ba42..be40bc0e19ac 100644
--- a/x11-plugins/gkrellmlaunch/metadata.xml
+++ b/x11-plugins/gkrellmlaunch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellmlaunch</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellmoon/metadata.xml b/x11-plugins/gkrellmoon/metadata.xml
index c3c39d5af78b..134ad4afc0b5 100644
--- a/x11-plugins/gkrellmoon/metadata.xml
+++ b/x11-plugins/gkrellmoon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellmoon</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellmss/metadata.xml b/x11-plugins/gkrellmss/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellmss/metadata.xml
+++ b/x11-plugins/gkrellmss/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellmwireless/metadata.xml b/x11-plugins/gkrellmwireless/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/gkrellmwireless/metadata.xml
+++ b/x11-plugins/gkrellmwireless/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellshoot/metadata.xml b/x11-plugins/gkrellshoot/metadata.xml
index a31d1ece20bf..e784ca73900a 100644
--- a/x11-plugins/gkrellshoot/metadata.xml
+++ b/x11-plugins/gkrellshoot/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellshoot</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellstock/metadata.xml b/x11-plugins/gkrellstock/metadata.xml
index 2644e2169ff0..e6aa02976130 100644
--- a/x11-plugins/gkrellstock/metadata.xml
+++ b/x11-plugins/gkrellstock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-dock</herd>
   <upstream>
     <remote-id type="sourceforge">gkrellstock</remote-id>
   </upstream>
diff --git a/x11-plugins/gkrellsun/metadata.xml b/x11-plugins/gkrellsun/metadata.xml
index 2970414f1d8f..9f4fa60f883e 100644
--- a/x11-plugins/gkrellsun/metadata.xml
+++ b/x11-plugins/gkrellsun/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrellsun</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrelltop/metadata.xml b/x11-plugins/gkrelltop/metadata.xml
index 60d4e1ded709..a9de4cfd0562 100644
--- a/x11-plugins/gkrelltop/metadata.xml
+++ b/x11-plugins/gkrelltop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkrelltop</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml
index ca551894a934..097975e3adc2 100644
--- a/x11-plugins/gkrellweather/metadata.xml
+++ b/x11-plugins/gkrellweather/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/gkwebmon/metadata.xml b/x11-plugins/gkwebmon/metadata.xml
index bb80bda6ea22..9bcaa8e7ab27 100644
--- a/x11-plugins/gkwebmon/metadata.xml
+++ b/x11-plugins/gkwebmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<upstream>
 		<remote-id type="sourceforge">gkwebmon</remote-id>
 	</upstream>
diff --git a/x11-plugins/guifications/metadata.xml b/x11-plugins/guifications/metadata.xml
index bc3d909c4b35..47b40151e0f7 100644
--- a/x11-plugins/guifications/metadata.xml
+++ b/x11-plugins/guifications/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 <longdescription>Guifications are graphical notification plugin for the open source instant message client gaim</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml
index a03f5d8b381b..097975e3adc2 100644
--- a/x11-plugins/i8krellm/metadata.xml
+++ b/x11-plugins/i8krellm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/matchbox-applet-input-manager/metadata.xml b/x11-plugins/matchbox-applet-input-manager/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-plugins/matchbox-applet-input-manager/metadata.xml
+++ b/x11-plugins/matchbox-applet-input-manager/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-plugins/matchbox-applet-startup-monitor/metadata.xml b/x11-plugins/matchbox-applet-startup-monitor/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-plugins/matchbox-applet-startup-monitor/metadata.xml
+++ b/x11-plugins/matchbox-applet-startup-monitor/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-plugins/matchbox-applet-volume/metadata.xml b/x11-plugins/matchbox-applet-volume/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-plugins/matchbox-applet-volume/metadata.xml
+++ b/x11-plugins/matchbox-applet-volume/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-plugins/matchbox-desktop-image-browser/metadata.xml b/x11-plugins/matchbox-desktop-image-browser/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-plugins/matchbox-desktop-image-browser/metadata.xml
+++ b/x11-plugins/matchbox-desktop-image-browser/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-plugins/matchbox-desktop-xine/metadata.xml b/x11-plugins/matchbox-desktop-xine/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-plugins/matchbox-desktop-xine/metadata.xml
+++ b/x11-plugins/matchbox-desktop-xine/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-plugins/monto/metadata.xml b/x11-plugins/monto/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/monto/metadata.xml
+++ b/x11-plugins/monto/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/pidgin-birthday-reminder/metadata.xml b/x11-plugins/pidgin-birthday-reminder/metadata.xml
index 17672ce6438d..cf8bbb30041d 100644
--- a/x11-plugins/pidgin-birthday-reminder/metadata.xml
+++ b/x11-plugins/pidgin-birthday-reminder/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
diff --git a/x11-plugins/pidgin-encryption/metadata.xml b/x11-plugins/pidgin-encryption/metadata.xml
index 9f43c9824e79..0506ef1bc9e7 100644
--- a/x11-plugins/pidgin-encryption/metadata.xml
+++ b/x11-plugins/pidgin-encryption/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription>
 Pidgin-Encryption uses NSS or GNUTLSto provide transparent RSA encryption as a Pidgin plugin.
 </longdescription>
diff --git a/x11-plugins/pidgin-extprefs/metadata.xml b/x11-plugins/pidgin-extprefs/metadata.xml
index 4043dbe6ae93..48fb143c2cf7 100644
--- a/x11-plugins/pidgin-extprefs/metadata.xml
+++ b/x11-plugins/pidgin-extprefs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription>
 A plugin that takes advantage of existing pidgin functionality to provide preferences that are often desired but are not included in pidgin.
 </longdescription>
diff --git a/x11-plugins/pidgin-gpg/metadata.xml b/x11-plugins/pidgin-gpg/metadata.xml
index b13748a265f7..6a292564af9d 100644
--- a/x11-plugins/pidgin-gpg/metadata.xml
+++ b/x11-plugins/pidgin-gpg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
@@ -12,6 +11,10 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">segler-alex/Pidgin-GPG</remote-id>
 	</upstream>
diff --git a/x11-plugins/pidgin-hotkeys/metadata.xml b/x11-plugins/pidgin-hotkeys/metadata.xml
index 1d9eb215587b..eea7c254d665 100644
--- a/x11-plugins/pidgin-hotkeys/metadata.xml
+++ b/x11-plugins/pidgin-hotkeys/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="sourceforge">pidgin-hotkeys</remote-id>
 	</upstream>
diff --git a/x11-plugins/pidgin-latex/metadata.xml b/x11-plugins/pidgin-latex/metadata.xml
index edb26b5a021b..00756fd826d6 100644
--- a/x11-plugins/pidgin-latex/metadata.xml
+++ b/x11-plugins/pidgin-latex/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription>
 A plugin for Pidgin which translates LaTeX code into images in your IM and Chat
 conversations. 
diff --git a/x11-plugins/pidgin-libnotify/metadata.xml b/x11-plugins/pidgin-libnotify/metadata.xml
index a071398a197f..78c9c4b967e9 100644
--- a/x11-plugins/pidgin-libnotify/metadata.xml
+++ b/x11-plugins/pidgin-libnotify/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="sourceforge">gaim-libnotify</remote-id>
 	</upstream>
diff --git a/x11-plugins/pidgin-mbpurple/metadata.xml b/x11-plugins/pidgin-mbpurple/metadata.xml
index ee6c12f58148..52eae091d846 100644
--- a/x11-plugins/pidgin-mbpurple/metadata.xml
+++ b/x11-plugins/pidgin-mbpurple/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nils@nils-andresen.de</email>
 		<name>Nils Andresen</name>
@@ -10,6 +9,10 @@
 		<email>fauli@gentoo.org</email>
 		<name>Christian Faulhammer</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="twitgin">Enable graphical plugin for Gtk+ interface of Pidgin.</flag>
 	</use>
diff --git a/x11-plugins/pidgin-mpris/metadata.xml b/x11-plugins/pidgin-mpris/metadata.xml
index 8680cdd07618..3ed4669f55a4 100644
--- a/x11-plugins/pidgin-mpris/metadata.xml
+++ b/x11-plugins/pidgin-mpris/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
diff --git a/x11-plugins/pidgin-musictracker/metadata.xml b/x11-plugins/pidgin-musictracker/metadata.xml
index 828482ba3421..4c45963de647 100644
--- a/x11-plugins/pidgin-musictracker/metadata.xml
+++ b/x11-plugins/pidgin-musictracker/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="google-code">pidgin-musictracker</remote-id>
 	</upstream>
diff --git a/x11-plugins/pidgin-opensteamworks/metadata.xml b/x11-plugins/pidgin-opensteamworks/metadata.xml
index d7165258f835..4d306ebb147f 100644
--- a/x11-plugins/pidgin-opensteamworks/metadata.xml
+++ b/x11-plugins/pidgin-opensteamworks/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
diff --git a/x11-plugins/pidgin-rhythmbox/metadata.xml b/x11-plugins/pidgin-rhythmbox/metadata.xml
index 3e2b4181f5be..097975e3adc2 100644
--- a/x11-plugins/pidgin-rhythmbox/metadata.xml
+++ b/x11-plugins/pidgin-rhythmbox/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
 </pkgmetadata>
diff --git a/x11-plugins/pidgin-sipe/metadata.xml b/x11-plugins/pidgin-sipe/metadata.xml
index 4fa37ee3733e..259aae6036ee 100644
--- a/x11-plugins/pidgin-sipe/metadata.xml
+++ b/x11-plugins/pidgin-sipe/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <maintainer>
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
diff --git a/x11-plugins/pidgintex/metadata.xml b/x11-plugins/pidgintex/metadata.xml
index a3441f9bf467..bd10f29c1286 100644
--- a/x11-plugins/pidgintex/metadata.xml
+++ b/x11-plugins/pidgintex/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<longdescription>pidginTeX is a fast plugin for the instant messaging client Pidgin and uses
 mimeTeX or mathTeX to render LaTeX expressions in messages and chat. It is
 intended for math but mathTeX is fully compatible with LaTeX and any package can
diff --git a/x11-plugins/purple-plugin_pack/metadata.xml b/x11-plugins/purple-plugin_pack/metadata.xml
index 80061771dab9..f2b61b0d48ad 100644
--- a/x11-plugins/purple-plugin_pack/metadata.xml
+++ b/x11-plugins/purple-plugin_pack/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
 	<use>
 		<flag name="talkfilters">Enable support for
 		<pkg>app-text/talklfilters</pkg></flag>
diff --git a/x11-plugins/screenlets/metadata.xml b/x11-plugins/screenlets/metadata.xml
index 81b409cbd36f..bfd347b4d42c 100644
--- a/x11-plugins/screenlets/metadata.xml
+++ b/x11-plugins/screenlets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Screenlets are small owner-drawn applications (written in Python) that
 		can be described as "the virtual representation of things lying/standing
diff --git a/x11-plugins/tomboy-reminder/metadata.xml b/x11-plugins/tomboy-reminder/metadata.xml
index 9500449acf14..57ef59a373aa 100644
--- a/x11-plugins/tomboy-reminder/metadata.xml
+++ b/x11-plugins/tomboy-reminder/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
+	<maintainer>
+		<email>dotnet@gentoo.org</email>
+		<name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmCalClock/metadata.xml b/x11-plugins/wmCalClock/metadata.xml
index 958e94b59dbb..ab9f14362b34 100644
--- a/x11-plugins/wmCalClock/metadata.xml
+++ b/x11-plugins/wmCalClock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmDownload/metadata.xml b/x11-plugins/wmDownload/metadata.xml
index 3c31d7eae7c0..691616aedef4 100644
--- a/x11-plugins/wmDownload/metadata.xml
+++ b/x11-plugins/wmDownload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmMatrix/metadata.xml b/x11-plugins/wmMatrix/metadata.xml
index ccc8c8940504..84b1678bd590 100644
--- a/x11-plugins/wmMatrix/metadata.xml
+++ b/x11-plugins/wmMatrix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmMoonClock/metadata.xml b/x11-plugins/wmMoonClock/metadata.xml
index 16e24e8bc781..b9d30e7a27a8 100644
--- a/x11-plugins/wmMoonClock/metadata.xml
+++ b/x11-plugins/wmMoonClock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmSMPmon/metadata.xml b/x11-plugins/wmSMPmon/metadata.xml
index d89a77fe8740..b81f83ff588a 100644
--- a/x11-plugins/wmSMPmon/metadata.xml
+++ b/x11-plugins/wmSMPmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmSpaceWeather/metadata.xml b/x11-plugins/wmSpaceWeather/metadata.xml
index c6910cf673c2..ee9c8c516ccb 100644
--- a/x11-plugins/wmSpaceWeather/metadata.xml
+++ b/x11-plugins/wmSpaceWeather/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmSun/metadata.xml b/x11-plugins/wmSun/metadata.xml
index d41f972c1378..86982a83132c 100644
--- a/x11-plugins/wmSun/metadata.xml
+++ b/x11-plugins/wmSun/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmXName/metadata.xml b/x11-plugins/wmXName/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmXName/metadata.xml
+++ b/x11-plugins/wmXName/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmacpi/metadata.xml b/x11-plugins/wmacpi/metadata.xml
index bf405277cf96..d5bd73d42c47 100644
--- a/x11-plugins/wmacpi/metadata.xml
+++ b/x11-plugins/wmacpi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmacpiload-ac/metadata.xml b/x11-plugins/wmacpiload-ac/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmacpiload-ac/metadata.xml
+++ b/x11-plugins/wmacpiload-ac/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmacpimon/metadata.xml b/x11-plugins/wmacpimon/metadata.xml
index 56327183b6d7..889746ccc79e 100644
--- a/x11-plugins/wmacpimon/metadata.xml
+++ b/x11-plugins/wmacpimon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmail/metadata.xml b/x11-plugins/wmail/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmail/metadata.xml
+++ b/x11-plugins/wmail/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmapm/metadata.xml b/x11-plugins/wmapm/metadata.xml
index 22f4813749a3..655828641354 100644
--- a/x11-plugins/wmapm/metadata.xml
+++ b/x11-plugins/wmapm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmapmload/metadata.xml b/x11-plugins/wmapmload/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmapmload/metadata.xml
+++ b/x11-plugins/wmapmload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmappl/metadata.xml b/x11-plugins/wmappl/metadata.xml
index 01fbff527aae..2451ad0d8f52 100644
--- a/x11-plugins/wmappl/metadata.xml
+++ b/x11-plugins/wmappl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbatteries/metadata.xml b/x11-plugins/wmbatteries/metadata.xml
index 18727265c97e..da9ff344f5f2 100644
--- a/x11-plugins/wmbatteries/metadata.xml
+++ b/x11-plugins/wmbatteries/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbattery/metadata.xml b/x11-plugins/wmbattery/metadata.xml
index 627d7e57824e..4c3283c3d6d6 100644
--- a/x11-plugins/wmbattery/metadata.xml
+++ b/x11-plugins/wmbattery/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbiff/metadata.xml b/x11-plugins/wmbiff/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmbiff/metadata.xml
+++ b/x11-plugins/wmbiff/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbinclock/metadata.xml b/x11-plugins/wmbinclock/metadata.xml
index aa540bb41501..d4360b92d404 100644
--- a/x11-plugins/wmbinclock/metadata.xml
+++ b/x11-plugins/wmbinclock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbio/metadata.xml b/x11-plugins/wmbio/metadata.xml
index 3717223b0b7f..45c447c6f5b0 100644
--- a/x11-plugins/wmbio/metadata.xml
+++ b/x11-plugins/wmbio/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
index 68e6ef1c95b5..2b308480406d 100644
--- a/x11-plugins/wmblob/metadata.xml
+++ b/x11-plugins/wmblob/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbluecpu/metadata.xml b/x11-plugins/wmbluecpu/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmbluecpu/metadata.xml
+++ b/x11-plugins/wmbluecpu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmbutton/metadata.xml b/x11-plugins/wmbutton/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmbutton/metadata.xml
+++ b/x11-plugins/wmbutton/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcalc/metadata.xml b/x11-plugins/wmcalc/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmcalc/metadata.xml
+++ b/x11-plugins/wmcalc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcalendar/metadata.xml b/x11-plugins/wmcalendar/metadata.xml
index 69f33c52ee03..9b6317aa4341 100644
--- a/x11-plugins/wmcalendar/metadata.xml
+++ b/x11-plugins/wmcalendar/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcdplay/metadata.xml b/x11-plugins/wmcdplay/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmcdplay/metadata.xml
+++ b/x11-plugins/wmcdplay/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcliphist/metadata.xml b/x11-plugins/wmcliphist/metadata.xml
index 6d4001527944..1b0975b35374 100644
--- a/x11-plugins/wmcliphist/metadata.xml
+++ b/x11-plugins/wmcliphist/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmclock/metadata.xml b/x11-plugins/wmclock/metadata.xml
index cdd2b84e490c..5d054139ed59 100644
--- a/x11-plugins/wmclock/metadata.xml
+++ b/x11-plugins/wmclock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmclockmon/metadata.xml b/x11-plugins/wmclockmon/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmclockmon/metadata.xml
+++ b/x11-plugins/wmclockmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcms/metadata.xml b/x11-plugins/wmcms/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmcms/metadata.xml
+++ b/x11-plugins/wmcms/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcoincoin/metadata.xml b/x11-plugins/wmcoincoin/metadata.xml
index 68e77a777c59..00ac3d5d489e 100644
--- a/x11-plugins/wmcoincoin/metadata.xml
+++ b/x11-plugins/wmcoincoin/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcp/metadata.xml b/x11-plugins/wmcp/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmcp/metadata.xml
+++ b/x11-plugins/wmcp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcpu/metadata.xml b/x11-plugins/wmcpu/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmcpu/metadata.xml
+++ b/x11-plugins/wmcpu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcpuload/metadata.xml b/x11-plugins/wmcpuload/metadata.xml
index 86b9d312cb17..748e1ea14ed4 100644
--- a/x11-plugins/wmcpuload/metadata.xml
+++ b/x11-plugins/wmcpuload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmcube/metadata.xml b/x11-plugins/wmcube/metadata.xml
index 91a81f65b1da..af1dce144e9e 100644
--- a/x11-plugins/wmcube/metadata.xml
+++ b/x11-plugins/wmcube/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdate/metadata.xml b/x11-plugins/wmdate/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmdate/metadata.xml
+++ b/x11-plugins/wmdate/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdf/metadata.xml b/x11-plugins/wmdf/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmdf/metadata.xml
+++ b/x11-plugins/wmdf/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdiskmon/metadata.xml b/x11-plugins/wmdiskmon/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmdiskmon/metadata.xml
+++ b/x11-plugins/wmdiskmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdl/metadata.xml b/x11-plugins/wmdl/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmdl/metadata.xml
+++ b/x11-plugins/wmdl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdots/metadata.xml b/x11-plugins/wmdots/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmdots/metadata.xml
+++ b/x11-plugins/wmdots/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmdrawer/metadata.xml b/x11-plugins/wmdrawer/metadata.xml
index 9f8f66914022..7e0d3790d8de 100644
--- a/x11-plugins/wmdrawer/metadata.xml
+++ b/x11-plugins/wmdrawer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
index 42b91833a566..ae44f5333dcb 100644
--- a/x11-plugins/wmfire/metadata.xml
+++ b/x11-plugins/wmfire/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmfishtime/metadata.xml b/x11-plugins/wmfishtime/metadata.xml
index 98c936075cb5..417aa8857d47 100644
--- a/x11-plugins/wmfishtime/metadata.xml
+++ b/x11-plugins/wmfishtime/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmforkplop/metadata.xml b/x11-plugins/wmforkplop/metadata.xml
index ed275b7d045f..842243906b8e 100644
--- a/x11-plugins/wmforkplop/metadata.xml
+++ b/x11-plugins/wmforkplop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmfortune/metadata.xml b/x11-plugins/wmfortune/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmfortune/metadata.xml
+++ b/x11-plugins/wmfortune/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmfrog/metadata.xml b/x11-plugins/wmfrog/metadata.xml
index dda61994c4fb..6775d6e501f6 100644
--- a/x11-plugins/wmfrog/metadata.xml
+++ b/x11-plugins/wmfrog/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmfsm/metadata.xml b/x11-plugins/wmfsm/metadata.xml
index 03d6e45280eb..ac1543556a5e 100644
--- a/x11-plugins/wmfsm/metadata.xml
+++ b/x11-plugins/wmfsm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmget/metadata.xml b/x11-plugins/wmget/metadata.xml
index f52fcfc603be..23a6e0ff023a 100644
--- a/x11-plugins/wmget/metadata.xml
+++ b/x11-plugins/wmget/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmgrabimage/metadata.xml b/x11-plugins/wmgrabimage/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmgrabimage/metadata.xml
+++ b/x11-plugins/wmgrabimage/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmgtemp/metadata.xml b/x11-plugins/wmgtemp/metadata.xml
index c8585fdc027a..f190c16dedfa 100644
--- a/x11-plugins/wmgtemp/metadata.xml
+++ b/x11-plugins/wmgtemp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmhdplop/metadata.xml b/x11-plugins/wmhdplop/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmhdplop/metadata.xml
+++ b/x11-plugins/wmhdplop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmifinfo/metadata.xml b/x11-plugins/wmifinfo/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmifinfo/metadata.xml
+++ b/x11-plugins/wmifinfo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmifs/metadata.xml b/x11-plugins/wmifs/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmifs/metadata.xml
+++ b/x11-plugins/wmifs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wminet/metadata.xml b/x11-plugins/wminet/metadata.xml
index 39a9e24472e2..bdb5472cdd5d 100644
--- a/x11-plugins/wminet/metadata.xml
+++ b/x11-plugins/wminet/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmitime/metadata.xml b/x11-plugins/wmitime/metadata.xml
index ea0accbabfa2..ffbde15941ee 100644
--- a/x11-plugins/wmitime/metadata.xml
+++ b/x11-plugins/wmitime/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmix/metadata.xml b/x11-plugins/wmix/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmix/metadata.xml
+++ b/x11-plugins/wmix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmjsql/metadata.xml b/x11-plugins/wmjsql/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmjsql/metadata.xml
+++ b/x11-plugins/wmjsql/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmlaptop/metadata.xml b/x11-plugins/wmlaptop/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmlaptop/metadata.xml
+++ b/x11-plugins/wmlaptop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmlife/metadata.xml b/x11-plugins/wmlife/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmlife/metadata.xml
+++ b/x11-plugins/wmlife/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmload/metadata.xml b/x11-plugins/wmload/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmload/metadata.xml
+++ b/x11-plugins/wmload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmlongrun/metadata.xml b/x11-plugins/wmlongrun/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmlongrun/metadata.xml
+++ b/x11-plugins/wmlongrun/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmlpq/metadata.xml b/x11-plugins/wmlpq/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmlpq/metadata.xml
+++ b/x11-plugins/wmlpq/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmaiload/metadata.xml b/x11-plugins/wmmaiload/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmaiload/metadata.xml
+++ b/x11-plugins/wmmaiload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmand/metadata.xml b/x11-plugins/wmmand/metadata.xml
index 736963ac2dda..90b082d5c646 100644
--- a/x11-plugins/wmmand/metadata.xml
+++ b/x11-plugins/wmmand/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmemfree/metadata.xml b/x11-plugins/wmmemfree/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmemfree/metadata.xml
+++ b/x11-plugins/wmmemfree/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmemload/metadata.xml b/x11-plugins/wmmemload/metadata.xml
index 045e19b801eb..ce34cd7ee519 100644
--- a/x11-plugins/wmmemload/metadata.xml
+++ b/x11-plugins/wmmemload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmemmon/metadata.xml b/x11-plugins/wmmemmon/metadata.xml
index eae66ea6ab58..9e9e2c462296 100644
--- a/x11-plugins/wmmemmon/metadata.xml
+++ b/x11-plugins/wmmemmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmenu/metadata.xml b/x11-plugins/wmmenu/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmenu/metadata.xml
+++ b/x11-plugins/wmmenu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmisc/metadata.xml b/x11-plugins/wmmisc/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmisc/metadata.xml
+++ b/x11-plugins/wmmisc/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmixer/metadata.xml b/x11-plugins/wmmixer/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmmixer/metadata.xml
+++ b/x11-plugins/wmmixer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmldonkey/metadata.xml b/x11-plugins/wmmldonkey/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmmldonkey/metadata.xml
+++ b/x11-plugins/wmmldonkey/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmon+smp/metadata.xml b/x11-plugins/wmmon+smp/metadata.xml
index 97f836249d19..bd67f8a1f3c9 100644
--- a/x11-plugins/wmmon+smp/metadata.xml
+++ b/x11-plugins/wmmon+smp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmon/metadata.xml b/x11-plugins/wmmon/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmon/metadata.xml
+++ b/x11-plugins/wmmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmp/metadata.xml b/x11-plugins/wmmp/metadata.xml
index 7c23b8f8736c..fa103c935e57 100644
--- a/x11-plugins/wmmp/metadata.xml
+++ b/x11-plugins/wmmp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
+	<maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/x11-plugins/wmmp3/metadata.xml b/x11-plugins/wmmp3/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmmp3/metadata.xml
+++ b/x11-plugins/wmmp3/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmmsg/metadata.xml b/x11-plugins/wmmsg/metadata.xml
index 244acee16a90..e0befa0f7d53 100644
--- a/x11-plugins/wmmsg/metadata.xml
+++ b/x11-plugins/wmmsg/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmnd/metadata.xml b/x11-plugins/wmnd/metadata.xml
index 25cc458fffad..dfe9cd520639 100644
--- a/x11-plugins/wmnd/metadata.xml
+++ b/x11-plugins/wmnd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmnet/metadata.xml b/x11-plugins/wmnet/metadata.xml
index 424147b0d07e..60f772832484 100644
--- a/x11-plugins/wmnet/metadata.xml
+++ b/x11-plugins/wmnet/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index d542916736b8..01a9dd4c5568 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmnetselect/metadata.xml b/x11-plugins/wmnetselect/metadata.xml
index 608c0697a3bb..92b403c6a13a 100644
--- a/x11-plugins/wmnetselect/metadata.xml
+++ b/x11-plugins/wmnetselect/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpager/metadata.xml b/x11-plugins/wmpager/metadata.xml
index 9ed822188d72..441b5190eff9 100644
--- a/x11-plugins/wmpager/metadata.xml
+++ b/x11-plugins/wmpager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wmpager</remote-id>
 	</upstream>
diff --git a/x11-plugins/wmpasman/metadata.xml b/x11-plugins/wmpasman/metadata.xml
index e8867de5f628..a7b187ebf764 100644
--- a/x11-plugins/wmpasman/metadata.xml
+++ b/x11-plugins/wmpasman/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpeople/metadata.xml b/x11-plugins/wmpeople/metadata.xml
index 016cc42f26f7..872cafd70c78 100644
--- a/x11-plugins/wmpeople/metadata.xml
+++ b/x11-plugins/wmpeople/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpiki/metadata.xml b/x11-plugins/wmpiki/metadata.xml
index 2f1657306c78..f89c60ed879f 100644
--- a/x11-plugins/wmpiki/metadata.xml
+++ b/x11-plugins/wmpiki/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpinboard/metadata.xml b/x11-plugins/wmpinboard/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmpinboard/metadata.xml
+++ b/x11-plugins/wmpinboard/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmping/metadata.xml b/x11-plugins/wmping/metadata.xml
index e468fd919852..17003108eac6 100644
--- a/x11-plugins/wmping/metadata.xml
+++ b/x11-plugins/wmping/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpop3/metadata.xml b/x11-plugins/wmpop3/metadata.xml
index dc40d1ae8252..f2deb7277dad 100644
--- a/x11-plugins/wmpop3/metadata.xml
+++ b/x11-plugins/wmpop3/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpop3lb/metadata.xml b/x11-plugins/wmpop3lb/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmpop3lb/metadata.xml
+++ b/x11-plugins/wmpop3lb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmpower/metadata.xml b/x11-plugins/wmpower/metadata.xml
index 24375b0f057b..a108bd69ba1f 100644
--- a/x11-plugins/wmpower/metadata.xml
+++ b/x11-plugins/wmpower/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmppp/metadata.xml b/x11-plugins/wmppp/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmppp/metadata.xml
+++ b/x11-plugins/wmppp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmrack/metadata.xml b/x11-plugins/wmrack/metadata.xml
index 46c0df64f801..c469f29313e3 100644
--- a/x11-plugins/wmrack/metadata.xml
+++ b/x11-plugins/wmrack/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmrecord/metadata.xml b/x11-plugins/wmrecord/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmrecord/metadata.xml
+++ b/x11-plugins/wmrecord/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsmixer/metadata.xml b/x11-plugins/wmsmixer/metadata.xml
index 9f94359e905a..c7fe46f01966 100644
--- a/x11-plugins/wmsmixer/metadata.xml
+++ b/x11-plugins/wmsmixer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsound/metadata.xml b/x11-plugins/wmsound/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmsound/metadata.xml
+++ b/x11-plugins/wmsound/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsvencd/metadata.xml b/x11-plugins/wmsvencd/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmsvencd/metadata.xml
+++ b/x11-plugins/wmsvencd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmswallow/metadata.xml b/x11-plugins/wmswallow/metadata.xml
index 827a186e10d8..4ac6726cff8d 100644
--- a/x11-plugins/wmswallow/metadata.xml
+++ b/x11-plugins/wmswallow/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsysmon/metadata.xml b/x11-plugins/wmsysmon/metadata.xml
index 628e3b6419c5..7d827213f53c 100644
--- a/x11-plugins/wmsysmon/metadata.xml
+++ b/x11-plugins/wmsysmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsystemtray/metadata.xml b/x11-plugins/wmsystemtray/metadata.xml
index 62c0b7516754..0e29fef839ed 100644
--- a/x11-plugins/wmsystemtray/metadata.xml
+++ b/x11-plugins/wmsystemtray/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmsystray/metadata.xml b/x11-plugins/wmsystray/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmsystray/metadata.xml
+++ b/x11-plugins/wmsystray/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmtime/metadata.xml b/x11-plugins/wmtime/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmtime/metadata.xml
+++ b/x11-plugins/wmtime/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmtimer/metadata.xml b/x11-plugins/wmtimer/metadata.xml
index 97ea0c4c9acf..e0203fef3268 100644
--- a/x11-plugins/wmtimer/metadata.xml
+++ b/x11-plugins/wmtimer/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmtop/metadata.xml b/x11-plugins/wmtop/metadata.xml
index 55184f806e56..9e8351966d69 100644
--- a/x11-plugins/wmtop/metadata.xml
+++ b/x11-plugins/wmtop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmtz/metadata.xml b/x11-plugins/wmtz/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmtz/metadata.xml
+++ b/x11-plugins/wmtz/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmudmount/metadata.xml b/x11-plugins/wmudmount/metadata.xml
index f104c9ecef51..1450c1c4ba98 100644
--- a/x11-plugins/wmudmount/metadata.xml
+++ b/x11-plugins/wmudmount/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmupmon/metadata.xml b/x11-plugins/wmupmon/metadata.xml
index 5b7d4aabb364..2ffb43458b9a 100644
--- a/x11-plugins/wmupmon/metadata.xml
+++ b/x11-plugins/wmupmon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmwave/metadata.xml b/x11-plugins/wmwave/metadata.xml
index c598560b2876..84f48ecf139e 100644
--- a/x11-plugins/wmwave/metadata.xml
+++ b/x11-plugins/wmwave/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmweather+/metadata.xml b/x11-plugins/wmweather+/metadata.xml
index 6513eecbb9ab..4f4b1e3e71ab 100644
--- a/x11-plugins/wmweather+/metadata.xml
+++ b/x11-plugins/wmweather+/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmweather/metadata.xml b/x11-plugins/wmweather/metadata.xml
index ff3438493fe0..4305375d4620 100644
--- a/x11-plugins/wmweather/metadata.xml
+++ b/x11-plugins/wmweather/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmwifi/metadata.xml b/x11-plugins/wmwifi/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmwifi/metadata.xml
+++ b/x11-plugins/wmwifi/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmwork/metadata.xml b/x11-plugins/wmwork/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmwork/metadata.xml
+++ b/x11-plugins/wmwork/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmxkb/metadata.xml b/x11-plugins/wmxkb/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-plugins/wmxkb/metadata.xml
+++ b/x11-plugins/wmxkb/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
diff --git a/x11-plugins/wmxres/metadata.xml b/x11-plugins/wmxres/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-plugins/wmxres/metadata.xml
+++ b/x11-plugins/wmxres/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-dock</herd>
 <maintainer>
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
diff --git a/x11-proto/bigreqsproto/metadata.xml b/x11-proto/bigreqsproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/bigreqsproto/metadata.xml
+++ b/x11-proto/bigreqsproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/compositeproto/metadata.xml b/x11-proto/compositeproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/compositeproto/metadata.xml
+++ b/x11-proto/compositeproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/damageproto/metadata.xml b/x11-proto/damageproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/damageproto/metadata.xml
+++ b/x11-proto/damageproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dmxproto/metadata.xml b/x11-proto/dmxproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dmxproto/metadata.xml
+++ b/x11-proto/dmxproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dri2proto/metadata.xml b/x11-proto/dri2proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dri2proto/metadata.xml
+++ b/x11-proto/dri2proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dri3proto/metadata.xml b/x11-proto/dri3proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dri3proto/metadata.xml
+++ b/x11-proto/dri3proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/evieext/metadata.xml b/x11-proto/evieext/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/evieext/metadata.xml
+++ b/x11-proto/evieext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fixesproto/metadata.xml b/x11-proto/fixesproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fixesproto/metadata.xml
+++ b/x11-proto/fixesproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fontcacheproto/metadata.xml b/x11-proto/fontcacheproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fontcacheproto/metadata.xml
+++ b/x11-proto/fontcacheproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fontsproto/metadata.xml b/x11-proto/fontsproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fontsproto/metadata.xml
+++ b/x11-proto/fontsproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/glproto/metadata.xml b/x11-proto/glproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/glproto/metadata.xml
+++ b/x11-proto/glproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/inputproto/metadata.xml b/x11-proto/inputproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/inputproto/metadata.xml
+++ b/x11-proto/inputproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/kbproto/metadata.xml b/x11-proto/kbproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/kbproto/metadata.xml
+++ b/x11-proto/kbproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/presentproto/metadata.xml b/x11-proto/presentproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/presentproto/metadata.xml
+++ b/x11-proto/presentproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/printproto/metadata.xml b/x11-proto/printproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/printproto/metadata.xml
+++ b/x11-proto/printproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/randrproto/metadata.xml b/x11-proto/randrproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/randrproto/metadata.xml
+++ b/x11-proto/randrproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/recordproto/metadata.xml b/x11-proto/recordproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/recordproto/metadata.xml
+++ b/x11-proto/recordproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/renderproto/metadata.xml b/x11-proto/renderproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/renderproto/metadata.xml
+++ b/x11-proto/renderproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/resourceproto/metadata.xml b/x11-proto/resourceproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/resourceproto/metadata.xml
+++ b/x11-proto/resourceproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/scrnsaverproto/metadata.xml b/x11-proto/scrnsaverproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/scrnsaverproto/metadata.xml
+++ b/x11-proto/scrnsaverproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/trapproto/metadata.xml b/x11-proto/trapproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/trapproto/metadata.xml
+++ b/x11-proto/trapproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/videoproto/metadata.xml b/x11-proto/videoproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/videoproto/metadata.xml
+++ b/x11-proto/videoproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcalibrateproto/metadata.xml b/x11-proto/xcalibrateproto/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-proto/xcalibrateproto/metadata.xml
+++ b/x11-proto/xcalibrateproto/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-proto/xcb-proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xcb-proto/metadata.xml
+++ b/x11-proto/xcb-proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcmiscproto/metadata.xml b/x11-proto/xcmiscproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xcmiscproto/metadata.xml
+++ b/x11-proto/xcmiscproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xextproto/metadata.xml b/x11-proto/xextproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xextproto/metadata.xml
+++ b/x11-proto/xextproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86bigfontproto/metadata.xml b/x11-proto/xf86bigfontproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86bigfontproto/metadata.xml
+++ b/x11-proto/xf86bigfontproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86dgaproto/metadata.xml b/x11-proto/xf86dgaproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86dgaproto/metadata.xml
+++ b/x11-proto/xf86dgaproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86driproto/metadata.xml b/x11-proto/xf86driproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86driproto/metadata.xml
+++ b/x11-proto/xf86driproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86miscproto/metadata.xml b/x11-proto/xf86miscproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86miscproto/metadata.xml
+++ b/x11-proto/xf86miscproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86rushproto/metadata.xml b/x11-proto/xf86rushproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86rushproto/metadata.xml
+++ b/x11-proto/xf86rushproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86vidmodeproto/metadata.xml b/x11-proto/xf86vidmodeproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86vidmodeproto/metadata.xml
+++ b/x11-proto/xf86vidmodeproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xineramaproto/metadata.xml b/x11-proto/xineramaproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xineramaproto/metadata.xml
+++ b/x11-proto/xineramaproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xproto/metadata.xml b/x11-proto/xproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xproto/metadata.xml
+++ b/x11-proto/xproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/evilvte/metadata.xml b/x11-terms/evilvte/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-terms/evilvte/metadata.xml
+++ b/x11-terms/evilvte/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
index 04c70dc7bc27..80d300c4fbd9 100644
--- a/x11-terms/gnome-terminal/metadata.xml
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> search</flag>
 	<flag name="nautilus">Build gnome-base/nautilus extension</flag>
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index 41ba86c657b9..c9fa4ad1118e 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Guake/guake</remote-id>
   </upstream>
diff --git a/x11-terms/hanterm/metadata.xml b/x11-terms/hanterm/metadata.xml
index fbc6117c50fb..0f0ed2e44cf7 100644
--- a/x11-terms/hanterm/metadata.xml
+++ b/x11-terms/hanterm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <use>
 	<flag name="utempter">Records user logins. Useful on multi-user
 		systems</flag>
diff --git a/x11-terms/kterm/metadata.xml b/x11-terms/kterm/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/x11-terms/kterm/metadata.xml
+++ b/x11-terms/kterm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/lilyterm/metadata.xml b/x11-terms/lilyterm/metadata.xml
index 4bff79f2c77e..46dc3fc75e20 100644
--- a/x11-terms/lilyterm/metadata.xml
+++ b/x11-terms/lilyterm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
index 8cdad0d38750..d937c3998faa 100644
--- a/x11-terms/mate-terminal/metadata.xml
+++ b/x11-terms/mate-terminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-terminal</remote-id>
     </upstream>
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 1ca794ab6c6c..102a8660d1ea 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="fcitx">Enable <pkg>app-i18n/fcitx</pkg> support</flag>
     <flag name="ibus">Enable <pkg>app-i18n/ibus</pkg> support</flag>
diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
index 1a44f652bb9a..1d38166fd58e 100644
--- a/x11-terms/qterminal/metadata.xml
+++ b/x11-terms/qterminal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qterminal/qterminal</remote-id>
 	</upstream>
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index f949b64efa02..556b4a10ef9d 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>russell@annunaki2k2.co.uk</email>
 		<name>Russell Knighton</name>
 		<description>Proxy (user) maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">roxterm</remote-id>
 	</upstream>
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
index dd8e5f462cab..dcd7e4689cbd 100644
--- a/x11-terms/sakura/metadata.xml
+++ b/x11-terms/sakura/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
     sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
     with few dependencies, so you don't need a full GNOME desktop installed to
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index 656ec8ecc71e..a489336e3717 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
 	Much of the behaviour of Terminator is based on GNOME Terminal, and 
 	we are adding more features from that as time goes by, but we also 
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index b501a2013950..53ab9c19792a 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
 <maintainer>
 	<email>sera@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index eb809ad385f4..baff5deb0584 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -5,8 +5,14 @@
     <email>dickey@invisible-island.net</email>
     <name>Thomas Dickey</name>
   </maintainer>
-  <herd>x11</herd>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
     <flag name="toolbar">Enable the xterm toolbar to be built</flag>
diff --git a/x11-themes/Tulliana/metadata.xml b/x11-themes/Tulliana/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/Tulliana/metadata.xml
+++ b/x11-themes/Tulliana/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/adwaita-icon-theme/metadata.xml b/x11-themes/adwaita-icon-theme/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/adwaita-icon-theme/metadata.xml
+++ b/x11-themes/adwaita-icon-theme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/audacious-themes/metadata.xml b/x11-themes/audacious-themes/metadata.xml
index a025c77c7636..d610f01bea87 100644
--- a/x11-themes/audacious-themes/metadata.xml
+++ b/x11-themes/audacious-themes/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
 <maintainer>
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/bespin/metadata.xml b/x11-themes/bespin/metadata.xml
index 196dab935c00..22f36115c967 100644
--- a/x11-themes/bespin/metadata.xml
+++ b/x11-themes/bespin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="windeco">Enable window decoration for KWin.</flag>
 	</use>
diff --git a/x11-themes/blueglass-xcursors/metadata.xml b/x11-themes/blueglass-xcursors/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-themes/blueglass-xcursors/metadata.xml
+++ b/x11-themes/blueglass-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml
index a20e7b5433b8..4a15eb3e512d 100644
--- a/x11-themes/chameleon-xcursors/metadata.xml
+++ b/x11-themes/chameleon-xcursors/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>skrattaren@yandex.ru</email>
 	<name>Nikolaj Sjujskij</name>
@@ -10,4 +9,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/claws-mail-themes/metadata.xml b/x11-themes/claws-mail-themes/metadata.xml
index 1cc539c3fbe1..efef6f7e75c1 100644
--- a/x11-themes/claws-mail-themes/metadata.xml
+++ b/x11-themes/claws-mail-themes/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
 <maintainer>
 <email>fauli@gentoo.org</email>
 <name>Christian Faulhammer</name>
 </maintainer>
+<maintainer>
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index c0e6480124b2..044c36fd7038 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
@@ -11,6 +10,10 @@
 		<name>Geert Braekmans</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jpfleury/clearlooks-phenix</remote-id>
 	</upstream>
diff --git a/x11-themes/crystal/metadata.xml b/x11-themes/crystal/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-themes/crystal/metadata.xml
+++ b/x11-themes/crystal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/dekorator/metadata.xml b/x11-themes/dekorator/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-themes/dekorator/metadata.xml
+++ b/x11-themes/dekorator/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/emerald-themes/metadata.xml b/x11-themes/emerald-themes/metadata.xml
index 2d71d9c8f254..c99b24a1f093 100644
--- a/x11-themes/emerald-themes/metadata.xml
+++ b/x11-themes/emerald-themes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Emerald themes are the themes for emerald
 </longdescription>
 </pkgmetadata>
diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index ac83800a5389..4fbe32c84e9d 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index 76f87797194e..64bfde1d5931 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">experience</remote-id>
 	</upstream>
diff --git a/x11-themes/faenza-icon-theme/metadata.xml b/x11-themes/faenza-icon-theme/metadata.xml
index 23620f36ac29..bc9a390f645a 100644
--- a/x11-themes/faenza-icon-theme/metadata.xml
+++ b/x11-themes/faenza-icon-theme/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
@@ -10,6 +9,10 @@
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">faenza-icon-theme</remote-id>
 	</upstream>
diff --git a/x11-themes/flatsvg/metadata.xml b/x11-themes/flatsvg/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-themes/flatsvg/metadata.xml
+++ b/x11-themes/flatsvg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index edb3c129e531..ebd5cc0e8093 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>dominique.c.michel@gmail.com</email>
     <name>Dominique Michel</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
 FVWM-Crystal is a set of configuration files for FVWM window manager,
 with additional programs and scripts. Some of it's features are:
diff --git a/x11-themes/fvwm-themes-extra/metadata.xml b/x11-themes/fvwm-themes-extra/metadata.xml
index f6aac99fec22..5b02d66c29c5 100644
--- a/x11-themes/fvwm-themes-extra/metadata.xml
+++ b/x11-themes/fvwm-themes-extra/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fvwm-themes</remote-id>
   </upstream>
diff --git a/x11-themes/gargantuan-icon-theme/metadata.xml b/x11-themes/gargantuan-icon-theme/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-themes/gargantuan-icon-theme/metadata.xml
+++ b/x11-themes/gargantuan-icon-theme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gartoon-redux/metadata.xml b/x11-themes/gartoon-redux/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/gartoon-redux/metadata.xml
+++ b/x11-themes/gartoon-redux/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gartoon/metadata.xml b/x11-themes/gartoon/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-themes/gartoon/metadata.xml
+++ b/x11-themes/gartoon/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gentoo-artwork-livecd/metadata.xml b/x11-themes/gentoo-artwork-livecd/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/x11-themes/gentoo-artwork-livecd/metadata.xml
+++ b/x11-themes/gentoo-artwork-livecd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+	<email>livecd@gentoo.org</email>
+	<name>Gentoo LiveCD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gentoo-xcursors/metadata.xml b/x11-themes/gentoo-xcursors/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-themes/gentoo-xcursors/metadata.xml
+++ b/x11-themes/gentoo-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/geramik/metadata.xml b/x11-themes/geramik/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/geramik/metadata.xml
+++ b/x11-themes/geramik/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-backgrounds/metadata.xml b/x11-themes/gnome-backgrounds/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gnome-backgrounds/metadata.xml
+++ b/x11-themes/gnome-backgrounds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-colors-common/metadata.xml b/x11-themes/gnome-colors-common/metadata.xml
index 72f3ce19b537..05a736f15178 100644
--- a/x11-themes/gnome-colors-common/metadata.xml
+++ b/x11-themes/gnome-colors-common/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-colors-themes/metadata.xml b/x11-themes/gnome-colors-themes/metadata.xml
index 72f3ce19b537..05a736f15178 100644
--- a/x11-themes/gnome-colors-themes/metadata.xml
+++ b/x11-themes/gnome-colors-themes/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme-extras/metadata.xml b/x11-themes/gnome-icon-theme-extras/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/x11-themes/gnome-icon-theme-extras/metadata.xml
+++ b/x11-themes/gnome-icon-theme-extras/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme-symbolic/metadata.xml b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gnome-icon-theme-symbolic/metadata.xml
+++ b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme/metadata.xml b/x11-themes/gnome-icon-theme/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gnome-icon-theme/metadata.xml
+++ b/x11-themes/gnome-icon-theme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnome-themes-standard/metadata.xml b/x11-themes/gnome-themes-standard/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gnome-themes-standard/metadata.xml
+++ b/x11-themes/gnome-themes-standard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gnustep-neos-theme/metadata.xml b/x11-themes/gnustep-neos-theme/metadata.xml
index 0c694ddbf198..31ab3dcb6303 100644
--- a/x11-themes/gnustep-neos-theme/metadata.xml
+++ b/x11-themes/gnustep-neos-theme/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnustep</herd>
+  <maintainer>
+    <email>gnustep@gentoo.org</email>
+    <name>Gentoo GNUstep Project</name>
+  </maintainer>
   <longdescription>This theme closely follows the original NeXT look and feel. The controls and the user interface have the same guidlenies, the menus, scrollbars and general impression are familiar to to the old-style user. But the Shades are more subtle, several controls look the same, but are made less intursive, more subtle. Some icons are smoother.</longdescription>
 </pkgmetadata>
diff --git a/x11-themes/gnustep-silver-theme/metadata.xml b/x11-themes/gnustep-silver-theme/metadata.xml
index 828ce83fbfd1..d7b64d0597f4 100644
--- a/x11-themes/gnustep-silver-theme/metadata.xml
+++ b/x11-themes/gnustep-silver-theme/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<longdescription>Silver.theme is a theme with menu in-window, silvered controls, scrollbars at right side and arrows at opposite sides. Ideal for people who want use GNUstep apps in desktops like Gnome, KDE, ...</longdescription>
 </pkgmetadata>
diff --git a/x11-themes/golden-xcursors/metadata.xml b/x11-themes/golden-xcursors/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-themes/golden-xcursors/metadata.xml
+++ b/x11-themes/golden-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 324478bd5503..dd2607ed9dde 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">shimmerproject/Greybird</remote-id>
   </upstream>
diff --git a/x11-themes/gtk-chtheme/metadata.xml b/x11-themes/gtk-chtheme/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/x11-themes/gtk-chtheme/metadata.xml
+++ b/x11-themes/gtk-chtheme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-aurora/metadata.xml b/x11-themes/gtk-engines-aurora/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-themes/gtk-engines-aurora/metadata.xml
+++ b/x11-themes/gtk-engines-aurora/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-candido/metadata.xml b/x11-themes/gtk-engines-candido/metadata.xml
index 540c25023998..64f877fb306c 100644
--- a/x11-themes/gtk-engines-candido/metadata.xml
+++ b/x11-themes/gtk-engines-candido/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">candido.berlios</remote-id>
   </upstream>
diff --git a/x11-themes/gtk-engines-experience/metadata.xml b/x11-themes/gtk-engines-experience/metadata.xml
index 109f2e6d74e1..507ebb2b45da 100644
--- a/x11-themes/gtk-engines-experience/metadata.xml
+++ b/x11-themes/gtk-engines-experience/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
     This engine is a very flexible pixmap based GTK-Engine. It is able
     to draw widgets as a stack of multiple images. Each of the images
diff --git a/x11-themes/gtk-engines-flat/metadata.xml b/x11-themes/gtk-engines-flat/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gtk-engines-flat/metadata.xml
+++ b/x11-themes/gtk-engines-flat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-qtpixmap/metadata.xml b/x11-themes/gtk-engines-qtpixmap/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/gtk-engines-qtpixmap/metadata.xml
+++ b/x11-themes/gtk-engines-qtpixmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-quartz/metadata.xml b/x11-themes/gtk-engines-quartz/metadata.xml
index 87bca60a4b6f..3f6d05499ec3 100644
--- a/x11-themes/gtk-engines-quartz/metadata.xml
+++ b/x11-themes/gtk-engines-quartz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
+	<maintainer>
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">downloads</remote-id>
 	</upstream>
diff --git a/x11-themes/gtk-engines-rezlooks/metadata.xml b/x11-themes/gtk-engines-rezlooks/metadata.xml
index 597ca1b5e615..d918003aa3d4 100644
--- a/x11-themes/gtk-engines-rezlooks/metadata.xml
+++ b/x11-themes/gtk-engines-rezlooks/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription lang="en">
     Rezlooks GTK+ Engine, a modified version of the Clearlooks engine.
   </longdescription>
diff --git a/x11-themes/gtk-engines-ubuntulooks/metadata.xml b/x11-themes/gtk-engines-ubuntulooks/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-themes/gtk-engines-ubuntulooks/metadata.xml
+++ b/x11-themes/gtk-engines-ubuntulooks/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-unico/metadata.xml b/x11-themes/gtk-engines-unico/metadata.xml
index 9fd4d4fbe5c5..19814dfc1792 100644
--- a/x11-themes/gtk-engines-unico/metadata.xml
+++ b/x11-themes/gtk-engines-unico/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/x11-themes/gtk-engines/metadata.xml b/x11-themes/gtk-engines/metadata.xml
index 1131e5f9b28a..822b933b9505 100644
--- a/x11-themes/gtk-engines/metadata.xml
+++ b/x11-themes/gtk-engines/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription>
     This package contains some standard themes and theme engines for
     GTK+. Version 0.12 provides engines and themes for GTK+ 1,
diff --git a/x11-themes/gtk-theme-switch/metadata.xml b/x11-themes/gtk-theme-switch/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-themes/gtk-theme-switch/metadata.xml
+++ b/x11-themes/gtk-theme-switch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/haematite-xcursors/metadata.xml b/x11-themes/haematite-xcursors/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/haematite-xcursors/metadata.xml
+++ b/x11-themes/haematite-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/hicolor-icon-theme/metadata.xml b/x11-themes/hicolor-icon-theme/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/x11-themes/hicolor-icon-theme/metadata.xml
+++ b/x11-themes/hicolor-icon-theme/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-themes/human-icon-theme/metadata.xml b/x11-themes/human-icon-theme/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/human-icon-theme/metadata.xml
+++ b/x11-themes/human-icon-theme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/kfaenza/metadata.xml b/x11-themes/kfaenza/metadata.xml
index 50c03fe98d4f..b019543b71f4 100644
--- a/x11-themes/kfaenza/metadata.xml
+++ b/x11-themes/kfaenza/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
 <maintainer>
   <email>maksbotan@gentoo.org</email>
   <name>Maxim Koltsov</name>
 </maintainer>
+<maintainer>
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+</maintainer>
 <use>
 	<flag name="additional">Install additional KFaenza icons. See third homepage for details</flag>
 </use>
diff --git a/x11-themes/korilla/metadata.xml b/x11-themes/korilla/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/korilla/metadata.xml
+++ b/x11-themes/korilla/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/light-themes/metadata.xml b/x11-themes/light-themes/metadata.xml
index 44bb88559d2b..99d9e8355d22 100644
--- a/x11-themes/light-themes/metadata.xml
+++ b/x11-themes/light-themes/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
@@ -10,6 +9,10 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="gtk3">Support GTK 3.x, too</flag>
 	</use>
diff --git a/x11-themes/lush/metadata.xml b/x11-themes/lush/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/lush/metadata.xml
+++ b/x11-themes/lush/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/matchbox-themes-extra/metadata.xml b/x11-themes/matchbox-themes-extra/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-themes/matchbox-themes-extra/metadata.xml
+++ b/x11-themes/matchbox-themes-extra/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-themes/mate-backgrounds/metadata.xml b/x11-themes/mate-backgrounds/metadata.xml
index 17a1804db502..b96b8bd474ee 100644
--- a/x11-themes/mate-backgrounds/metadata.xml
+++ b/x11-themes/mate-backgrounds/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-backgrounds</remote-id>
     </upstream>
diff --git a/x11-themes/mate-icon-theme-faenza/metadata.xml b/x11-themes/mate-icon-theme-faenza/metadata.xml
index 42eff31ad79e..ac3cff2f3098 100644
--- a/x11-themes/mate-icon-theme-faenza/metadata.xml
+++ b/x11-themes/mate-icon-theme-faenza/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-icon-theme-faenza</remote-id>
     </upstream>
diff --git a/x11-themes/mate-icon-theme/metadata.xml b/x11-themes/mate-icon-theme/metadata.xml
index 21fac76bdc19..74320d5692f1 100644
--- a/x11-themes/mate-icon-theme/metadata.xml
+++ b/x11-themes/mate-icon-theme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-icon-theme</remote-id>
     </upstream>
diff --git a/x11-themes/mate-themes/metadata.xml b/x11-themes/mate-themes/metadata.xml
index d4b54b37cb63..645671954596 100644
--- a/x11-themes/mate-themes/metadata.xml
+++ b/x11-themes/mate-themes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-themes</remote-id>
     </upstream>
diff --git a/x11-themes/nimbus/metadata.xml b/x11-themes/nimbus/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-themes/nimbus/metadata.xml
+++ b/x11-themes/nimbus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/nitrogen/metadata.xml b/x11-themes/nitrogen/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/nitrogen/metadata.xml
+++ b/x11-themes/nitrogen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/noia/metadata.xml b/x11-themes/noia/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/noia/metadata.xml
+++ b/x11-themes/noia/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/notify-osd-icons/metadata.xml b/x11-themes/notify-osd-icons/metadata.xml
index 650c2a2edb1f..16dde9afc2c6 100644
--- a/x11-themes/notify-osd-icons/metadata.xml
+++ b/x11-themes/notify-osd-icons/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
diff --git a/x11-themes/nou-icon-theme/metadata.xml b/x11-themes/nou-icon-theme/metadata.xml
index f1d365960b36..0bf51bf8d2e1 100644
--- a/x11-themes/nou-icon-theme/metadata.xml
+++ b/x11-themes/nou-icon-theme/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/nuovo-icon-theme/metadata.xml b/x11-themes/nuovo-icon-theme/metadata.xml
index f1d365960b36..0bf51bf8d2e1 100644
--- a/x11-themes/nuovo-icon-theme/metadata.xml
+++ b/x11-themes/nuovo-icon-theme/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/nuvola/metadata.xml b/x11-themes/nuvola/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/nuvola/metadata.xml
+++ b/x11-themes/nuvola/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/obsidian-xcursors/metadata.xml b/x11-themes/obsidian-xcursors/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/obsidian-xcursors/metadata.xml
+++ b/x11-themes/obsidian-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/oxygen-gtk/metadata.xml b/x11-themes/oxygen-gtk/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-themes/oxygen-gtk/metadata.xml
+++ b/x11-themes/oxygen-gtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/oxygen-molecule/metadata.xml b/x11-themes/oxygen-molecule/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/oxygen-molecule/metadata.xml
+++ b/x11-themes/oxygen-molecule/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/pearlgrey-xcursors/metadata.xml b/x11-themes/pearlgrey-xcursors/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/pearlgrey-xcursors/metadata.xml
+++ b/x11-themes/pearlgrey-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml
index 2812a23f14cb..0e4ea2add380 100644
--- a/x11-themes/qtcurve/metadata.xml
+++ b/x11-themes/qtcurve/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
   <maintainer>
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
   <use>
     <flag name="kde">Enable KDE4 support. This adds a QtCurve configuration
       module to KDE's SystemSettings</flag>
diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
index b0b7dd22c5a4..22fd04505278 100644
--- a/x11-themes/redhat-artwork/metadata.xml
+++ b/x11-themes/redhat-artwork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 <use>
 <flag name="audacious">Install <pkg>media-sound/audacious</pkg> theme</flag>
 <flag name="cursors">Install Bluecurve cursors</flag>
diff --git a/x11-themes/sawfish-themes/metadata.xml b/x11-themes/sawfish-themes/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/sawfish-themes/metadata.xml
+++ b/x11-themes/sawfish-themes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/shiki-colors/metadata.xml b/x11-themes/shiki-colors/metadata.xml
index 72f3ce19b537..05a736f15178 100644
--- a/x11-themes/shiki-colors/metadata.xml
+++ b/x11-themes/shiki-colors/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/silver-xcursors/metadata.xml b/x11-themes/silver-xcursors/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-themes/silver-xcursors/metadata.xml
+++ b/x11-themes/silver-xcursors/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/skinenigmang-logos/metadata.xml b/x11-themes/skinenigmang-logos/metadata.xml
index cf0f79323ba2..4ae1036d16b6 100644
--- a/x11-themes/skinenigmang-logos/metadata.xml
+++ b/x11-themes/skinenigmang-logos/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/x11-themes/skulpture/metadata.xml b/x11-themes/skulpture/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/skulpture/metadata.xml
+++ b/x11-themes/skulpture/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/slim-themes/metadata.xml b/x11-themes/slim-themes/metadata.xml
index 624896ee5a66..d0fc03248d5a 100644
--- a/x11-themes/slim-themes/metadata.xml
+++ b/x11-themes/slim-themes/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>axs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">slim.berlios</remote-id>
 	</upstream>
diff --git a/x11-themes/smaragd/metadata.xml b/x11-themes/smaragd/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-themes/smaragd/metadata.xml
+++ b/x11-themes/smaragd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/smplayer-skins/metadata.xml b/x11-themes/smplayer-skins/metadata.xml
index 862485291aec..a1948a940bea 100644
--- a/x11-themes/smplayer-skins/metadata.xml
+++ b/x11-themes/smplayer-skins/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">smplayer</remote-id>
 	</upstream>
diff --git a/x11-themes/smplayer-themes/metadata.xml b/x11-themes/smplayer-themes/metadata.xml
index 862485291aec..a1948a940bea 100644
--- a/x11-themes/smplayer-themes/metadata.xml
+++ b/x11-themes/smplayer-themes/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">smplayer</remote-id>
 	</upstream>
diff --git a/x11-themes/sound-theme-freedesktop/metadata.xml b/x11-themes/sound-theme-freedesktop/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-themes/sound-theme-freedesktop/metadata.xml
+++ b/x11-themes/sound-theme-freedesktop/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/tactile/metadata.xml b/x11-themes/tactile/metadata.xml
index 13859365aef6..c67931015642 100644
--- a/x11-themes/tactile/metadata.xml
+++ b/x11-themes/tactile/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
@@ -11,6 +10,10 @@
 <name>Markellos Orfanos</name>
 <description>CC him on bugs</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/x11-themes/tactile3/metadata.xml b/x11-themes/tactile3/metadata.xml
index 13859365aef6..c67931015642 100644
--- a/x11-themes/tactile3/metadata.xml
+++ b/x11-themes/tactile3/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
@@ -11,6 +10,10 @@
 <name>Markellos Orfanos</name>
 <description>CC him on bugs</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/x11-themes/tangerine-icon-theme/metadata.xml b/x11-themes/tangerine-icon-theme/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-themes/tangerine-icon-theme/metadata.xml
+++ b/x11-themes/tangerine-icon-theme/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/tango-icon-theme-extras/metadata.xml b/x11-themes/tango-icon-theme-extras/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-themes/tango-icon-theme-extras/metadata.xml
+++ b/x11-themes/tango-icon-theme-extras/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
 <maintainer>
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
diff --git a/x11-themes/tango-icon-theme/metadata.xml b/x11-themes/tango-icon-theme/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/x11-themes/tango-icon-theme/metadata.xml
+++ b/x11-themes/tango-icon-theme/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/x11-themes/vdr-channel-logos/metadata.xml b/x11-themes/vdr-channel-logos/metadata.xml
index 57cbe8aa99b6..1f944efea5d7 100644
--- a/x11-themes/vdr-channel-logos/metadata.xml
+++ b/x11-themes/vdr-channel-logos/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-		<maintainer>
+	<maintainer>
   			<email>vdr@gentoo.org</email>
 			<name>Gentoo VDR Project</name>
 		</maintainer>
diff --git a/x11-themes/vdrgraphtft-avp/metadata.xml b/x11-themes/vdrgraphtft-avp/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/x11-themes/vdrgraphtft-avp/metadata.xml
+++ b/x11-themes/vdrgraphtft-avp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-deepblue/metadata.xml b/x11-themes/vdrgraphtft-deepblue/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/x11-themes/vdrgraphtft-deepblue/metadata.xml
+++ b/x11-themes/vdrgraphtft-deepblue/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-deeppurple/metadata.xml b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/x11-themes/vdrgraphtft-deeppurple/metadata.xml
+++ b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-poetter/metadata.xml b/x11-themes/vdrgraphtft-poetter/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/x11-themes/vdrgraphtft-poetter/metadata.xml
+++ b/x11-themes/vdrgraphtft-poetter/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/x11-themes/windowmaker-themes/metadata.xml b/x11-themes/windowmaker-themes/metadata.xml
index 16a214bf7003..9d68cc290f45 100644
--- a/x11-themes/windowmaker-themes/metadata.xml
+++ b/x11-themes/windowmaker-themes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<maintainer>
+	<email>gnustep@gentoo.org</email>
+	<name>Gentoo GNUstep Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/xcursor-themes/metadata.xml b/x11-themes/xcursor-themes/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-themes/xcursor-themes/metadata.xml
+++ b/x11-themes/xcursor-themes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/xxv-skins/metadata.xml b/x11-themes/xxv-skins/metadata.xml
index b4862f352c90..0fe2766cdd40 100644
--- a/x11-themes/xxv-skins/metadata.xml
+++ b/x11-themes/xxv-skins/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
 <maintainer>
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
diff --git a/x11-themes/yasis-icon-theme/metadata.xml b/x11-themes/yasis-icon-theme/metadata.xml
index f1d365960b36..0bf51bf8d2e1 100644
--- a/x11-themes/yasis-icon-theme/metadata.xml
+++ b/x11-themes/yasis-icon-theme/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/zukini/metadata.xml b/x11-themes/zukini/metadata.xml
index 7aef4e21e881..1170aa556490 100644
--- a/x11-themes/zukini/metadata.xml
+++ b/x11-themes/zukini/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/zukitwo-shell/metadata.xml b/x11-themes/zukitwo-shell/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/x11-themes/zukitwo-shell/metadata.xml
+++ b/x11-themes/zukitwo-shell/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/zukitwo/metadata.xml b/x11-themes/zukitwo/metadata.xml
index 65ba7a59ea54..c23e9a0c0104 100644
--- a/x11-themes/zukitwo/metadata.xml
+++ b/x11-themes/zukitwo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
   </use>
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
index f06b35b32d00..01b0968807b4 100644
--- a/x11-wm/afterstep/metadata.xml
+++ b/x11-wm/afterstep/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gentoo.org@vaevictus.net</email>
 		<name>Nathan Mahon</name>
 		<description>Upstream developer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">afterstep</remote-id>
 	</upstream>
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
index 16b654d606c0..b3858662d0b2 100644
--- a/x11-wm/awesome/metadata.xml
+++ b/x11-wm/awesome/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>itumaykin+gentoo@gmail.com</email>
     <name>Coacher</name>
@@ -19,4 +18,8 @@
     <email>wired@gentoo.org</email>
     <name>Alex Alexander</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
index 9e592b3de0a6..796b198e51aa 100644
--- a/x11-wm/compiz-fusion/metadata.xml
+++ b/x11-wm/compiz-fusion/metadata.xml
@@ -5,7 +5,10 @@
   <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
   <flag name="unsupported">Install the <pkg>x11-plugins/compiz-fusion-plugins-unsupported</pkg> package.</flag>
 </use>
-<herd>desktop-effects</herd>
+<maintainer>
+  <email>desktop-effects@gentoo.org</email>
+  <name>Desktop effects</name>
+</maintainer>
 <longdescription>
 compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
 </longdescription>
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
index bf856f7d43b5..fcc8fdcee372 100644
--- a/x11-wm/compiz/metadata.xml
+++ b/x11-wm/compiz/metadata.xml
@@ -11,7 +11,10 @@
       used.
     </flag>
   </use>
-  <herd>desktop-effects</herd>
+  <maintainer>
+    <email>desktop-effects@gentoo.org</email>
+    <name>Desktop effects</name>
+  </maintainer>
   <longdescription>
     compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
   </longdescription>
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
index 4f357a207350..44bc61a2424a 100644
--- a/x11-wm/dwm/metadata.xml
+++ b/x11-wm/dwm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>hm.stahl@web.de</email>
 	<name>Michael Stahn</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>dwm is a dynamic window manager for X. It manages windows in tiling and floating modes. Either mode can be applied dynamically, optimizing the environment for the application in use and the task performed.</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
index 52850330ad34..d475ee0194bb 100644
--- a/x11-wm/echinus/metadata.xml
+++ b/x11-wm/echinus/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>nico@lifeisabug.com</email>
 		<name>Nico R. Wohlgemuth</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xrandr">Enable support for multihead configuration</flag>
 	</use>
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
index 13d892cb8836..8a2805db49e9 100644
--- a/x11-wm/emerald/metadata.xml
+++ b/x11-wm/emerald/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 46f7522cca3e..b7503ac1f513 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="pango">Enable pango font rendering</flag>
 	<flag name="xrandr">Enable support for the X xrandr extension</flag>
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index cc1d791cf3c8..1125a18285e8 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 		<description>Proxy-Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	A minimalist window manager for the X Window System. It maximises screen 
 	real estate and provides good keyboard control. It is currently based on 
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 703edaa82170..8387f78dd5b3 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
 	  <email>i92guboj@gentoo.org</email>
 	  <description>Proxied committer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 		fvwm is an ICCCM-compliant X window manager providing a 3D look for
 		window decorations, multiple discontiguous virtual desktops, a high
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 986da1cd5ce6..1261c92909a7 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintainer for assignee of bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
index 1a53cd0586f6..96d6168dc2c2 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/marco</remote-id>
     </upstream>
diff --git a/x11-wm/matchbox-common/metadata.xml b/x11-wm/matchbox-common/metadata.xml
index 0f45a914148b..59ca8723f9d0 100644
--- a/x11-wm/matchbox-common/metadata.xml
+++ b/x11-wm/matchbox-common/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 <use>
 	<flag name="pda">Support for pda folders</flag>
 </use>
diff --git a/x11-wm/matchbox-desktop/metadata.xml b/x11-wm/matchbox-desktop/metadata.xml
index 0c994964d804..91130aa74dfc 100644
--- a/x11-wm/matchbox-desktop/metadata.xml
+++ b/x11-wm/matchbox-desktop/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gpe</herd>
   <use>
     <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
   </use>
diff --git a/x11-wm/matchbox-panel/metadata.xml b/x11-wm/matchbox-panel/metadata.xml
index 26f436c695d4..9e349018ff53 100644
--- a/x11-wm/matchbox-panel/metadata.xml
+++ b/x11-wm/matchbox-panel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gpe</herd>
   <use>
     <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
     <flag name="lowres">Optimize for low resolution screens.</flag>
diff --git a/x11-wm/matchbox-window-manager/metadata.xml b/x11-wm/matchbox-window-manager/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-wm/matchbox-window-manager/metadata.xml
+++ b/x11-wm/matchbox-window-manager/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-wm/matchbox/metadata.xml b/x11-wm/matchbox/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-wm/matchbox/metadata.xml
+++ b/x11-wm/matchbox/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index fc4050a85c75..b054626321c3 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
 	</upstream>
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 31e8de5153d5..73990875cc81 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="kms">Enable KMS support.</flag>
 	</use>
diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index 653526ddc2c3..6e0baf3e1ff7 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>moaxcp@gmail.com</email>
 		<name>John Mercier</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xrandr">Add support for xrandr</flag>
 	</use>
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 3aa0a2352d79..d202d71e035a 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
   <maintainer>
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <use>
  	 <flag name="session">Enables support for session managers</flag>
 	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index ffd0128b67b2..87e8c4f429f4 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>jer@gentoo.org</email>
 	</maintainer>
@@ -9,6 +8,10 @@
 		<email>linbug+gbz@posteo.org</email>
 		<name>Andreas Schlick</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Pekwm is a window manager based on aewm++, but it no longer resembles 
 		it. It is highly configurable, rather fast, and aimed towards being 
diff --git a/x11-wm/twm/metadata.xml b/x11-wm/twm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-wm/twm/metadata.xml
+++ b/x11-wm/twm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index a1c7b30fe81c..d6d007a2a772 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<use>
 		<flag name="modelock">Enable XKB language status lock support. README
 			says: "If you don't know what it is you probably don't need
diff --git a/x11-wm/xmonad-contrib/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
index a6f9a08c6dc0..ed5970bd1ddf 100644
--- a/x11-wm/xmonad-contrib/metadata.xml
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 68b3928591d4..2da1a934e2d2 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="default-term">Pull terminal specified in default xmonad config
 			to be a bit less hostile by default.</flag>
diff --git a/xfce-extra/xfce4-indicator-plugin/metadata.xml b/xfce-extra/xfce4-indicator-plugin/metadata.xml
index d6e3e8667920..77a230ce178b 100644
--- a/xfce-extra/xfce4-indicator-plugin/metadata.xml
+++ b/xfce-extra/xfce4-indicator-plugin/metadata.xml
@@ -5,7 +5,6 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>